mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 06:32:10 +02:00
Code Issues Wiki Activity

Bug 45203. Eliminated formard declarations for bindings defined or

Browse source 
declared in included headers.
This commit is contained in:
Sergey Prigogin 2013-08-06 18:48:44 -07:00
parent d27cdd90ca
commit 9d1ea68fe6
2 changed files with 53 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.ui.tests/ui/org/eclipse/cdt/ui/tests/refactoring/includes/IncludeOrganizerTest.java
View file

@ -390,4 +390,27 @@ public class IncludeOrganizerTest extends IncludesTestBase {
SymbolExportMap.serializeMaps(Collections.singletonList(symbolExportMap)));
assertExpectedResults();
}
//h1.h
//class A {};
//class B;
//h2.h
//class C {};
//source.cpp
//A a;
//B* b;
//C* c;
//====================
//#include "h1.h"
//
//class C;
//
//A a;
//B* b;
//C* c;
public void testSymbolToDeclareIsDefinedInIncludedHeader() throws Exception {
assertExpectedResults();
}
}

53
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/IncludeOrganizer.java
View file

@ -64,6 +64,7 @@ import org.eclipse.cdt.core.dom.ast.IMacroBinding;
import org.eclipse.cdt.core.dom.ast.IParameter;
import org.eclipse.cdt.core.dom.ast.IScope;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IVariable;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPMethod;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateDefinition;
@ -194,14 +195,6 @@ public class IncludeOrganizer {
bindingClassifier.classifyNodeContents(ast);
Set<IBinding> bindingsToDefine = bindingClassifier.getBindingsToDefine();
// Stores the forward declarations for composite types and enumerations as text.
List<String> typeForwardDeclarations = new ArrayList<String>();
// Stores the forward declarations for C-style functions as text.
List<String> functionForwardDeclarations = new ArrayList<String>();
createForwardDeclarations(ast, bindingClassifier, typeForwardDeclarations, functionForwardDeclarations,
bindingsToDefine);
IASTPreprocessorIncludeStatement[] existingIncludes = ast.getIncludeDirectives();
for (IASTPreprocessorIncludeStatement include : existingIncludes) {
if (include.isPartOfTranslationUnitFile()) {
@ -217,7 +210,7 @@ public class IncludeOrganizer {
// bindings which have to be defined.
IIndexFileSet reachableHeaders = ast.getIndexFileSet();
List<InclusionRequest> requests = createInclusionRequests(ast, bindingsToDefine, reachableHeaders);
List<InclusionRequest> requests = createInclusionRequests(ast, bindingsToDefine, false, reachableHeaders);
processInclusionRequests(requests, headerSubstitutor);
// Use a map instead of a set to be able to retrieve existing elements using equal elements.
@ -322,6 +315,13 @@ public class IncludeOrganizer {
}
}
// Stores the forward declarations for composite types and enumerations as text.
List<String> typeForwardDeclarations = new ArrayList<String>();
// Stores the forward declarations for C-style functions as text.
List<String> functionForwardDeclarations = new ArrayList<String>();
createForwardDeclarations(ast, bindingClassifier, typeForwardDeclarations, functionForwardDeclarations);
// Create the source code to insert into the editor.
StringBuilder buf = new StringBuilder();
@ -371,12 +371,9 @@ public class IncludeOrganizer {
/**
* Creates forward declarations by examining the list of bindings which have to be declared.
* Bindings that cannot be safely declared for whatever reason are added to
* {@code bindingsToDefine} set.
*/
private void createForwardDeclarations(IASTTranslationUnit ast, BindingClassifier classifier,
List<String> forwardDeclarations, List<String> functionForwardDeclarations,
Set<IBinding> bindingsToDefine) throws CoreException {
List<String> forwardDeclarations, List<String> functionForwardDeclarations) throws CoreException {
IIndexFileSet reachableHeaders = ast.getIndexFileSet();
Set<IBinding> bindings =
removeBindingsDefinedInIncludedHeaders(ast, classifier.getBindingsToDeclare(), reachableHeaders);
@ -495,11 +492,17 @@ public class IncludeOrganizer {
// Add this forward declaration to the separate function forward declaration list.
forwardDeclarationListToUse = functionForwardDeclarations;
} else if (binding instanceof IVariable) {
IVariable variable = (IVariable) binding;
IType variableType = variable.getType();
declarationText.append("extern "); //$NON-NLS-1$
declarationText.append(ASTTypeUtil.getType(variableType, false));
declarationText.append(' ');
declarationText.append(variable.getName());
declarationText.append(';');
} else {
// We can't create a forward declaration for this binding. The binding will have
// to be defined.
bindingsToDefine.add(binding);
continue;
CUIPlugin.logError("Unexpected type of binding " + binding.getName() + //$NON-NLS-1$
" - " + binding.getClass().getSimpleName()); //$NON-NLS-1$
}
// Append the closing curly brackets from the namespaces (if any).
@ -847,7 +850,7 @@ public class IncludeOrganizer {
Set<IBinding> bindings, IIndexFileSet reachableHeaders) throws CoreException {
Set<IBinding> filteredBindings = new HashSet<IBinding>(bindings);
List<InclusionRequest> requests = createInclusionRequests(ast, bindings, reachableHeaders);
List<InclusionRequest> requests = createInclusionRequests(ast, bindings, true, reachableHeaders);
Set<IPath> allIncludedHeaders = new HashSet<IPath>();
allIncludedHeaders.addAll(fContext.getHeadersAlreadyIncluded());
allIncludedHeaders.addAll(fContext.getHeadersToInclude());
@ -862,12 +865,15 @@ public class IncludeOrganizer {
protected boolean isSatisfiedByIncludedHeaders(InclusionRequest request, Set<IPath> includedHeaders)
throws CoreException {
for (IIndexFile file : request.getDeclaringFiles().keySet()) {
IPath path = getPath(file.getLocation());
if (includedHeaders.contains(path))
return true;
IIndexInclude[] includedBy = fContext.getIndex().findIncludedBy(file, IIndex.DEPTH_INFINITE);
for (IIndexInclude include : includedBy) {
IPath path = getPath(include.getIncludedByLocation());
if (includedHeaders.contains(path)) {
path = getPath(include.getIncludedByLocation());
if (includedHeaders.contains(path))
return true;
}
}
}
return false;
@ -1106,7 +1112,8 @@ public class IncludeOrganizer {
}
private List<InclusionRequest> createInclusionRequests(IASTTranslationUnit ast,
Set<IBinding> bindingsToDefine, IIndexFileSet reachableHeaders) throws CoreException {
Set<IBinding> bindingsToDefine, boolean allowDeclarations,
IIndexFileSet reachableHeaders) throws CoreException {
List<InclusionRequest> requests = new ArrayList<InclusionRequest>(bindingsToDefine.size());
IIndex index = fContext.getIndex();
@ -1123,7 +1130,7 @@ public class IncludeOrganizer {
indexNames[indexNames.length - 1] = indexName;
}
}
} else if (binding instanceof IFunction) {
} else if (allowDeclarations || binding instanceof IFunction) {
// For functions we need to include the declaration.
indexNames = index.findDeclarations(binding);
} else {