From b4981a7e628eb0a1c091e4aa313408cc054781b2 Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Mon, 25 Aug 2008 01:14:00 +0000 Subject: [PATCH] Fixed spelling of reverseConstantPropagationLookup (245053). --- .../parser/cpp/semantics/CPPTemplates.java | 22 +++-- .../dom/parser/cpp/semantics/CPPVisitor.java | 92 +++++++++---------- .../core/index/IndexCPPSignatureUtil.java | 2 +- .../core/pdom/dom/cpp/PDOMCPPBasicType.java | 2 +- 4 files changed, 60 insertions(+), 58 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java index 8918b70abcf..76d4b9849a6 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPTemplates.java @@ -189,7 +189,7 @@ public class CPPTemplates { */ private static IBinding instantiateSelectedTemplate(ICPPTemplateDefinition template, IType[] arguments) throws DOMException { - Assert.isTrue(template instanceof ICPPClassTemplatePartialSpecialization == false); + Assert.isTrue(!(template instanceof ICPPClassTemplatePartialSpecialization)); ICPPTemplateParameter[] parameters= template.getTemplateParameters(); if (parameters == null || parameters.length == 0) @@ -262,7 +262,7 @@ public class CPPTemplates { // we do not correctly distinguish between type and non-type parameters, this works // around getting the wrong instance when providing a value rather than a type. if (instance != null) { - if (argsContainDependentType || instance instanceof ICPPDeferredClassInstance == false) + if (argsContainDependentType || !(instance instanceof ICPPDeferredClassInstance)) return instance; } @@ -1007,8 +1007,8 @@ public class CPPTemplates { parent = parent.getParent(); } if (parent instanceof IASTDeclSpecifier) { - if (parent instanceof IASTCompositeTypeSpecifier == false - && parent instanceof IASTElaboratedTypeSpecifier == false) { + if (!(parent instanceof IASTCompositeTypeSpecifier) && + !(parent instanceof IASTElaboratedTypeSpecifier)) { return null; } parent = parent.getParent(); @@ -1017,7 +1017,7 @@ public class CPPTemplates { parent = parent.getParent(); } } - if (parent instanceof IASTDeclaration == false) { + if (!(parent instanceof IASTDeclaration)) { return null; } @@ -1282,7 +1282,7 @@ public class CPPTemplates { * will include its value) */ if (param instanceof IASTIdExpression) { - param= CPPVisitor.reverseConstantPropogationLookup((IASTIdExpression)param); + param= CPPVisitor.reverseConstantPropagationLookup((IASTIdExpression)param); } IType type= CPPVisitor.createType(param); @@ -1523,8 +1523,8 @@ public class CPPTemplates { if (e1 == null) return true; - e1= CPPVisitor.reverseConstantPropogationLookup(e1); - e2= CPPVisitor.reverseConstantPropogationLookup(e2); + e1= CPPVisitor.reverseConstantPropagationLookup(e1); + e2= CPPVisitor.reverseConstantPropagationLookup(e2); if (e1 instanceof IASTLiteralExpression && e2 instanceof IASTLiteralExpression) { IType t1= e1.getExpressionType(); @@ -1887,7 +1887,8 @@ public class CPPTemplates { return !(argument instanceof IProblemBinding); } - static protected boolean matchTemplateParameterAndArgument(ICPPTemplateParameter param, IType argument, ObjectMap map) { + static protected boolean matchTemplateParameterAndArgument(ICPPTemplateParameter param, IType argument, + ObjectMap map) { if (!isValidArgument(param, argument)) { return false; } @@ -1897,7 +1898,8 @@ public class CPPTemplates { if (!(argument instanceof ICPPTemplateDefinition)) return false; - ICPPTemplateParameter[] pParams = null, aParams = null; + ICPPTemplateParameter[] pParams = null; + ICPPTemplateParameter[] aParams = null; try { pParams = ((ICPPTemplateTemplateParameter) param).getTemplateParameters(); aParams = ((ICPPTemplateDefinition) argument).getTemplateParameters(); diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java index 6dc5494d5ee..5cd2ee68814 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/semantics/CPPVisitor.java @@ -567,7 +567,7 @@ public class CPPVisitor { if (parent instanceof IASTStandardFunctionDeclarator) { IASTStandardFunctionDeclarator fdtor = (IASTStandardFunctionDeclarator) param.getParent(); // if the fdtor does not declare a function we don't create a binding for the parameter. - if (findOutermostDeclarator(fdtor).getParent() instanceof IASTDeclaration == false || + if (!(findOutermostDeclarator(fdtor).getParent() instanceof IASTDeclaration) || findTypeRelevantDeclarator(fdtor) != fdtor) return null; IBinding temp = findInnermostDeclarator(fdtor).getName().resolveBinding(); @@ -779,7 +779,7 @@ public class CPPVisitor { } else if (node instanceof IASTTypeId) { if (node.getPropertyInParent() == ICPPASTTemplateId.TEMPLATE_ID_ARGUMENT) { node= node.getParent(); // template-id - while(node instanceof IASTName) { + while (node instanceof IASTName) { node= node.getParent(); } continue; @@ -1540,9 +1540,9 @@ public class CPPVisitor { IScope scope = fnDtor.getFunctionScope(); IType thisType= getThisType(scope); IASTDeclarator nested = fnDtor.getNestedDeclarator(); - if(thisType == null && nested != null) { + if (thisType == null && nested != null) { IType pts= getPointerTypes(new CPPBasicType(-1,-1), nested); - if(pts instanceof ICPPPointerToMemberType) { + if (pts instanceof ICPPPointerToMemberType) { thisType= new CPPPointerType(((ICPPPointerToMemberType)pts).getMemberOfClass()); } } @@ -1582,9 +1582,9 @@ public class CPPVisitor { // Currently, CPPBasicType objects are also used to represent non-type template argument // values. We must ensure the initializer expression is attached to the type if available. - if(declarator.getInitializer() instanceof IASTInitializerExpression) { + if (declarator.getInitializer() instanceof IASTInitializerExpression) { IType utype= getUltimateTypeUptoPointers(baseType); - if(utype instanceof CPPBasicType) { + if (utype instanceof CPPBasicType) { ((CPPBasicType)utype).setValue(((IASTInitializerExpression) declarator.getInitializer()).getExpression()); } } @@ -1801,11 +1801,11 @@ public class CPPVisitor { } else if (expression instanceof ICPPASTLiteralExpression) { ICPPASTLiteralExpression lit= (ICPPASTLiteralExpression) expression; switch(lit.getKind()) { - case ICPPASTLiteralExpression.lk_this : { + case ICPPASTLiteralExpression.lk_this: { IScope scope = getContainingScope(expression); return getThisType(scope); } - case ICPPASTLiteralExpression.lk_true : + case ICPPASTLiteralExpression.lk_true: case ICPPASTLiteralExpression.lk_false: return new CPPBasicType(ICPPBasicType.t_bool, 0, expression); case IASTLiteralExpression.lk_char_constant: @@ -1836,7 +1836,7 @@ public class CPPVisitor { } else if (binding instanceof IFunction) { IFunctionType fType; try { - fType = ((IFunction)binding).getType(); + fType = ((IFunction) binding).getType(); if (fType != null) return fType.getReturnType(); } catch (DOMException e) { @@ -1844,12 +1844,12 @@ public class CPPVisitor { } } else if (binding instanceof IVariable) { try { - IType t = ((IVariable)binding).getType(); + IType t = ((IVariable) binding).getType(); while (t instanceof ITypedef) { t = ((ITypedef)t).getType(); } - if (t instanceof IPointerType && ((IPointerType)t).getType() instanceof IFunctionType) { - IFunctionType ftype = (IFunctionType) ((IPointerType)t).getType(); + if (t instanceof IPointerType && ((IPointerType) t).getType() instanceof IFunctionType) { + IFunctionType ftype = (IFunctionType) ((IPointerType) t).getType(); if (ftype != null) return ftype.getReturnType(); } @@ -1865,11 +1865,11 @@ public class CPPVisitor { } } else if (binding instanceof ITypedef) { try { - IType type = ((ITypedef)binding).getType(); + IType type = ((ITypedef) binding).getType(); while (type instanceof ITypedef) - type = ((ITypedef)type).getType(); + type = ((ITypedef) type).getType(); if (type instanceof IFunctionType) { - return ((IFunctionType)type).getReturnType(); + return ((IFunctionType) type).getReturnType(); } return type; } catch (DOMException e) { @@ -2166,7 +2166,6 @@ public class CPPVisitor { public static IASTProblem[] getProblems(IASTTranslationUnit tu) { CollectProblemsAction action = new CollectProblemsAction(); tu.accept(action); - return action.getProblems(); } @@ -2182,9 +2181,9 @@ public class CPPVisitor { IASTName[] found = action.getDeclarations(); if (found.length == 0 && binding instanceof ICPPSpecialization && binding instanceof ICPPInternalBinding) { - IASTNode node = ((ICPPInternalBinding)binding).getDefinition(); + IASTNode node = ((ICPPInternalBinding) binding).getDefinition(); if (node == null) { - IASTNode[] nds = ((ICPPInternalBinding)binding).getDeclarations(); + IASTNode[] nds = ((ICPPInternalBinding) binding).getDeclarations(); if (nds != null && nds.length > 0) node = nds[0]; } @@ -2312,7 +2311,7 @@ public class CPPVisitor { IASTIdExpression ide= (IASTIdExpression) fne; IBinding b= ide.getName().resolveBinding(); if (b instanceof IFunction) { - IFunctionType tp= ((IFunction)b).getType(); + IFunctionType tp= ((IFunction) b).getType(); return !(tp.getReturnType() instanceof ICPPReferenceType); } } @@ -2333,28 +2332,29 @@ public class CPPVisitor { */ public static BigInteger parseIntegral(String integral) { int radix= 10; - if(integral.length() == 3 + if (integral.length() == 3 && integral.charAt(0) == '\'' && integral.charAt(2) == '\'') { String lo= Long.toString(Character.getNumericValue(integral.charAt(1))); return new BigInteger(lo); - } else if(Keywords.TRUE.equals(integral)) { + } else if (Keywords.TRUE.equals(integral)) { return BigInteger.ONE; - } else if(Keywords.FALSE.equals(integral)) { + } else if (Keywords.FALSE.equals(integral)) { return BigInteger.ZERO; } - int start=0, end= integral.length(); + int start=0; + int end= integral.length(); - boolean negate= integral.charAt(start)=='-'; - if(negate || integral.charAt(start)=='+') { + boolean negate= integral.charAt(start) == '-'; + if (negate || integral.charAt(start) == '+') { start++; } - if(start0; end--) { + for (end--; end > 0; end--) { final char c= integral.charAt(end); - if(c != 'L' && c!='l' && c!='U' && c!='u') { + if (c != 'L' && c!='l' && c!='U' && c!='u') { break; } } @@ -2379,25 +2379,25 @@ public class CPPVisitor { * @param e1 * @return the first non id-expression by following values assigned to basic types. */ - public static final IASTExpression reverseConstantPropogationLookup(IASTExpression e1) { + public static final IASTExpression reverseConstantPropagationLookup(IASTExpression e1) { try { - for(int i=0; e1 instanceof IASTIdExpression && i<8; i++) { + for(int i= 0; e1 instanceof IASTIdExpression && i < 8; i++) { IBinding b1= ((IASTIdExpression)e1).getName().resolveBinding(); - if(b1 instanceof ICPPVariable) { + if (b1 instanceof ICPPVariable) { ICPPVariable var= (ICPPVariable) b1; IType t1= SemanticUtil.getUltimateTypeViaTypedefs(var.getType()); - if(t1 instanceof IQualifierType) { + if (t1 instanceof IQualifierType) { IQualifierType qt= (IQualifierType) t1; - if(qt.isConst()) { + if (qt.isConst()) { t1= SemanticUtil.getUltimateTypeViaTypedefs(qt.getType()); - if(t1 instanceof ICPPBasicType) { - e1= ((ICPPBasicType)t1).getValue(); + if (t1 instanceof ICPPBasicType) { + e1= ((ICPPBasicType) t1).getValue(); } } } } } - } catch(DOMException de) { + } catch (DOMException de) { CCorePlugin.log(de); } return e1; @@ -2410,7 +2410,7 @@ public class CPPVisitor { public static IASTDeclarator findOutermostDeclarator(IASTDeclarator declarator) { IASTDeclarator outermost= null; IASTNode candidate= declarator; - while(candidate instanceof IASTDeclarator) { + while (candidate instanceof IASTDeclarator) { outermost= (IASTDeclarator) candidate; candidate= outermost.getParent(); } @@ -2423,7 +2423,7 @@ public class CPPVisitor { */ public static IASTDeclarator findInnermostDeclarator(IASTDeclarator declarator) { IASTDeclarator innermost= null; - while(declarator != null) { + while (declarator != null) { innermost= declarator; declarator= declarator.getNestedDeclarator(); } @@ -2436,9 +2436,9 @@ public class CPPVisitor { public static IASTDeclarator findTypeRelevantDeclarator(IASTDeclarator declarator) { IASTDeclarator result= findInnermostDeclarator(declarator); while (result.getPointerOperators().length == 0 - && result instanceof IASTFieldDeclarator == false - && result instanceof IASTFunctionDeclarator == false - && result instanceof IASTArrayModifier == false) { + && !(result instanceof IASTFieldDeclarator) + && !(result instanceof IASTFunctionDeclarator) + && !(result instanceof IASTArrayModifier)) { final IASTNode parent= result.getParent(); if (parent instanceof IASTDeclarator) { result= (IASTDeclarator) parent; @@ -2453,7 +2453,7 @@ public class CPPVisitor { * Searches for the function enclosing the given node. May return null. */ public static IBinding findEnclosingFunction(IASTNode node) { - while(node != null && node instanceof IASTFunctionDefinition == false) { + while (node != null && !(node instanceof IASTFunctionDefinition)) { node= node.getParent(); } if (node == null) @@ -2490,7 +2490,7 @@ public class CPPVisitor { */ public static IBinding findDeclarationOwner(IASTNode node, boolean allowFunction) { // search for declaration - while (node instanceof IASTDeclaration == false) { + while (!(node instanceof IASTDeclaration)) { if (node == null) return null; diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexCPPSignatureUtil.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexCPPSignatureUtil.java index a26ff0ad73b..d73424cc9df 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexCPPSignatureUtil.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/IndexCPPSignatureUtil.java @@ -117,7 +117,7 @@ public class IndexCPPSignatureUtil { } private static String getValueString(IASTExpression e) { - e= CPPVisitor.reverseConstantPropogationLookup(e); + e= CPPVisitor.reverseConstantPropagationLookup(e); if (e instanceof IASTLiteralExpression) { IType t1= e.getExpressionType(); try { diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java index 9f425cc98da..af2ce08bd35 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPBasicType.java @@ -65,7 +65,7 @@ class PDOMCPPBasicType extends PDOMNode implements ICPPBasicType, IIndexType { db.putShort(record + TYPE_ID, getTypeCode(type)); try { if(type.getValue() != null) { - IASTExpression e= CPPVisitor.reverseConstantPropogationLookup(type.getValue()); + IASTExpression e= CPPVisitor.reverseConstantPropagationLookup(type.getValue()); if(e != null) { db.putInt(record + INTEGRAL, CPPVisitor.parseIntegral(e.toString()).intValue()); db.putByte(record + INTERNAL_FLAGS, (byte)1);