use Sequence.Pos rather than Sequence.Position wherever possible

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

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 861c323..c37d1a8 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -1,9 +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.Position;
 import java.io.*;
 import java.util.*;
 
@@ -279,7 +279,7 @@ public abstract class Parser<Token, NodeType> {
             private           boolean                             accept              = false;
 
             private VisitableMap<Token,State<Token>> oshifts     = null;
-            private VisitableMap<Token,Pos>     oreductions = null;
+            private VisitableMap<Token,Position>     oreductions = null;
             public  final boolean doomed;
 
             // Interface Methods //////////////////////////////////////////////////////////////////////////////
@@ -294,11 +294,11 @@ public abstract class Parser<Token, NodeType> {
             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);
             }