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-07-28 16:44:25 -07:00
parent 765363be4a
commit 94ee2bc827
7 changed files with 84 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/core/dom/ast/cpp/ICPPASTInitializerList.java
View file

@ -20,7 +20,6 @@ import org.eclipse.cdt.core.dom.ast.IASTInitializerList;
* @noimplement This interface is not intended to be implemented by clients. * @noimplement This interface is not intended to be implemented by clients.
*/ */
public interface ICPPASTInitializerList extends IASTInitializerList, ICPPASTInitializerClause, ICPPASTPackExpandable { public interface ICPPASTInitializerList extends IASTInitializerList, ICPPASTInitializerClause, ICPPASTPackExpandable {
@Override @Override
ICPPASTInitializerList copy(); ICPPASTInitializerList copy();

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

@ -157,7 +157,6 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
return ASTTypeUtil.getType(this); return ASTTypeUtil.getType(this);
} }
@Override @Override
public void marshal(ITypeMarshalBuffer buffer) throws CoreException { public void marshal(ITypeMarshalBuffer buffer) throws CoreException {
int firstByte= ITypeMarshalBuffer.ARRAY_TYPE; int firstByte= ITypeMarshalBuffer.ARRAY_TYPE;
@ -174,7 +173,6 @@ public class CArrayType implements ICArrayType, ITypeContainer, ISerializableTyp
firstByte |= ITypeMarshalBuffer.FLAG1; firstByte |= ITypeMarshalBuffer.FLAG1;
} }
val= getSize(); val= getSize();
if (val != null) { if (val != null) {
firstByte |= ITypeMarshalBuffer.FLAG2; firstByte |= ITypeMarshalBuffer.FLAG2;

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/cpp/CPPTemplateNonTypeParameter.java
View file

@ -32,10 +32,9 @@ import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
/** /**
* Binding for a non-type template parameter. * Binding for a non-type template parameter.
*/ */
public class CPPTemplateNonTypeParameter extends CPPTemplateParameter implements public class CPPTemplateNonTypeParameter extends CPPTemplateParameter
ICPPTemplateNonTypeParameter { implements ICPPTemplateNonTypeParameter {
private IType type;
private IType type = null;
public CPPTemplateNonTypeParameter(IASTName name) { public CPPTemplateNonTypeParameter(IASTName name) {
super(name); super(name);
@ -123,26 +122,32 @@ public class CPPTemplateNonTypeParameter extends CPPTemplateParameter implements
public boolean isStatic() { public boolean isStatic() {
return false; return false;
} }
@Override @Override
public boolean isExtern() { public boolean isExtern() {
return false; return false;
} }
@Override @Override
public boolean isAuto() { public boolean isAuto() {
return false; return false;
} }
@Override @Override
public boolean isRegister() { public boolean isRegister() {
return false; return false;
} }
@Override @Override
public IValue getInitialValue() { public IValue getInitialValue() {
return null; return null;
} }
@Override @Override
public boolean isExternC() { public boolean isExternC() {
return false; return false;
} }
@Override @Override
public boolean isMutable() { public boolean isMutable() {
return false; return false;

18
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/index/composite/cpp/TemplateInstanceUtil.java
View file

@ -26,15 +26,16 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
import org.eclipse.cdt.core.index.IIndexBinding; import org.eclipse.cdt.core.index.IIndexBinding;
import org.eclipse.cdt.core.parser.util.ObjectMap; import org.eclipse.cdt.core.parser.util.ObjectMap;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateTypeArgument;
import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding; import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory; import org.eclipse.cdt.internal.core.index.composite.ICompositesFactory;
/** /**
* For implementation re-use in the absence of multiple inheritance * For implementation re-use in the absence of multiple inheritance.
*/ */
public class TemplateInstanceUtil { public class TemplateInstanceUtil {
public static ICPPTemplateParameterMap getTemplateParameterMap(ICompositesFactory cf, ICPPTemplateInstance rbinding) { public static ICPPTemplateParameterMap getTemplateParameterMap(ICompositesFactory cf, ICPPTemplateInstance rbinding) {
ICPPTemplateParameterMap preresult= rbinding.getTemplateParameterMap(); ICPPTemplateParameterMap preresult= rbinding.getTemplateParameterMap();
Integer[] keys= preresult.getAllParameterPositions(); Integer[] keys= preresult.getAllParameterPositions();
@ -50,8 +51,8 @@ public class TemplateInstanceUtil {
result.put(key, convert(cf, pack)); result.put(key, convert(cf, pack));
} }
} }
} catch(DOMException de) { } catch (DOMException e) {
CCorePlugin.log(de); CCorePlugin.log(e);
} }
return result; return result;
} }
@ -105,7 +106,7 @@ public class TemplateInstanceUtil {
final IType typeValue = arg.getTypeValue(); final IType typeValue = arg.getTypeValue();
IType t= cf.getCompositeType(typeValue); IType t= cf.getCompositeType(typeValue);
if (t != typeValue) { if (t != typeValue) {
return new CPPTemplateArgument(t); return new CPPTemplateTypeArgument(t);
} }
return arg; return arg;
} }
@ -128,8 +129,7 @@ public class TemplateInstanceUtil {
for (int i= 0; i < keys.length && i < keysToAdapt.length; i++) { for (int i= 0; i < keys.length && i < keysToAdapt.length; i++) {
IType type= (IType) preresult.get(keys[i]); IType type= (IType) preresult.get(keys[i]);
result.put( result.put(
cf.getCompositeBinding((IIndexFragmentBinding)keysToAdapt[i]), cf.getCompositeBinding((IIndexFragmentBinding) keysToAdapt[i]), cf.getCompositeType(type));
cf.getCompositeType(type));
} }
return result; return result;
@ -144,8 +144,8 @@ public class TemplateInstanceUtil {
public static IType[] getArguments(ICompositesFactory cf, ICPPClassTemplatePartialSpecialization rbinding) { public static IType[] getArguments(ICompositesFactory cf, ICPPClassTemplatePartialSpecialization rbinding) {
try { try {
return getArguments(cf, rbinding.getArguments()); return getArguments(cf, rbinding.getArguments());
} catch(DOMException de) { } catch (DOMException e) {
CCorePlugin.log(de); CCorePlugin.log(e);
return IType.EMPTY_TYPE_ARRAY; return IType.EMPTY_TYPE_ARRAY;
} }
} }

5
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPArgumentList.java
View file

@ -15,7 +15,6 @@ import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IValue; import org.eclipse.cdt.core.dom.ast.IValue;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.Database;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode; import org.eclipse.cdt.internal.core.pdom.dom.PDOMNode;
@ -40,7 +39,8 @@ public class PDOMCPPArgumentList {
final long block= db.malloc(2 + NODE_SIZE * len); final long block= db.malloc(2 + NODE_SIZE * len);
long p= block; long p= block;
db.putShort(p, len); p+=2; db.putShort(p, len);
p += 2;
for (int i= 0; i < len; i++, p += NODE_SIZE) { for (int i= 0; i < len; i++, p += NODE_SIZE) {
final ICPPTemplateArgument arg = templateArguments[i]; final ICPPTemplateArgument arg = templateArguments[i];
final boolean isNonType= arg.isNonTypeValue(); final boolean isNonType= arg.isNonTypeValue();
@ -54,7 +54,6 @@ public class PDOMCPPArgumentList {
return block; return block;
} }
/** /**
* Restores an array of template arguments from the database. * Restores an array of template arguments from the database.
*/ */

13
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateNonTypeParameter.java
View file

@ -24,7 +24,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateNonTypeParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameter;
import org.eclipse.cdt.internal.core.Util; import org.eclipse.cdt.internal.core.Util;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants; import org.eclipse.cdt.internal.core.index.IIndexCPPBindingConstants;
import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.Database;
import org.eclipse.cdt.internal.core.pdom.dom.IPDOMMemberOwner; import org.eclipse.cdt.internal.core.pdom.dom.IPDOMMemberOwner;
@ -35,9 +34,8 @@ import org.eclipse.core.runtime.CoreException;
/** /**
* Binding for template non-type parameter in the index. * Binding for template non-type parameter in the index.
*/ */
class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMemberOwner, class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding
ICPPTemplateNonTypeParameter, IPDOMCPPTemplateParameter { implements IPDOMMemberOwner, ICPPTemplateNonTypeParameter, IPDOMCPPTemplateParameter {
private static final int TYPE_OFFSET= PDOMCPPBinding.RECORD_SIZE; private static final int TYPE_OFFSET= PDOMCPPBinding.RECORD_SIZE;
private static final int PARAMETERID= TYPE_OFFSET + Database.TYPE_SIZE; private static final int PARAMETERID= TYPE_OFFSET + Database.TYPE_SIZE;
private static final int DEFAULTVAL= PARAMETERID + Database.VALUE_SIZE; private static final int DEFAULTVAL= PARAMETERID + Database.VALUE_SIZE;
@ -184,18 +182,22 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
public IValue getInitialValue() { public IValue getInitialValue() {
return null; return null;
} }
@Override @Override
public boolean isAuto() { public boolean isAuto() {
return false; return false;
} }
@Override @Override
public boolean isExtern() { public boolean isExtern() {
return false; return false;
} }
@Override @Override
public boolean isRegister() { public boolean isRegister() {
return false; return false;
} }
@Override @Override
public boolean isStatic() { public boolean isStatic() {
return false; return false;
@ -204,6 +206,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
public boolean isExternC() { public boolean isExternC() {
return false; return false;
} }
@Override @Override
public boolean isMutable() { public boolean isMutable() {
return false; return false;
@ -213,6 +216,7 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
public Object clone() { public Object clone() {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
/** /**
* @deprecated * @deprecated
*/ */
@ -221,5 +225,4 @@ class PDOMCPPTemplateNonTypeParameter extends PDOMCPPBinding implements IPDOMMem
public IASTExpression getDefault() { public IASTExpression getDefault() {
return null; return null;
} }
} }

2
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPTemplateParameterMap.java
View file

@ -16,7 +16,6 @@ import org.eclipse.cdt.core.dom.ast.IValue;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateArgument;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateParameterMap;
import org.eclipse.cdt.internal.core.dom.parser.ProblemType; import org.eclipse.cdt.internal.core.dom.parser.ProblemType;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateArgument;
import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap; import org.eclipse.cdt.internal.core.dom.parser.cpp.CPPTemplateParameterMap;
import org.eclipse.cdt.internal.core.pdom.db.Database; import org.eclipse.cdt.internal.core.pdom.db.Database;
import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage; import org.eclipse.cdt.internal.core.pdom.dom.PDOMLinkage;
@ -140,7 +139,6 @@ public class PDOMCPPTemplateParameterMap {
return result; return result;
} }
private static ICPPTemplateArgument readArgument(long rec, final PDOMLinkage linkage, final Database db) private static ICPPTemplateArgument readArgument(long rec, final PDOMLinkage linkage, final Database db)
throws CoreException { throws CoreException {
IType type= linkage.loadType(rec + TYPE_OFFSET); IType type= linkage.loadType(rec + TYPE_OFFSET);