X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharParser.java;h=7b6d560e600999f9957f499536a947177c70a078;hb=78a166e98747ddeb79310ccba340f292fa8a6dca;hp=b5e6dfcda264b6a68f91fdaa15db9d5cf68cbdfd;hpb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;p=sbp.git

diff --git a/src/edu/berkeley/sbp/chr/CharParser.java b/src/edu/berkeley/sbp/chr/CharParser.java
index b5e6dfc..7b6d560 100644
--- a/src/edu/berkeley/sbp/chr/CharParser.java
+++ b/src/edu/berkeley/sbp/chr/CharParser.java
@@ -3,12 +3,8 @@
 package edu.berkeley.sbp.chr;
 import java.io.*;
 import java.util.*;
-import java.lang.reflect.*;
-import java.lang.ref.*;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.misc.*;
-import edu.berkeley.sbp.Input.Location;
 
 public class CharParser extends Parser<Character,String> {
 
@@ -16,15 +12,10 @@ public class CharParser extends Parser<Character,String> {
     public Forest<String> parse(Reader r)       throws IOException, ParseFailed { return super.parse(new CharInput(r)); }
     public Forest<String> parse(String s)       throws IOException, ParseFailed { return parse(new StringReader(s)); }
 
-    public CharParser(Union u) { super(u, new CharTopology()); }
+    public CharParser(Union u) { super(u); }
 
-    private Location oldloc;
-
-    public Forest<String> shiftToken(Character ct, Location newloc) {
-        if (oldloc==null) oldloc = newloc;
-        Forest<String> ret = Forest.create(oldloc.createRegion(newloc), ct.toString(), null);
-        oldloc = newloc;
-        return ret;
-    }
+    public Topology<Character> emptyTopology() { return new CharTopology(); }
+    public Forest<String> shiftToken(Character ct, Input.Region region) {
+        return Forest.create(region, ct.toString(), null); }
 
 }