mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 10:46:02 +02:00
Code Issues Wiki Activity

Compiler warnings.

Browse source
This commit is contained in:
Sergey Prigogin 2008-04-14 02:02:55 +00:00
parent 555148b018
commit 0c6ec32e51
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage.java
View file

@ -91,7 +91,6 @@ import org.eclipse.core.runtime.CoreException;
/** /**
* @author Doug Schaefer * @author Doug Schaefer
*
*/ */
class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants { class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
public PDOMCPPLinkage(PDOM pdom, int record) { public PDOMCPPLinkage(PDOM pdom, int record) {
@ -251,16 +250,16 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
if (parent == null) if (parent == null)
return null; return null;
if(binding instanceof ICPPSpecialization) { if (binding instanceof ICPPSpecialization) {
IBinding specialized= ((ICPPSpecialization)binding).getSpecializedBinding(); IBinding specialized= ((ICPPSpecialization)binding).getSpecializedBinding();
PDOMBinding pdomSpecialized= adaptBinding(specialized); PDOMBinding pdomSpecialized= adaptBinding(specialized);
if(pdomSpecialized == null) { if (pdomSpecialized == null) {
addBinding(specialized, null); addBinding(specialized, null);
} }
} }
pdomBinding = adaptBinding(binding); pdomBinding = adaptBinding(binding);
if(pdomBinding == null) { if (pdomBinding == null) {
pdomBinding = addBinding(parent, binding); pdomBinding = addBinding(parent, binding);
if ((pdomBinding instanceof PDOMCPPClassInstance || pdomBinding instanceof PDOMCPPDeferredClassInstance) && binding instanceof ICPPClassType) { if ((pdomBinding instanceof PDOMCPPClassInstance || pdomBinding instanceof PDOMCPPDeferredClassInstance) && binding instanceof ICPPClassType) {
// Add instantiated constructors to the index (bug 201174). // Add instantiated constructors to the index (bug 201174).
@ -316,7 +315,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
if (binding instanceof ICPPSpecialization) { if (binding instanceof ICPPSpecialization) {
IBinding specialized = ((ICPPSpecialization)binding).getSpecializedBinding(); IBinding specialized = ((ICPPSpecialization)binding).getSpecializedBinding();
PDOMBinding pdomSpecialized= adaptBinding(specialized); PDOMBinding pdomSpecialized= adaptBinding(specialized);
if(pdomSpecialized == null) if (pdomSpecialized == null)
return null; return null;
if (binding instanceof ICPPDeferredTemplateInstance) { if (binding instanceof ICPPDeferredTemplateInstance) {
if (binding instanceof ICPPFunction && pdomSpecialized instanceof ICPPFunctionTemplate) { if (binding instanceof ICPPFunction && pdomSpecialized instanceof ICPPFunctionTemplate) {
@ -388,7 +387,7 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
// } else if (binding instanceof ICPPTemplateNonTypeParameter) { // } else if (binding instanceof ICPPTemplateNonTypeParameter) {
// pdomBinding = new PDOMCPPTemplateNonTypeParameter(pdom, parent, (ICPPTemplateNonTypeParameter)binding); // pdomBinding = new PDOMCPPTemplateNonTypeParameter(pdom, parent, (ICPPTemplateNonTypeParameter)binding);
// } // }
} else if (binding instanceof ICPPField ) { } else if (binding instanceof ICPPField) {
if (parent instanceof PDOMCPPClassType || parent instanceof PDOMCPPClassSpecialization) { if (parent instanceof PDOMCPPClassType || parent instanceof PDOMCPPClassSpecialization) {
pdomBinding = new PDOMCPPField(pdom, parent, (ICPPField) binding); pdomBinding = new PDOMCPPField(pdom, parent, (ICPPField) binding);
} }
@ -771,7 +770,6 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
} }
@Override @Override
@SuppressWarnings("hiding")
public PDOMNode getNode(int record) throws CoreException { public PDOMNode getNode(int record) throws CoreException {
if (record == 0) if (record == 0)
return null; return null;
@ -880,12 +878,11 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
IASTNode parentNode= name.getParent(); IASTNode parentNode= name.getParent();
if (parentNode instanceof ICPPASTQualifiedName) { if (parentNode instanceof ICPPASTQualifiedName) {
IASTName [] ns = ((ICPPASTQualifiedName)parentNode).getNames(); IASTName[] ns = ((ICPPASTQualifiedName) parentNode).getNames();
if ( name != ns[ ns.length -1 ] ) { if (name != ns[ns.length - 1]) {
return; return;
} else {
parentNode = parentNode.getParent();
} }
parentNode = parentNode.getParent();
} }
if (parentNode instanceof ICPPASTBaseSpecifier) { if (parentNode instanceof ICPPASTBaseSpecifier) {
PDOMName derivedClassName= (PDOMName) pdomName.getEnclosingDefinition(); PDOMName derivedClassName= (PDOMName) pdomName.getEnclosingDefinition();
@ -893,13 +890,13 @@ class PDOMCPPLinkage extends PDOMLinkage implements IIndexCPPBindingConstants {
ICPPASTBaseSpecifier baseNode= (ICPPASTBaseSpecifier) parentNode; ICPPASTBaseSpecifier baseNode= (ICPPASTBaseSpecifier) parentNode;
PDOMBinding derivedClassBinding= derivedClassName.getBinding(); PDOMBinding derivedClassBinding= derivedClassName.getBinding();
if (derivedClassBinding instanceof PDOMCPPClassType) { if (derivedClassBinding instanceof PDOMCPPClassType) {
PDOMCPPClassType ownerClass = (PDOMCPPClassType)derivedClassBinding; PDOMCPPClassType ownerClass = (PDOMCPPClassType) derivedClassBinding;
PDOMCPPBase pdomBase = new PDOMCPPBase(pdom, pdomName, baseNode.isVirtual(), PDOMCPPBase pdomBase = new PDOMCPPBase(pdom, pdomName, baseNode.isVirtual(),
baseNode.getVisibility()); baseNode.getVisibility());
ownerClass.addBase(pdomBase); ownerClass.addBase(pdomBase);
pdomName.setIsBaseSpecifier(true); pdomName.setIsBaseSpecifier(true);
} else if (derivedClassBinding instanceof PDOMCPPClassSpecialization) { } else if (derivedClassBinding instanceof PDOMCPPClassSpecialization) {
PDOMCPPClassSpecialization ownerClass = (PDOMCPPClassSpecialization)derivedClassBinding; PDOMCPPClassSpecialization ownerClass = (PDOMCPPClassSpecialization) derivedClassBinding;
PDOMCPPBase pdomBase = new PDOMCPPBase(pdom, pdomName, baseNode.isVirtual(), PDOMCPPBase pdomBase = new PDOMCPPBase(pdom, pdomName, baseNode.isVirtual(),
baseNode.getVisibility()); baseNode.getVisibility());
ownerClass.addBase(pdomBase); ownerClass.addBase(pdomBase);