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

Removed uses of the deprecated PDOMLinkage.getNode(long) method.

Browse source
This commit is contained in:
Sergey Prigogin 2014-01-15 20:32:09 -08:00
parent 8d14ab8793
commit a0ce578175
14 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/PDOMPrettyPrinter.java
View file

@ -25,7 +25,7 @@ import org.eclipse.core.runtime.CoreException;
/** /**
* Dump the contents of the PDOM index to stdout (for when you need * Dump the contents of the PDOM index to stdout (for when you need
* a lo-fidelity debugging tool) * a low-fidelity debugging tool)
*/ */
public class PDOMPrettyPrinter implements IPDOMVisitor { public class PDOMPrettyPrinter implements IPDOMVisitor {
StringBuilder indent = new StringBuilder(); StringBuilder indent = new StringBuilder();
@ -89,7 +89,7 @@ public class PDOMPrettyPrinter implements IPDOMVisitor {
public boolean visit(long record) throws CoreException { public boolean visit(long record) throws CoreException {
if (record == 0) if (record == 0)
return false; return false;
PDOMNode node = linkage.getNode(record); PDOMNode node = PDOMNode.load(pdom, record);
if (v.visit(node)) if (v.visit(node))
node.accept(v); node.accept(v);
v.leave(node); v.leave(node);

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/PDOMNodeLinkedList.java
View file

@ -65,7 +65,7 @@ public class PDOMNodeLinkedList {
} }
node= null; node= null;
} else { } else {
node= linkage.getNode(record); node= PDOMNode.load(linkage.getPDOM(), record);
} }
if (visitor.visit(node) && node != null) { if (visitor.visit(node) && node != null) {
node.accept(visitor); node.accept(visitor);
@ -102,7 +102,7 @@ public class PDOMNodeLinkedList {
} }
return null; return null;
} else { } else {
return linkage.getNode(record); return PDOMNode.load(linkage.getPDOM(), record);
} }
} }
} while ((item = db.getRecPtr(item + ListItem.NEXT)) != firstItem); } while ((item = db.getRecPtr(item + ListItem.NEXT)) != firstItem);

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/db/TypeMarshalBuffer.java
View file

