X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=c37d1a81d9a289554ca05a0ab196acccb9e1c926;hp=422bdc163ce29d810d888a4ceac2b3572022e0f2;hb=93b9f1a57460257f71a4cef17419a723e294550d;hpb=d27d65cb994c6b9ae57a39f4bec99dd75c6bd6f7 diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java index 422bdc1..c37d1a8 100644 --- a/src/edu/berkeley/sbp/Parser.java +++ b/src/edu/berkeley/sbp/Parser.java @@ -3,7 +3,7 @@ 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.Position; import java.io.*; import java.util.*; @@ -279,7 +279,7 @@ public abstract class Parser { private boolean accept = false; private VisitableMap> oshifts = null; - private VisitableMap oreductions = null; + private VisitableMap oreductions = null; public final boolean doomed; // Interface Methods ////////////////////////////////////////////////////////////////////////////// @@ -294,11 +294,11 @@ public abstract class Parser { boolean canReduce(Token t) { return oreductions != null && (t==null ? eofReductions.size()>0 : oreductions.contains(t)); } void invokeEpsilonReductions(Token t, Node node) { - if (t==null) for(Pos r : eofReductions) node.invoke(r, null); + if (t==null) for(Position r : eofReductions) node.invoke(r, null); else oreductions.invoke(t, node, null); } void invokeReductions(Token t, Node node, Result b) { - if (t==null) for(Pos r : eofReductions) node.invoke(r, b); + if (t==null) for(Position r : eofReductions) node.invoke(r, b); else oreductions.invoke(t, node, b); }