mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

@Override annotations.

Browse source
This commit is contained in:
Sergey Prigogin 2012-01-07 15:11:17 -08:00
parent 8ab95e93b5
commit 28699d05bb
2 changed files with 30 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPCompositeBinding.java
View file

@ -21,54 +21,42 @@ import org.eclipse.cdt.internal.core.dom.Linkage;
import org.eclipse.core.runtime.PlatformObject; import org.eclipse.core.runtime.PlatformObject;
public class CPPCompositeBinding extends PlatformObject implements IBinding { public class CPPCompositeBinding extends PlatformObject implements IBinding {
IBinding[] bindings;
IBinding [] bindings = null; public CPPCompositeBinding(IBinding[] bindingList) {
bindings = (IBinding[]) ArrayUtil.trim(IBinding.class, bindingList, true);
public CPPCompositeBinding( IBinding[] bindingList ){
bindings = (IBinding[]) ArrayUtil.trim( IBinding.class, bindingList, true );
} }
/* (non-Javadoc) @Override
* @see org.eclipse.cdt.core.dom.ast.IBinding#getName()
*/
public String getName() { public String getName() {
return bindings[0].getName(); return bindings[0].getName();
} }
/* (non-Javadoc) @Override
* @see org.eclipse.cdt.core.dom.ast.IBinding#getNameCharArray()
*/
public char[] getNameCharArray() { public char[] getNameCharArray() {
return bindings[0].getNameCharArray(); return bindings[0].getNameCharArray();
} }
/* (non-Javadoc) @Override
* @see org.eclipse.cdt.core.dom.ast.IBinding#getScope()
*/
public IScope getScope() throws DOMException { public IScope getScope() throws DOMException {
return bindings[0].getScope(); return bindings[0].getScope();
} }
@Override
public IBinding getOwner() { public IBinding getOwner() {
return bindings[0].getOwner(); return bindings[0].getOwner();
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.IBinding#getPhysicalNode()
*/
public IASTNode getPhysicalNode() { public IASTNode getPhysicalNode() {
return null; return null;
} }
/* (non-Javadoc)
* @see org.eclipse.cdt.core.dom.ast.cpp.ICPPCompositeBinding#getBindings()
*/
public IBinding[] getBindings() { public IBinding[] getBindings() {
return bindings; return bindings;
} }
@Override
public ILinkage getLinkage() { public ILinkage getLinkage() {
return Linkage.CPP_LINKAGE; return Linkage.CPP_LINKAGE;
} }
} }

40
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/CompositeScope.java
View file

@ -6,8 +6,8 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Andrew Ferguson (Symbian) - Initial implementation * Andrew Ferguson (Symbian) - Initial implementation
* Markus Schorn (Wind River Systems) * Markus Schorn (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.index.composite; package org.eclipse.cdt.internal.core.index.composite;
@ -38,24 +38,26 @@ public abstract class CompositeScope implements IIndexScope {
protected final IIndexFragmentBinding rbinding; protected final IIndexFragmentBinding rbinding;
public CompositeScope(ICompositesFactory cf, IIndexFragmentBinding rbinding) { public CompositeScope(ICompositesFactory cf, IIndexFragmentBinding rbinding) {
if(cf==null || rbinding==null) if (cf == null || rbinding == null)
throw new NullPointerException(); throw new NullPointerException();
this.cf = cf; this.cf = cf;
this.rbinding = rbinding; this.rbinding = rbinding;
} }
@Override
public IIndexScope getParent() { public IIndexScope getParent() {
IIndexScope rscope = rbinding.getScope(); IIndexScope rscope = rbinding.getScope();
if(rscope!=null) { if (rscope != null) {
return cf.getCompositeScope(rscope); return cf.getCompositeScope(rscope);
} }
return null; return null;
} }
@Override
public IIndexName getScopeName() { public IIndexName getScopeName() {
if(rbinding instanceof IIndexScope) if (rbinding instanceof IIndexScope)
return ((IIndexScope) rbinding).getScopeName(); return ((IIndexScope) rbinding).getScopeName();
if(rbinding instanceof ICPPClassType) if (rbinding instanceof ICPPClassType)
return (IIndexName) ((ICPPClassType) rbinding).getCompositeScope().getScopeName(); return (IIndexName) ((ICPPClassType) rbinding).getCompositeScope().getScopeName();
return null; return null;
} }
@ -76,22 +78,22 @@ public abstract class CompositeScope implements IIndexScope {
* @return a suitable binding at the composite layer * @return a suitable binding at the composite layer
*/ */
protected final IBinding processUncertainBinding(IBinding binding) { protected final IBinding processUncertainBinding(IBinding binding) {
if(binding instanceof IIndexFragmentBinding) { if (binding instanceof IIndexFragmentBinding) {
return cf.getCompositeBinding((IIndexFragmentBinding)binding); return cf.getCompositeBinding((IIndexFragmentBinding)binding);
} else if(binding instanceof ProblemBinding) { } else if (binding instanceof ProblemBinding) {
return binding; return binding;
} else if(binding instanceof CPPCompositeBinding /* AST composite */) { } else if (binding instanceof CPPCompositeBinding /* AST composite */) {
return new CPPCompositeBinding( return new CPPCompositeBinding(
processUncertainBindings(((CPPCompositeBinding)binding).getBindings()) processUncertainBindings(((CPPCompositeBinding) binding).getBindings())
); );
} else if(binding instanceof CPPUsingDeclaration) { } else if (binding instanceof CPPUsingDeclaration) {
return binding; return binding;
} else if(binding == null) { } else if (binding == null) {
return null; return null;
} else if(binding instanceof ICPPSpecialization) { } else if (binding instanceof ICPPSpecialization) {
return binding; return binding;
} }
CCorePlugin.log("CompositeFactory unsure how to process: "+binding.getClass().getName()); //$NON-NLS-1$ CCorePlugin.log("CompositeFactory unsure how to process: " + binding.getClass().getName()); //$NON-NLS-1$
return binding; return binding;
} }
@ -102,9 +104,9 @@ public abstract class CompositeScope implements IIndexScope {
* @return a non-null IBinding[] * @return a non-null IBinding[]
*/ */
protected final IBinding[] processUncertainBindings(IBinding[] frgBindings) { protected final IBinding[] processUncertainBindings(IBinding[] frgBindings) {
if(frgBindings != null) { if (frgBindings != null) {
IBinding[] result= new IBinding[frgBindings.length]; IBinding[] result= new IBinding[frgBindings.length];
for(int i=0; i<result.length; i++) { for(int i= 0; i < result.length; i++) {
result[i]= processUncertainBinding(frgBindings[i]); result[i]= processUncertainBinding(frgBindings[i]);
} }
return result; return result;
@ -112,19 +114,21 @@ public abstract class CompositeScope implements IIndexScope {
return IBinding.EMPTY_BINDING_ARRAY; return IBinding.EMPTY_BINDING_ARRAY;
} }
@Override
public final IBinding getBinding(IASTName name, boolean resolve) { public final IBinding getBinding(IASTName name, boolean resolve) {
return getBinding(name, resolve, IIndexFileSet.EMPTY); return getBinding(name, resolve, IIndexFileSet.EMPTY);
} }
@Override
public final IBinding[] getBindings(IASTName name, boolean resolve, boolean prefix) { public final IBinding[] getBindings(IASTName name, boolean resolve, boolean prefix) {
return getBindings(name, resolve, prefix, IIndexFileSet.EMPTY); return getBindings(name, resolve, prefix, IIndexFileSet.EMPTY);
} }
@Override
/** /**
* The c++-name resolution stores scopes in hash-maps, we need to make sure equality is detected * The c++-name resolution stores scopes in hash-maps, we need to make sure equality is detected
* in order to prevent infinite loops. * in order to prevent infinite loops.
*/ */
@Override
public final boolean equals(Object other) { public final boolean equals(Object other) {
if (other instanceof CompositeScope) { if (other instanceof CompositeScope) {
return rbinding.equals(((CompositeScope)other).rbinding); return rbinding.equals(((CompositeScope)other).rbinding);
@ -132,11 +136,11 @@ public abstract class CompositeScope implements IIndexScope {
return false; return false;
} }
@Override
/** /**
* The c++-name resolution stores scopes in hash-maps, we need to make sure equality is detected * The c++-name resolution stores scopes in hash-maps, we need to make sure equality is detected
* in order to prevent infinite loops. * in order to prevent infinite loops.
*/ */
@Override
public final int hashCode() { public final int hashCode() {
return rbinding.hashCode(); return rbinding.hashCode();
} }