@ -103,7 +103,7 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer {
if (firstBytes == BINDING_TYPE) { if (firstBytes == BINDING_TYPE) {
fPos += 1; fPos += 1;
long rec= getRecordPointer(); long rec= getRecordPointer();
return (IBinding) fLinkage.getNode(rec); return (IBinding) PDOMNode.load(fLinkage.getPDOM(), rec);
} else if (firstBytes == NULL_TYPE || firstBytes == UNSTORABLE_TYPE) { } else if (firstBytes == NULL_TYPE || firstBytes == UNSTORABLE_TYPE) {
return null; return null;
} }
@ -133,7 +133,7 @@ public final class TypeMarshalBuffer implements ITypeMarshalBuffer {
if (firstBytes == BINDING_TYPE) { if (firstBytes == BINDING_TYPE) {
fPos += 1; fPos += 1;
long rec= getRecordPointer(); long rec= getRecordPointer();
return (IType) fLinkage.getNode(rec); return (IType) PDOMNode.load(fLinkage.getPDOM(), rec);
} else if (firstBytes == NULL_TYPE) { } else if (firstBytes == NULL_TYPE) {
return null; return null;
} else if (firstBytes == UNSTORABLE_TYPE) { } else if (firstBytes == UNSTORABLE_TYPE) {

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

@ -46,7 +46,7 @@ public class ApplyVisitor implements IBTreeVisitor, IPDOMVisitor {
public boolean visit(long record) throws CoreException { public boolean visit(long record) throws CoreException {
if (record == 0) if (record == 0)
return true; return true;
PDOMNode node= linkage.getNode(record); PDOMNode node= PDOMNode.load(linkage.getPDOM(), record);
if(node instanceof PDOMBinding) { if(node instanceof PDOMBinding) {
((PDOMBinding)node).accept(visitor); ((PDOMBinding)node).accept(visitor);
((PDOMBinding)node).accept(this); ((PDOMBinding)node).accept(this);

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

@ -89,7 +89,7 @@ public class FindBinding {
// IBTreeVisitor // IBTreeVisitor
@Override @Override
public boolean visit(long record) throws CoreException { public boolean visit(long record) throws CoreException {
final PDOMNamedNode nnode = (PDOMNamedNode) fLinkage.getNode(record); final PDOMNamedNode nnode = (PDOMNamedNode) PDOMNode.load(fLinkage.getPDOM(), record);
if (nnode instanceof PDOMBinding) { if (nnode instanceof PDOMBinding) {
final PDOMBinding binding = (PDOMBinding) nnode; final PDOMBinding binding = (PDOMBinding) nnode;
if (matches(binding)) { if (matches(binding)) {

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

@ -121,7 +121,7 @@ public class NamedNodeCollector implements IBTreeVisitor, IPDOMVisitor {
if (record == 0) if (record == 0)
return true; return true;
PDOMNode node= linkage.getNode(record); PDOMNode node= PDOMNode.load(linkage.getPDOM(), record);
if (node instanceof PDOMNamedNode) { if (node instanceof PDOMNamedNode) {
return addNode((PDOMNamedNode) node); return addNode((PDOMNamedNode) node);
} }

4
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/PDOMLinkage.java
View file

@ -158,7 +158,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
} }
@Override @Override
public boolean visit(long record) throws CoreException { public boolean visit(long record) throws CoreException {
PDOMNode node= getNode(record); PDOMNode node= PDOMNode.load(fPDOM, record);
if (node != null) { if (node != null) {
if (visitor.visit(node)) if (visitor.visit(node))
node.accept(visitor); node.accept(visitor);
@ -176,7 +176,7 @@ public abstract class PDOMLinkage extends PDOMNamedNode implements IIndexLinkage
} }
public final PDOMBinding getBinding(long record) throws CoreException { public final PDOMBinding getBinding(long record) throws CoreException {
final PDOMNode node= getNode(record); final PDOMNode node= PDOMNode.load(fPDOM, record);
if (node instanceof PDOMBinding) if (node instanceof PDOMBinding)
return (PDOMBinding) node; return (PDOMBinding) node;
return null; return null;

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

@ -198,7 +198,7 @@ public abstract class PDOMNode implements IInternalPDOMNode {
public PDOMNode getParentNode() throws CoreException { public PDOMNode getParentNode() throws CoreException {
long parentrec = getParentNodeRec(); long parentrec = getParentNodeRec();
return parentrec != 0 ? getLinkage().getNode(parentrec) : null; return parentrec != 0 ? load(getPDOM(), parentrec) : null;
} }
public void addChild(PDOMNode child) throws CoreException { public void addChild(PDOMNode child) throws CoreException {

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

@ -104,7 +104,7 @@ class PDOMCPPClassTemplatePartialSpecializationSpecialization extends PDOMCPPCla
if (fPrimaryTemplate == null) { if (fPrimaryTemplate == null) {
try { try {
long specializedRec = getDB().getRecPtr(record + PRIMARY_TEMPLATE); long specializedRec = getDB().getRecPtr(record + PRIMARY_TEMPLATE);
fPrimaryTemplate= (ICPPClassTemplate) getLinkage().getNode(specializedRec); fPrimaryTemplate= (ICPPClassTemplate) PDOMNode.load(getPDOM(), specializedRec);
} catch (CoreException e) { } catch (CoreException e) {
CCorePlugin.log(e); CCorePlugin.log(e);
} }

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

@ -252,7 +252,7 @@ class PDOMCPPNamespace extends PDOMCPPBinding
} }
@Override @Override
public boolean visit(long record) throws CoreException { public boolean visit(long record) throws CoreException {
preresult.add(getLinkage().getNode(record)); preresult.add(PDOMNode.load(getPDOM(), record));
return true; return true;
} }
}); });

6
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPNamespaceAlias.java
View file

@ -109,9 +109,9 @@ class PDOMCPPNamespaceAlias extends PDOMCPPBinding implements ICPPNamespaceAlias
@Override @Override
public IBinding getBinding() { public IBinding getBinding() {
try { try {
return (IBinding) getLinkage().getNode(getPDOM().getDB().getRecPtr(record + NAMESPACE_BINDING)); return (IBinding) PDOMNode.load(getPDOM(), getPDOM().getDB().getRecPtr(record + NAMESPACE_BINDING));
} catch(CoreException ce) { } catch (CoreException e) {
CCorePlugin.log(ce); CCorePlugin.log(e);
} }
return null; return null;
} }

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

@ -78,7 +78,7 @@ abstract class PDOMCPPSpecialization extends PDOMCPPBinding implements ICPPSpeci
} }
protected IPDOMBinding loadSpecializedBinding(long specializedRec) throws CoreException { protected IPDOMBinding loadSpecializedBinding(long specializedRec) throws CoreException {
return (IPDOMBinding) getLinkage().getNode(specializedRec); return (IPDOMBinding) PDOMNode.load(getPDOM(), specializedRec);
} }
@Override @Override

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

@ -66,7 +66,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
public ICPPNamespaceScope getNominatedScope() { public ICPPNamespaceScope getNominatedScope() {
try { try {
long rec = fLinkage.getDB().getRecPtr(fRecord + NOMINATED_NAMESPACE); long rec = fLinkage.getDB().getRecPtr(fRecord + NOMINATED_NAMESPACE);
PDOMNode node= fLinkage.getNode(rec); PDOMNode node= PDOMNode.load(fLinkage.getPDOM(), rec);
if (node instanceof ICPPNamespace) { if (node instanceof ICPPNamespace) {
return ((ICPPNamespace) node).getNamespaceScope(); return ((ICPPNamespace) node).getNamespaceScope();
} }
@ -85,7 +85,7 @@ public class PDOMCPPUsingDirective implements ICPPUsingDirective, IPDOMNode {
try { try {
long rec = fLinkage.getDB().getRecPtr(fRecord + CONTAINER_NAMESPACE); long rec = fLinkage.getDB().getRecPtr(fRecord + CONTAINER_NAMESPACE);
if (rec != 0) { if (rec != 0) {
PDOMNode node= fLinkage.getNode(rec); PDOMNode node= PDOMNode.load(fLinkage.getPDOM(), rec);
if (node instanceof PDOMCPPNamespace) { if (node instanceof PDOMCPPNamespace) {
return (PDOMCPPNamespace) node; return (PDOMCPPNamespace) node;
} }

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

@ -15,6 +15,7 @@ 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.core.dom.ast.cpp.ICPPTemplateTemplateParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTemplateParameter;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter; import org.eclipse.cdt.core.dom.ast.cpp.ICPPTemplateTypeParameter;
import org.eclipse.cdt.internal.core.pdom.PDOM;
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;
@ -46,8 +47,8 @@ public class PDOMTemplateParameterArray {
* Restores an array of template arguments from the database. * Restores an array of template arguments from the database.
*/ */
public static IPDOMCPPTemplateParameter[] getArray(PDOMNode parent, long rec) throws CoreException { public static IPDOMCPPTemplateParameter[] getArray(PDOMNode parent, long rec) throws CoreException {
final PDOMLinkage linkage= parent.getLinkage(); final PDOM pdom= parent.getPDOM();
final Database db= linkage.getDB(); final Database db= pdom.getDB();
final short len= db.getShort(rec); final short len= db.getShort(rec);
Assert.isTrue(len >= 0 && len <= (Database.MAX_MALLOC_SIZE - 2) / 8); Assert.isTrue(len >= 0 && len <= (Database.MAX_MALLOC_SIZE - 2) / 8);
@ -59,7 +60,7 @@ public class PDOMTemplateParameterArray {
IPDOMCPPTemplateParameter[] result= new IPDOMCPPTemplateParameter[len]; IPDOMCPPTemplateParameter[] result= new IPDOMCPPTemplateParameter[len];
for (int i= 0; i < len; i++) { for (int i= 0; i < len; i++) {
final long nodeRec= db.getRecPtr(rec); rec += 4; final long nodeRec= db.getRecPtr(rec); rec += 4;
result[i]= nodeRec == 0 ? null : (IPDOMCPPTemplateParameter) linkage.getNode(nodeRec); result[i]= nodeRec == 0 ? null : (IPDOMCPPTemplateParameter) PDOMNode.load(pdom, nodeRec);
} }
return result; return result;
} }