X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FResult.java;h=6054fa150065eacf1cc81f47965485e85b51057d;hb=61566402d83d5c06d57fb850e60ca0f82c27b9a2;hp=95baeba55974e7cd9d53baffabd4e3b44fc4e296;hpb=2afdfe14e78fa0597186614937c679a09d74ecdf;p=sbp.git diff --git a/src/edu/berkeley/sbp/Result.java b/src/edu/berkeley/sbp/Result.java index 95baeba..6054fa1 100644 --- a/src/edu/berkeley/sbp/Result.java +++ b/src/edu/berkeley/sbp/Result.java @@ -1,8 +1,9 @@ -// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license +// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license package edu.berkeley.sbp; import edu.berkeley.sbp.util.*; -import edu.berkeley.sbp.Sequence.Position; +import edu.berkeley.sbp.Sequence.Pos; +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); }