X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FAtom.java;h=03383ab0bec9abf376b911fcf493f5939c679483;hb=e42e16515f4392017a8109922d37dcd0926f915a;hp=2589ddeabb9d435ff5e47a09531175b3d6a0d98f;hpb=b409afa0cf6d72a23703d9172812ab4fcd6a969b;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Atom.java b/src/edu/berkeley/sbp/Atom.java
index 2589dde..03383ab 100644
--- a/src/edu/berkeley/sbp/Atom.java
+++ b/src/edu/berkeley/sbp/Atom.java
@@ -8,7 +8,7 @@ import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.*;
 
 /** an element which matches exactly one input token */
-public abstract class Atom<T extends Token> extends Element implements Topology<T> {
+public abstract class Atom<T> extends Element implements Topology<T> {
 
     protected abstract Topology<T> top();
     public    abstract String toString();
@@ -48,7 +48,7 @@ public abstract class Atom<T extends Token> extends Element implements Topology<
     public static class Hack<T extends Token> extends Atom<T> {
         private final Atom<T> a;
         static final Topology leftright =
-            edu.berkeley.sbp.misc.CharToken.rightBrace.union(edu.berkeley.sbp.misc.CharToken.leftBrace);
+            edu.berkeley.sbp.misc.CharRange.rightBrace.union(edu.berkeley.sbp.misc.CharRange.leftBrace);
         public Hack(Atom<T> a) { this.a = a; }
         public Topology<T> top() { return ((Topology<T>)a.top()).minus(leftright); }
         public String toString() { return "~"+a; }