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

Code formatting.

Browse source
This commit is contained in:
Sergey Prigogin 2008-11-17 19:22:54 +00:00
parent 3d48bf4f02
commit 2aedcbec84
6 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateDefinition.java
View file

@ -67,7 +67,6 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
} }
} }
//private IASTName templateName;
protected IASTName[] declarations; protected IASTName[] declarations;
protected IASTName definition; protected IASTName definition;
@ -115,7 +114,7 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
public ICPPTemplateInstance[] getAllInstances() { public ICPPTemplateInstance[] getAllInstances() {
if (instances != null) { if (instances != null) {
ICPPTemplateInstance[] result= new ICPPTemplateInstance[instances.size()]; ICPPTemplateInstance[] result= new ICPPTemplateInstance[instances.size()];
for (int i=0; i < instances.size(); i++) { for (int i= 0; i < instances.size(); i++) {
result[i]= (ICPPTemplateInstance) instances.getAt(i); result[i]= (ICPPTemplateInstance) instances.getAt(i);
} }
return result; return result;
@ -194,7 +193,7 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
} }
return templateParameters; return templateParameters;
} }
/* (non-Javadoc) /* (non-Javadoc)
* @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode) * @see org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPInternalBinding#addDefinition(org.eclipse.cdt.core.dom.ast.IASTNode)
*/ */
@ -275,7 +274,7 @@ public abstract class CPPTemplateDefinition extends PlatformObject implements IC
final protected void updateTemplateParameterBindings(IASTName name) { final protected void updateTemplateParameterBindings(IASTName name) {
ICPPASTTemplateParameter[] updateParams = CPPTemplates.getTemplateDeclaration(name).getTemplateParameters(); ICPPASTTemplateParameter[] updateParams = CPPTemplates.getTemplateDeclaration(name).getTemplateParameters();
int k=0; int k= 0;
int tdeclLen= declarations == null ? 0 : declarations.length; int tdeclLen= declarations == null ? 0 : declarations.length;
for (int i= -1; i < tdeclLen && k < updateParams.length; i++) { for (int i= -1; i < tdeclLen && k < updateParams.length; i++) {
IASTName tdecl; IASTName tdecl;

7
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateParameter.java
View file

@ -37,7 +37,7 @@ import org.eclipse.core.runtime.PlatformObject;
*/ */
public abstract class CPPTemplateParameter extends PlatformObject public abstract class CPPTemplateParameter extends PlatformObject
implements ICPPTemplateParameter, ICPPInternalBinding, ICPPTwoPhaseBinding { implements ICPPTemplateParameter, ICPPInternalBinding, ICPPTwoPhaseBinding {
private IASTName [] declarations; private IASTName[] declarations;
private final int position; private final int position;
public CPPTemplateParameter(IASTName name) { public CPPTemplateParameter(IASTName name) {
@ -105,7 +105,6 @@ public abstract class CPPTemplateParameter extends PlatformObject
return declarations[0].toCharArray(); return declarations[0].toCharArray();
} }
public int getParameterPosition() { public int getParameterPosition() {
return position; return position;
} }
@ -140,7 +139,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
* @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray() * @see org.eclipse.cdt.core.dom.ast.cpp.ICPPBinding#getQualifiedNameCharArray()
*/ */
public char[][] getQualifiedNameCharArray() { public char[][] getQualifiedNameCharArray() {
return new char [][] {getNameCharArray() }; return new char[][] {getNameCharArray() };
} }
/* (non-Javadoc) /* (non-Javadoc)
@ -185,7 +184,7 @@ public abstract class CPPTemplateParameter extends PlatformObject
} else { } else {
if (declarations.length > 0 && declarations[0] == node) if (declarations.length > 0 && declarations[0] == node)
return; return;
//keep the lowest offset declaration in [0] // keep the lowest offset declaration in [0]
if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode)declarations[0]).getOffset()) { if (declarations.length > 0 && ((ASTNode)node).getOffset() < ((ASTNode)declarations[0]).getOffset()) {
declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name); declarations = (IASTName[]) ArrayUtil.prepend(IASTName.class, declarations, name);
} else { } else {

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplate.java
View file

@ -36,25 +36,25 @@ public class CompositeCPPClassTemplate extends CompositeCPPClassType
public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations()
throws DOMException { throws DOMException {
try { try {
IIndexFragmentBinding[] bindings= ((CIndex)((CPPCompositesFactory)cf).getContext()).findEquivalentBindings(rbinding); IIndexFragmentBinding[] bindings= ((CIndex)((CPPCompositesFactory) cf).getContext()).findEquivalentBindings(rbinding);
IIndexFragmentBinding[][] preresult= new IIndexFragmentBinding[bindings.length][]; IIndexFragmentBinding[][] preresult= new IIndexFragmentBinding[bindings.length][];
for(int i=0; i<bindings.length; i++) { for (int i= 0; i < bindings.length; i++) {
ICPPClassTemplatePartialSpecialization[] ss= ((ICPPClassTemplate)bindings[i]).getPartialSpecializations(); ICPPClassTemplatePartialSpecialization[] ss= ((ICPPClassTemplate) bindings[i]).getPartialSpecializations();
preresult[i]= new IIndexFragmentBinding[ss.length]; preresult[i]= new IIndexFragmentBinding[ss.length];
System.arraycopy(ss, 0, preresult[i], 0, ss.length); System.arraycopy(ss, 0, preresult[i], 0, ss.length);
} }
return (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.addAll(ICPPClassTemplatePartialSpecialization.class, null, cf.getCompositeBindings(preresult)); return (ICPPClassTemplatePartialSpecialization[]) ArrayUtil.addAll(ICPPClassTemplatePartialSpecialization.class, null, cf.getCompositeBindings(preresult));
} catch(CoreException ce) { } catch (CoreException ce) {
CCorePlugin.log(ce); CCorePlugin.log(ce);
return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY; return ICPPClassTemplatePartialSpecialization.EMPTY_PARTIAL_SPECIALIZATION_ARRAY;
} }
} }
public ICPPTemplateParameter[] getTemplateParameters() throws DOMException { public ICPPTemplateParameter[] getTemplateParameters() throws DOMException {
ICPPTemplateParameter[] result= ((ICPPClassTemplate)rbinding).getTemplateParameters(); ICPPTemplateParameter[] result= ((ICPPClassTemplate) rbinding).getTemplateParameters();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]); result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplateSpecialization.java
View file

@ -31,16 +31,16 @@ CompositeCPPClassSpecialization implements ICPPClassTemplate, ICPPInstanceCache{
public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations() public ICPPClassTemplatePartialSpecialization[] getPartialSpecializations()
throws DOMException { throws DOMException {
ICPPClassTemplatePartialSpecialization[] result= ((ICPPClassTemplate)rbinding).getPartialSpecializations(); ICPPClassTemplatePartialSpecialization[] result= ((ICPPClassTemplate) rbinding).getPartialSpecializations();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i]= (ICPPClassTemplatePartialSpecialization) cf.getCompositeBinding((IIndexFragmentBinding)result[i]); result[i]= (ICPPClassTemplatePartialSpecialization) cf.getCompositeBinding((IIndexFragmentBinding)result[i]);
} }
return result; return result;
} }
public ICPPTemplateParameter[] getTemplateParameters() throws DOMException { public ICPPTemplateParameter[] getTemplateParameters() throws DOMException {
ICPPTemplateParameter[] result= ((ICPPClassTemplate)rbinding).getTemplateParameters(); ICPPTemplateParameter[] result= ((ICPPClassTemplate) rbinding).getTemplateParameters();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]); result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplate.java
View file

@ -29,8 +29,8 @@ public class CompositeCPPFunctionTemplate extends CompositeCPPFunction
} }
public ICPPTemplateParameter[] getTemplateParameters() throws DOMException { public ICPPTemplateParameter[] getTemplateParameters() throws DOMException {
ICPPTemplateParameter[] result= ((ICPPFunctionTemplate)rbinding).getTemplateParameters(); ICPPTemplateParameter[] result= ((ICPPFunctionTemplate) rbinding).getTemplateParameters();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]); result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPFunctionTemplateSpecialization.java
View file

@ -29,8 +29,8 @@ public class CompositeCPPFunctionTemplateSpecialization extends CompositeCPPFunc
} }
public ICPPTemplateParameter[] getTemplateParameters() throws DOMException { public ICPPTemplateParameter[] getTemplateParameters() throws DOMException {
ICPPTemplateParameter[] result= ((ICPPFunctionTemplate)rbinding).getTemplateParameters(); ICPPTemplateParameter[] result= ((ICPPFunctionTemplate) rbinding).getTemplateParameters();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]); result[i]= (ICPPTemplateParameter) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;