From 3a3a353075a11736b9171274fc2837dfde769d4b Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Sun, 9 Nov 2008 06:08:49 +0000 Subject: [PATCH] Code formatting. --- .../dom/parser/cpp/CPPFunctionTemplate.java | 176 +++++++++--------- .../cdt/internal/core/pdom/dom/PDOMFile.java | 14 +- .../core/pdom/dom/cpp/PDOMCPPLinkage.java | 16 +- 3 files changed, 98 insertions(+), 108 deletions(-) diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java index 903163b9fc5..62bd7d83118 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPFunctionTemplate.java @@ -39,58 +39,60 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor; /** * @author aniefer */ -public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFunctionTemplate, ICPPFunction, ICPPInternalFunction { - public static final class CPPFunctionTemplateProblem extends ProblemBinding implements ICPPFunctionTemplate, ICPPFunction { +public class CPPFunctionTemplate extends CPPTemplateDefinition + implements ICPPFunctionTemplate, ICPPFunction, ICPPInternalFunction { + public static final class CPPFunctionTemplateProblem extends ProblemBinding + implements ICPPFunctionTemplate, ICPPFunction { public CPPFunctionTemplateProblem(IASTNode node, int id, char[] arg) { super(node, id, arg); } public ICPPTemplateParameter[] getTemplateParameters() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public ICPPClassTemplatePartialSpecialization[] getTemplateSpecializations() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public String[] getQualifiedName() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public char[][] getQualifiedNameCharArray() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isGloballyQualified() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isMutable() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isInline() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isExternC() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public IParameter[] getParameters() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public IScope getFunctionScope() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public IFunctionType getType() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isStatic() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isExtern() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isAuto() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean isRegister() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } public boolean takesVarArgs() throws DOMException { - throw new DOMException( this ); + throw new DOMException(this); } } @@ -102,57 +104,56 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFu @Override public void addDefinition(IASTNode node) { - if( !(node instanceof IASTName) ) + if (!(node instanceof IASTName)) return; - updateFunctionParameterBindings( (IASTName) node ); - super.addDefinition( node ); + updateFunctionParameterBindings((IASTName) node); + super.addDefinition(node); } - @Override public void addDeclaration(IASTNode node) { - if( !(node instanceof IASTName) ) + if (!(node instanceof IASTName)) return; - updateFunctionParameterBindings( (IASTName) node ); - super.addDeclaration( node ); - } + updateFunctionParameterBindings((IASTName) node); + super.addDeclaration(node); + } + /** * @param name */ private void updateFunctionParameterBindings(IASTName paramName) { IASTName defName = definition != null ? definition : declarations[0]; ICPPASTFunctionDeclarator orig = (ICPPASTFunctionDeclarator) defName.getParent(); - IASTParameterDeclaration [] ops = orig.getParameters(); - IASTParameterDeclaration [] nps = ((ICPPASTFunctionDeclarator)paramName.getParent()).getParameters(); + IASTParameterDeclaration[] ops = orig.getParameters(); + IASTParameterDeclaration[] nps = ((ICPPASTFunctionDeclarator)paramName.getParent()).getParameters(); CPPParameter temp = null; - for( int i = 0; i < nps.length; i++ ){ + for(int i = 0; i < nps.length; i++) { temp = (CPPParameter) CPPVisitor.findInnermostDeclarator(ops[i].getDeclarator()).getName().getBinding(); - if( temp != null ){ + if (temp != null) { IASTName name = CPPVisitor.findInnermostDeclarator(nps[i].getDeclarator()).getName(); - name.setBinding( temp ); - temp.addDeclaration( name ); + name.setBinding(temp); + temp.addDeclaration(name); } } } - public IParameter[] getParameters() { IASTName name = getTemplateName(); ICPPASTFunctionDeclarator fdecl= getDeclaratorByName(name); if (fdecl != null) { IASTParameterDeclaration[] params = fdecl.getParameters(); int size = params.length; - IParameter [] result = new IParameter[ size ]; - if( size > 0 ){ - for( int i = 0; i < size; i++ ){ + IParameter[] result = new IParameter[size]; + if (size > 0) { + for(int i = 0; i < size; i++) { IASTParameterDeclaration p = params[i]; final IASTName pname = CPPVisitor.findInnermostDeclarator(p.getDeclarator()).getName(); final IBinding binding= pname.resolveBinding(); if (binding instanceof IParameter) { result[i]= (IParameter) binding; - } - else { - result[i] = new CPPParameter.CPPParameterProblem(p, IProblemBinding.SEMANTIC_INVALID_TYPE, pname.toCharArray()); + } else { + result[i] = new CPPParameter.CPPParameterProblem(p, + IProblemBinding.SEMANTIC_INVALID_TYPE, pname.toCharArray()); } } } @@ -161,91 +162,89 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFu return null; } - public IScope getFunctionScope() { return null; } - public IFunctionType getType() { - if( type == null ) { + if (type == null) { IASTName name = getTemplateName(); IASTNode parent = name.getParent(); - while( parent.getParent() instanceof IASTDeclarator ) + while(parent.getParent() instanceof IASTDeclarator) parent = parent.getParent(); - IType temp = CPPVisitor.createType( (IASTDeclarator)parent ); - if( temp instanceof IFunctionType ) + IType temp = CPPVisitor.createType((IASTDeclarator)parent); + if (temp instanceof IFunctionType) type = (IFunctionType) temp; } return type; } - public boolean hasStorageClass( int storage){ + public boolean hasStorageClass(int storage) { IASTName name = (IASTName) getDefinition(); IASTNode[] ns = getDeclarations(); int i = -1; - do{ - if( name != null ){ + do { + if (name != null) { IASTNode parent = name.getParent(); - while( !(parent instanceof IASTDeclaration) ) + while(!(parent instanceof IASTDeclaration)) parent = parent.getParent(); IASTDeclSpecifier declSpec = null; - if( parent instanceof IASTSimpleDeclaration ) + if (parent instanceof IASTSimpleDeclaration) { declSpec = ((IASTSimpleDeclaration)parent).getDeclSpecifier(); - else if( parent instanceof IASTFunctionDefinition ) + } else if (parent instanceof IASTFunctionDefinition) { declSpec = ((IASTFunctionDefinition)parent).getDeclSpecifier(); - if( declSpec != null && declSpec.getStorageClass() == storage ) { + } + if (declSpec != null && declSpec.getStorageClass() == storage) { return true; } } - if( ns != null && ++i < ns.length ) + if (ns != null && ++i < ns.length) name = (IASTName) ns[i]; else break; - } while( name != null ); + } while (name != null); return false; } - public IBinding resolveParameter(IASTParameterDeclaration param) { IASTName name = CPPVisitor.findInnermostDeclarator(param.getDeclarator()).getName(); IBinding binding = name.getBinding(); - if( binding != null ) + if (binding != null) return binding; ICPPASTFunctionDeclarator fdtor = (ICPPASTFunctionDeclarator) param.getParent(); - IASTParameterDeclaration [] ps = fdtor.getParameters(); + IASTParameterDeclaration[] ps = fdtor.getParameters(); int i = 0; - for( ; i < ps.length; i++ ){ - if( param == ps[i] ) + for (; i < ps.length; i++) { + if (param == ps[i]) break; } //create a new binding and set it for the corresponding parameter in all known defns and decls - binding = new CPPParameter( name ); + binding = new CPPParameter(name); IASTParameterDeclaration temp = null; - if( definition != null ){ + if (definition != null) { ICPPASTFunctionDeclarator fdecl= getDeclaratorByName(definition); if (fdecl != null) { temp = fdecl.getParameters()[i]; IASTName n = CPPVisitor.findInnermostDeclarator(temp.getDeclarator()).getName(); - if( n != name ) { - n.setBinding( binding ); - ((CPPParameter)binding).addDeclaration( n ); + if (n != name) { + n.setBinding(binding); + ((CPPParameter)binding).addDeclaration(n); } } } - if( declarations != null ){ - for( int j = 0; j < declarations.length && declarations[j] != null; j++ ){ + if (declarations != null) { + for(int j = 0; j < declarations.length && declarations[j] != null; j++) { ICPPASTFunctionDeclarator fdecl= getDeclaratorByName(declarations[j]); if (fdecl != null) { temp = fdecl.getParameters()[i]; IASTName n = CPPVisitor.findInnermostDeclarator(temp.getDeclarator()).getName(); - if( n != name ) { - n.setBinding( binding ); - ((CPPParameter)binding).addDeclaration( n ); + if (n != name) { + n.setBinding(binding); + ((CPPParameter)binding).addDeclaration(n); } } } @@ -254,38 +253,38 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFu } public boolean isStatic() { - return hasStorageClass( IASTDeclSpecifier.sc_static); + return hasStorageClass(IASTDeclSpecifier.sc_static); } public boolean isMutable() { - return hasStorageClass( ICPPASTDeclSpecifier.sc_mutable); + return hasStorageClass(ICPPASTDeclSpecifier.sc_mutable); } - public boolean isInline() throws DOMException { IASTName name = (IASTName) getDefinition(); IASTNode[] ns = getDeclarations(); int i = -1; - do{ - if( name != null ){ + do { + if (name != null) { IASTNode parent = name.getParent(); - while( !(parent instanceof IASTDeclaration) ) + while(!(parent instanceof IASTDeclaration)) parent = parent.getParent(); IASTDeclSpecifier declSpec = null; - if( parent instanceof IASTSimpleDeclaration ) + if (parent instanceof IASTSimpleDeclaration) { declSpec = ((IASTSimpleDeclaration)parent).getDeclSpecifier(); - else if( parent instanceof IASTFunctionDefinition ) + } else if (parent instanceof IASTFunctionDefinition) { declSpec = ((IASTFunctionDefinition)parent).getDeclSpecifier(); + } - if( declSpec != null && declSpec.isInline() ) + if (declSpec != null && declSpec.isInline()) return true; } - if( ns != null && ++i < ns.length ) + if (ns != null && ++i < ns.length) name = (IASTName) ns[i]; else break; - } while( name != null ); + } while(name != null); return false; } @@ -304,25 +303,24 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFu return false; } - public boolean isExtern() { - return hasStorageClass( IASTDeclSpecifier.sc_extern); + return hasStorageClass(IASTDeclSpecifier.sc_extern); } public boolean isAuto() { - return hasStorageClass( IASTDeclSpecifier.sc_auto ); + return hasStorageClass(IASTDeclSpecifier.sc_auto); } public boolean isRegister() { - return hasStorageClass( IASTDeclSpecifier.sc_register); + return hasStorageClass(IASTDeclSpecifier.sc_register); } public boolean takesVarArgs() { ICPPASTFunctionDeclarator fdecl= getDeclaratorByName(getDefinition()); if (fdecl == null) { - IASTName [] ns = (IASTName[]) getDeclarations(); - if( ns != null && ns.length > 0 ){ - for (int i = 0; i < ns.length && fdecl==null; i++) { + IASTName[] ns = (IASTName[]) getDeclarations(); + if (ns != null && ns.length > 0) { + for (int i = 0; i < ns.length && fdecl == null; i++) { IASTName name = ns[i]; fdecl= getDeclaratorByName(name); } @@ -345,8 +343,8 @@ public class CPPFunctionTemplate extends CPPTemplateDefinition implements ICPPFu return null; } - public boolean isStatic( boolean resolveAll ) { - return hasStorageClass( IASTDeclSpecifier.sc_static ); + public boolean isStatic(boolean resolveAll) { + return hasStorageClass(IASTDeclSpecifier.sc_static); } @Override diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java index 43ca071cbea..a9bdb99df67 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMFile.java @@ -89,7 +89,7 @@ public class PDOMFile implements IIndexFragmentFile { IString name2 = db.getString(db.getInt(record2 + LOCATION_REPRESENTATION)); int cmp= name1.compare(name2, true); if (cmp == 0) { - cmp= db.getInt(record1+LINKAGE_ID) - db.getInt(record2+LINKAGE_ID); + cmp= db.getInt(record1 + LINKAGE_ID) - db.getInt(record2 + LINKAGE_ID); } return cmp; } @@ -243,8 +243,7 @@ public class PDOMFile implements IIndexFragmentFile { IASTPreprocessorMacroDefinition macro= (IASTPreprocessorMacroDefinition) stmt; PDOMMacroContainer container= linkage.getMacroContainer(macro.getName().toCharArray()); pdomMacro = new PDOMMacro(pdom, container, macro, this); - } - else if (stmt instanceof IASTPreprocessorUndefStatement) { + } else if (stmt instanceof IASTPreprocessorUndefStatement) { IASTPreprocessorUndefStatement undef= (IASTPreprocessorUndefStatement) stmt; PDOMMacroContainer container= linkage.getMacroContainer(undef.getMacroName().toCharArray()); pdomMacro = new PDOMMacro(pdom, container, undef, this); @@ -287,13 +286,11 @@ public class PDOMFile implements IIndexFragmentFile { nameCache.put(name[0], pdomName); if (lastName == null) { setFirstName(pdomName); - } - else { + } else { lastName.setNextInFile(pdomName); } lastName= pdomName; - } - else if (fname instanceof PDOMMacroReferenceName) { + } else if (fname instanceof PDOMMacroReferenceName) { PDOMMacroReferenceName macroName = (PDOMMacroReferenceName) fname; if (lastMacroName == null) { setFirstMacroReference(macroName); @@ -430,8 +427,7 @@ public class PDOMFile implements IIndexFragmentFile { include.setPrevInIncludedBy(firstIncludedBy); firstIncludedBy.setNextInIncludedBy(include); } - } - else { + } else { setFirstIncludedBy(include); } } diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java index 40c8cc94ba4..4eb8e580e7e 100644 --- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java +++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java @@ -94,7 +94,6 @@ import org.eclipse.core.runtime.CoreException; * Container for c++-entities. */ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { - public final static int CACHE_MEMBERS= 0; public final static int CACHE_BASES= 1; public final static int CACHE_INSTANCES= 2; @@ -225,7 +224,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { } } - handlePostProcesses(); + handlePostProcesses(); return pdomBinding; } @@ -256,8 +255,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { pdomBinding = adaptBinding(parent, binding); if (pdomBinding != null) { pdom.putCachedResult(inputBinding, pdomBinding); - } - else { + } else { try { pdomBinding = createBinding(parent, binding); if (pdomBinding != null) { @@ -584,7 +582,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { public final PDOMBinding adaptBinding(final IBinding inputBinding) throws CoreException { return adaptBinding(null, inputBinding); } - + private final PDOMBinding adaptBinding(final PDOMNode parent, IBinding inputBinding) throws CoreException { if (cannotAdapt(inputBinding)) { return null; @@ -646,7 +644,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { private final PDOMNode adaptOrAddParent(boolean add, IBinding binding) throws CoreException { try { IBinding owner= binding.getOwner(); - if (owner instanceof IFunction && binding instanceof ICPPTemplateParameter == false) { + if (owner instanceof IFunction && !(binding instanceof ICPPTemplateParameter)) { return null; } @@ -716,12 +714,10 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { return addBinding((ITypedef) type, null); } if (type instanceof ICPPReferenceType) { - return new PDOMCPPReferenceType(pdom, parent, - (ICPPReferenceType) type); + return new PDOMCPPReferenceType(pdom, parent, (ICPPReferenceType) type); } if (type instanceof ICPPPointerToMemberType) { - return new PDOMCPPPointerToMemberType(pdom, parent, - (ICPPPointerToMemberType) type); + return new PDOMCPPPointerToMemberType(pdom, parent, (ICPPPointerToMemberType) type); } if (type instanceof ICPPTemplateTypeParameter) { return addBinding((ICPPTemplateTypeParameter) type, null);