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

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2012-08-07 12:17:20 -07:00
parent 128debaae2
commit 4d10542b57
7 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/Linkage.java
View file

@ -33,7 +33,7 @@ public class Linkage implements ILinkage {
} }
public static String getLinkageName(int linkageID) throws CoreException { public static String getLinkageName(int linkageID) throws CoreException {
switch(linkageID) { switch (linkageID) {
case NO_LINKAGE_ID: return NO_LINKAGE_NAME; case NO_LINKAGE_ID: return NO_LINKAGE_NAME;
case C_LINKAGE_ID: return C_LINKAGE_NAME; case C_LINKAGE_ID: return C_LINKAGE_NAME;
case CPP_LINKAGE_ID: return CPP_LINKAGE_NAME; case CPP_LINKAGE_ID: return CPP_LINKAGE_NAME;

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassSpecialization.java
View file

@ -122,7 +122,7 @@ public class CPPClassSpecialization extends CPPSpecialization
@Override @Override
public ICPPBase[] getBases() { public ICPPBase[] getBases() {
return getBases(null); return getBases(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -164,7 +164,7 @@ public class CPPClassSpecialization extends CPPSpecialization
@Override @Override
public ICPPConstructor[] getConstructors() { public ICPPConstructor[] getConstructors() {
return getConstructors(null); return getConstructors(null); // Instantiation of dependent expression may not work.
} }
@Override @Override

9
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPClassTemplatePartialSpecializationSpecialization.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.dom.parser.cpp; package org.eclipse.cdt.internal.core.dom.parser.cpp;
@ -30,8 +30,7 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPTemplates;
*/ */
public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClassSpecialization public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClassSpecialization
implements ICPPClassTemplatePartialSpecializationSpecialization, ICPPInternalClassTemplate { implements ICPPClassTemplatePartialSpecializationSpecialization, ICPPInternalClassTemplate {
private ObjectMap instances;
private ObjectMap instances = null;
private ICPPDeferredClassInstance fDeferredInstance; private ICPPDeferredClassInstance fDeferredInstance;
private final ICPPClassTemplate fClassTemplate; private final ICPPClassTemplate fClassTemplate;
private final ICPPTemplateArgument[] fArguments; private final ICPPTemplateArgument[] fArguments;
@ -70,7 +69,7 @@ public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClas
public synchronized ICPPTemplateInstance[] getAllInstances() { public synchronized 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;
@ -142,7 +141,7 @@ public class CPPClassTemplatePartialSpecializationSpecialization extends CPPClas
@Override @Override
public ICPPTemplateArgument getDefaultArgFromIndex(int paramPos) throws DOMException { public ICPPTemplateArgument getDefaultArgFromIndex(int paramPos) throws DOMException {
// no default arguments for partial specializations // No default arguments for partial specializations
return null; return null;
} }
} }

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassScope.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.cpp; package org.eclipse.cdt.internal.core.index.composite.cpp;
@ -43,8 +43,8 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
public ICPPMethod[] getImplicitMethods() { public ICPPMethod[] getImplicitMethods() {
ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope(); ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
ICPPMethod[] result = rscope.getImplicitMethods(); ICPPMethod[] result = rscope.getImplicitMethods();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i] = (ICPPMethod) cf.getCompositeBinding((IIndexFragmentBinding)result[i]); result[i] = (ICPPMethod) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;
} }
@ -53,15 +53,15 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
public ICPPConstructor[] getConstructors() { public ICPPConstructor[] getConstructors() {
ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope(); ICPPClassScope rscope = (ICPPClassScope) ((ICPPClassType)rbinding).getCompositeScope();
ICPPConstructor[] result = rscope.getConstructors(); ICPPConstructor[] result = rscope.getConstructors();
for(int i=0; i<result.length; i++) { for (int i= 0; i < result.length; i++) {
result[i] = (ICPPConstructor) cf.getCompositeBinding((IIndexFragmentBinding)result[i]); result[i] = (ICPPConstructor) cf.getCompositeBinding((IIndexFragmentBinding) result[i]);
} }
return result; return result;
} }
@Override @Override
public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) { public IBinding getBinding(IASTName name, boolean resolve, IIndexFileSet fileSet) {
IBinding binding = ((ICPPClassType)rbinding).getCompositeScope().getBinding(name, resolve, fileSet); IBinding binding = ((ICPPClassType) rbinding).getCompositeScope().getBinding(name, resolve, fileSet);
return processUncertainBinding(binding); return processUncertainBinding(binding);
} }
@ -72,13 +72,13 @@ class CompositeCPPClassScope extends CompositeScope implements ICPPClassScope {
@Override @Override
public IBinding[] getBindings(ScopeLookupData lookup) { public IBinding[] getBindings(ScopeLookupData lookup) {
IBinding[] bindings = ((ICPPClassType)rbinding).getCompositeScope().getBindings(lookup); IBinding[] bindings = ((ICPPClassType) rbinding).getCompositeScope().getBindings(lookup);
return processUncertainBindings(bindings); return processUncertainBindings(bindings);
} }
@Override @Override
public IBinding[] find(String name) { public IBinding[] find(String name) {
IBinding[] preresult = ((ICPPClassType)rbinding).getCompositeScope().find(name); IBinding[] preresult = ((ICPPClassType) rbinding).getCompositeScope().find(name);
return processUncertainBindings(preresult); return processUncertainBindings(preresult);
} }

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

@ -129,7 +129,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final ICPPBase[] getBases() { public final ICPPBase[] getBases() {
return getBases(null); return getBases(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -143,7 +143,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final ICPPConstructor[] getConstructors() { public final ICPPConstructor[] getConstructors() {
return getConstructors(null); return getConstructors(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -157,7 +157,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final ICPPMethod[] getDeclaredMethods() { public final ICPPMethod[] getDeclaredMethods() {
return getDeclaredMethods(null); return getDeclaredMethods(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -171,7 +171,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final ICPPField[] getDeclaredFields() { public final ICPPField[] getDeclaredFields() {
return getDeclaredFields(null); return getDeclaredFields(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -185,7 +185,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final IBinding[] getFriends() { public final IBinding[] getFriends() {
return getFriends(null); return getFriends(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -199,7 +199,7 @@ public class CompositeCPPClassSpecialization extends CompositeCPPClassType imple
@Override @Override
public final ICPPClassType[] getNestedClasses() { public final ICPPClassType[] getNestedClasses() {
return getNestedClasses(null); return getNestedClasses(null); // Instantiation of dependent expression may not work.
} }
@Override @Override

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/CompositeCPPClassTemplatePartialSpecializationSpecialization.java
View file

@ -6,7 +6,7 @@
* http://www.eclipse.org/legal/epl-v10.html * http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Markus Schorn - initial API and implementation * Markus Schorn - initial API and implementation
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core.index.composite.cpp; package org.eclipse.cdt.internal.core.index.composite.cpp;

12
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPClassSpecialization.java
View file

@ -208,7 +208,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public ICPPBase[] getBases() { public ICPPBase[] getBases() {
return getBases(null); return getBases(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -241,7 +241,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public ICPPConstructor[] getConstructors() { public ICPPConstructor[] getConstructors() {
return getConstructors(null); return getConstructors(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -262,7 +262,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public ICPPMethod[] getDeclaredMethods() { public ICPPMethod[] getDeclaredMethods() {
return getDeclaredMethods(null); return getDeclaredMethods(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -283,7 +283,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public ICPPField[] getDeclaredFields() { public ICPPField[] getDeclaredFields() {
return getDeclaredFields(null); return getDeclaredFields(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -304,7 +304,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public ICPPClassType[] getNestedClasses() { public ICPPClassType[] getNestedClasses() {
return getNestedClasses(null); return getNestedClasses(null); // Instantiation of dependent expression may not work.
} }
@Override @Override
@ -325,7 +325,7 @@ class PDOMCPPClassSpecialization extends PDOMCPPSpecialization implements
@Override @Override
public IBinding[] getFriends() { public IBinding[] getFriends() {
return getFriends(null); return getFriends(null); // Instantiation of dependent expression may not work.
} }
@Override @Override