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

Don't depend on CPPVisitor in PDOMBinding.

Browse source
This commit is contained in:
Sergey Prigogin 2011-03-09 23:22:47 +00:00
parent 648eb73972
commit b7073a4f52
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMBinding.java
View file

@ -28,7 +28,6 @@ import org.eclipse.cdt.core.dom.ast.cpp.ICPPEnumeration;
import org.eclipse.cdt.core.index.IIndexFileSet; import org.eclipse.cdt.core.index.IIndexFileSet;
import org.eclipse.cdt.core.parser.util.CharArrayUtils; import org.eclipse.cdt.core.parser.util.CharArrayUtils;
import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding; import org.eclipse.cdt.internal.core.dom.parser.cpp.ICPPUnknownBinding;
import org.eclipse.cdt.internal.core.dom.parser.cpp.semantics.CPPVisitor;
import org.eclipse.cdt.internal.core.index.IIndexFragment; import org.eclipse.cdt.internal.core.index.IIndexFragment;
import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding; import org.eclipse.cdt.internal.core.index.IIndexFragmentBinding;
import org.eclipse.cdt.internal.core.index.IIndexFragmentBindingComparator; import org.eclipse.cdt.internal.core.index.IIndexFragmentBindingComparator;
@ -82,8 +81,8 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
public static boolean isOrphaned(PDOM pdom, long record) throws CoreException { public static boolean isOrphaned(PDOM pdom, long record) throws CoreException {
Database db = pdom.getDB(); Database db = pdom.getDB();
return db.getRecPtr(record + FIRST_DECL_OFFSET) == 0 return db.getRecPtr(record + FIRST_DECL_OFFSET) == 0
&& db.getRecPtr(record + FIRST_DEF_OFFSET) == 0 && db.getRecPtr(record + FIRST_DEF_OFFSET) == 0
&& db.getRecPtr(record + FIRST_REF_OFFSET) == 0; && db.getRecPtr(record + FIRST_REF_OFFSET) == 0;
} }
public final boolean hasDeclaration() throws CoreException { public final boolean hasDeclaration() throws CoreException {
@ -304,8 +303,8 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
} }
} }
final public String[] getQualifiedName() { public String[] getQualifiedName() {
return CPPVisitor.getQualifiedName(this); return new String[] { getName() };
} }
final public boolean isFileLocal() throws CoreException { final public boolean isFileLocal() throws CoreException {
@ -352,7 +351,7 @@ public abstract class PDOMBinding extends PDOMNamedNode implements IPDOMBinding
cmp = b0 == b1 ? 0 : (b0 == null ? -1 : 1); cmp = b0 == b1 ? 0 : (b0 == null ? -1 : 1);
} }
} }
} while(cmp == 0 && b1 != null && b0 != null); } while (cmp == 0 && b1 != null && b0 != null);
return cmp; return cmp;
} catch (CoreException ce) { } catch (CoreException ce) {
CCorePlugin.log(ce); CCorePlugin.log(ce);

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

@ -34,6 +34,11 @@ public abstract class PDOMCPPBinding extends PDOMBinding implements ICPPBinding
super(linkage, parent, name); super(linkage, parent, name);
} }
@Override
final public String[] getQualifiedName() {
return CPPVisitor.getQualifiedName(this);
}
final public char[][] getQualifiedNameCharArray() { final public char[][] getQualifiedNameCharArray() {
return CPPVisitor.getQualifiedNameCharArray(this); return CPPVisitor.getQualifiedNameCharArray(this);
} }