X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FResult.java;h=a86c6080b99810691b966335c35c886ff1a05fdd;hp=95baeba55974e7cd9d53baffabd4e3b44fc4e296;hb=4692c8e9ba0c4b44ac5222f5bf5168703c478cbd;hpb=b3b610d65969bcd5325bdba70f9e9c9e03cc83b3 diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java index 95baeba..a86c608 100644 --- 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); }