factor Pos out of Position in preparation for serialiable parse tables

[sbp.git] / src / edu / berkeley / sbp / Result.java

diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java
index 95baeba..a86c608 100644 (file)
--- a/src/edu/berkeley/sbp/Result.java
+++ b/src/edu/berkeley/sbp/Result.java
@@ -3,6 +3,7 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
 import java.util.*;
 
 final class Result implements GraphViz.ToGraphViz {
@@ -46,15 +47,15 @@ final class Result implements GraphViz.ToGraphViz {
             }
     }
 
-    public Result(Forest f, Node parent, Position reduction) {
+    public Result(Forest f, Node parent, Pos reduction) {
         this(f, parent, reduction, null);
     }
-    public Result(Forest f, Node parent, Position reduction, GSS.Phase target) {
+    public Result(Forest f, Node parent, Pos reduction, GSS.Phase target) {
         this.f = f;
         this.parent = parent;
         if (parent != null) parent.addChild(this);
         if (reduction == null) return;
-        Parser.Table.State state0 = (Parser.Table.State)parent.state().gotoSetNonTerminals.get(reduction.owner());
+        Parser.Table.State state0 = (Parser.Table.State)parent.state().gotoSetNonTerminals.get(reduction);
         target.newNodeFromReduction(this, state0, reduction);
     }