X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FCharToken.java;h=2042145e68de43cce3b8b49737c82d2aceb1e24f;hb=cf349fcf2f460e53ad5f9dd0397eb382c4aa92b2;hp=fb02aaf2fae421e37e077a829813907f52252ddb;hpb=842f3c9b981b35721bb50d49e85c11085b2040a3;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/CharToken.java b/src/edu/berkeley/sbp/misc/CharToken.java
index fb02aaf..2042145 100644
--- a/src/edu/berkeley/sbp/misc/CharToken.java
+++ b/src/edu/berkeley/sbp/misc/CharToken.java
@@ -9,15 +9,14 @@ import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
 
 /** an implementation of Token for streams of Java <tt>char</tt> values */
-public class CharToken implements Token, IntegerTopology.IntegerMappable {
+public class CharToken implements Token, IntegerMappable {
 
     // Public //////////////////////////////////////////////////////////////////////////////
 
     public static class CharToStringParser extends Parser<CharToken,String> {
-        public CharToStringParser(Union u) { super(u); }
-        public Topology<CharToken> top() { return new IntegerTopology<CharToken>(); }
-        public Forest<String> shiftedToken(CharToken ct, Token.Location loc) {
-            return Forest.create(loc, ct.result(), null, null, false, false);
+        public CharToStringParser(Union u) { super(u, new IntegerTopology<CharToken>()); }
+        public Forest<String> shiftToken(CharToken ct, Token.Location loc) {
+            return Forest.create(loc, ct.result(), null, false, false);
         }
     }