mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 01:36:01 +02:00
Code Issues Wiki Activity

Bug 439896 - Handle problem bindings in

Browse source 
CPPCompositesFactory.getCompositeEvaluation()

Change-Id: I96a9961f39b6bf8d9109ebe0daa30194b8f3fed4
Signed-off-by: Nathan Ridge <zeratul976@hotmail.com>
Reviewed-on: https://git.eclipse.org/r/31801
Reviewed-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Tested-by: Sergey Prigogin <eclipse.sprigogin@gmail.com>
This commit is contained in:
Nathan Ridge 2014-08-17 03:30:57 -04:00 • committed by Sergey Prigogin
parent 82f3bca7d0
commit 05d86fc1d1
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CPPCompositesFactory.java
View file

@ -281,7 +281,10 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
ICPPFunction parameterOwner = e.getParameterOwner(); ICPPFunction parameterOwner = e.getParameterOwner();
if (parameterOwner != null) { if (parameterOwner != null) {
IType b = e.getFixedType(); IType b = e.getFixedType();
IBinding a2 = getCompositeBinding((IIndexFragmentBinding) parameterOwner); IBinding a2 = parameterOwner;
if (parameterOwner instanceof IIndexFragmentBinding) {
a2 = getCompositeBinding((IIndexFragmentBinding) parameterOwner);
}
IType b2 = getCompositeType(b); IType b2 = getCompositeType(b);
if (parameterOwner != a2 || b != b2 || templateDefinition != compositeTemplateDefinition) { if (parameterOwner != a2 || b != b2 || templateDefinition != compositeTemplateDefinition) {
int parameterPosition = e.getFunctionParameterPosition(); int parameterPosition = e.getFunctionParameterPosition();
@ -291,7 +294,10 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
IBinding a = e.getBinding(); IBinding a = e.getBinding();
IType b = e.getFixedType(); IType b = e.getFixedType();
IBinding a2 = getCompositeBinding((IIndexFragmentBinding) a); IBinding a2 = a;
if (a instanceof IIndexFragmentBinding) {
a2 = getCompositeBinding((IIndexFragmentBinding) a);
}
IType b2 = getCompositeType(b); IType b2 = getCompositeType(b);
if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition) if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition)
e= new EvalBinding(a2, b2, compositeTemplateDefinition); e= new EvalBinding(a2, b2, compositeTemplateDefinition);
@ -395,7 +401,10 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
IType a = e.getOwnerType(); IType a = e.getOwnerType();
IBinding b = e.getMember(); IBinding b = e.getMember();
IType a2= getCompositeType(a); IType a2= getCompositeType(a);
IBinding b2= getCompositeBinding((IIndexFragmentBinding) b); IBinding b2= b;
if (b instanceof IIndexFragmentBinding) {
b2= getCompositeBinding((IIndexFragmentBinding) b);
}
if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition) if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition)
e= new EvalMemberAccess(a2, e.getOwnerValueCategory(), b2, e.isPointerDeref(), compositeTemplateDefinition); e= new EvalMemberAccess(a2, e.getOwnerValueCategory(), b2, e.isPointerDeref(), compositeTemplateDefinition);
return e; return e;
@ -423,7 +432,10 @@ public class CPPCompositesFactory extends AbstractCompositeFactory {
ICPPEvaluation a = e.getArgument(); ICPPEvaluation a = e.getArgument();
ICPPEvaluation a2 = getCompositeEvaluation(a); ICPPEvaluation a2 = getCompositeEvaluation(a);
IBinding b= e.getAddressOfQualifiedNameBinding(); IBinding b= e.getAddressOfQualifiedNameBinding();
IBinding b2= getCompositeBinding((IIndexFragmentBinding) b); IBinding b2= b;
if (b instanceof IIndexFragmentBinding) {
b2= getCompositeBinding((IIndexFragmentBinding) b);
}
if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition) if (a != a2 || b != b2 || templateDefinition != compositeTemplateDefinition)
e= new EvalUnary(e.getOperator(), a2, b2, compositeTemplateDefinition); e= new EvalUnary(e.getOperator(), a2, b2, compositeTemplateDefinition);
return e; return e;