Skip to content
Snippets Groups Projects
Commit 24a15cb6 authored by dgelessus's avatar dgelessus
Browse files

Replace NodeIdAssignment with INodeIds in TlaTypePrinter

NodeIdAssignment was recently removed from the B parser.
parent dbe929f5
No related branches found
No related tags found
Loading
...@@ -4,7 +4,7 @@ import java.util.ArrayList; ...@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import de.be4.classicalb.core.parser.analysis.prolog.NodeIdAssignment; import de.be4.classicalb.core.parser.analysis.prolog.INodeIds;
import de.be4.classicalb.core.parser.analysis.prolog.PositionPrinter; import de.be4.classicalb.core.parser.analysis.prolog.PositionPrinter;
import de.be4.classicalb.core.parser.node.Node; import de.be4.classicalb.core.parser.node.Node;
import de.hhu.stups.sablecc.patch.PositionedNode; import de.hhu.stups.sablecc.patch.PositionedNode;
...@@ -14,13 +14,13 @@ import de.tla2b.types.BoolType; ...@@ -14,13 +14,13 @@ import de.tla2b.types.BoolType;
import de.tla2b.types.EnumType; import de.tla2b.types.EnumType;
import de.tla2b.types.FunctionType; import de.tla2b.types.FunctionType;
import de.tla2b.types.IntType; import de.tla2b.types.IntType;
import de.tla2b.types.TLAType;
import de.tla2b.types.ModelValueType; import de.tla2b.types.ModelValueType;
import de.tla2b.types.PairType; import de.tla2b.types.PairType;
import de.tla2b.types.SetType; import de.tla2b.types.SetType;
import de.tla2b.types.StringType; import de.tla2b.types.StringType;
import de.tla2b.types.StructOrFunctionType; import de.tla2b.types.StructOrFunctionType;
import de.tla2b.types.StructType; import de.tla2b.types.StructType;
import de.tla2b.types.TLAType;
import de.tla2b.types.TupleType; import de.tla2b.types.TupleType;
import de.tla2b.types.UntypedType; import de.tla2b.types.UntypedType;
...@@ -28,19 +28,15 @@ public class TlaTypePrinter implements PositionPrinter, TypeVisitorInterface { ...@@ -28,19 +28,15 @@ public class TlaTypePrinter implements PositionPrinter, TypeVisitorInterface {
private IPrologTermOutput pout; private IPrologTermOutput pout;
// to look up the identifier of each node // to look up the identifier of each node
public final NodeIdAssignment nodeIds; public final INodeIds nodeIds;
private final Hashtable<Node, TLAType> typeTable; private final Hashtable<Node, TLAType> typeTable;
private HashSet<PositionedNode> positions; private HashSet<PositionedNode> positions;
// public TlaTypePrinter(final NodeIdAssignment nodeIds) { public TlaTypePrinter(INodeIds nodeIds,
// this.nodeIds = nodeIds;
// }
public TlaTypePrinter(NodeIdAssignment nodeIdAssignment,
Hashtable<Node, TLAType> typeTable) { Hashtable<Node, TLAType> typeTable) {
this.nodeIds = nodeIdAssignment; this.nodeIds = nodeIds;
this.typeTable = typeTable; this.typeTable = typeTable;
} }
...@@ -55,19 +51,19 @@ public class TlaTypePrinter implements PositionPrinter, TypeVisitorInterface { ...@@ -55,19 +51,19 @@ public class TlaTypePrinter implements PositionPrinter, TypeVisitorInterface {
} }
final Integer id = nodeIds.lookup(node); final Integer id = nodeIds.lookup(node);
if (id == null) {
pout.printAtom("none");
} else {
if (positions != null && positions.contains(node)) { if (positions != null && positions.contains(node)) {
PositionedNode pNode = (PositionedNode) node; PositionedNode pNode = (PositionedNode) node;
pout.openTerm("pos", true); pout.openTerm("pos", true);
pout.printNumber(id); pout.printNumber(id == null ? -1 : id);
pout.printNumber(nodeIds.lookupFileNumber(node)); pout.printNumber(nodeIds.lookupFileNumber(node));
pout.printNumber(pNode.getStartPos().getLine()); pout.printNumber(pNode.getStartPos().getLine());
pout.printNumber(pNode.getStartPos().getPos()); pout.printNumber(pNode.getStartPos().getPos());
pout.printNumber(pNode.getEndPos().getLine()); pout.printNumber(pNode.getEndPos().getLine());
pout.printNumber(pNode.getEndPos().getPos()); pout.printNumber(pNode.getEndPos().getPos());
pout.closeTerm(); pout.closeTerm();
} else {
if (id == null) {
pout.printAtom("none");
} else { } else {
pout.printNumber(id); pout.printNumber(id);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment