X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fchr%2FCharAtom.java;h=f05c3452658525771a11a7fa2a4cb064d674f434;hp=89a45ad154ff1603eaac320f7a74eab792a11611;hb=3ee451bce342d4bb61ad6235ba57bdf817bfdd1a;hpb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227

diff --git a/src/edu/berkeley/sbp/chr/CharAtom.java b/src/edu/berkeley/sbp/chr/CharAtom.java
index 89a45ad..f05c345 100644
--- a/src/edu/berkeley/sbp/chr/CharAtom.java
+++ b/src/edu/berkeley/sbp/chr/CharAtom.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp.chr;
 import java.io.*;
 import java.util.*;
@@ -26,7 +28,6 @@ public class CharAtom extends Atom<Character> {
     public static final Atom braces     = new CharAtom(left,right)   { public String toString() { return "[{}]"; } };
 
     public static Atom set(Range.Set r) { return new CharAtom(new CharTopology(r)); }
-
     public String toString() { return t.toString(); }
 
     /** returns an element which exactly matches the string given */
@@ -44,18 +45,18 @@ public class CharAtom extends Atom<Character> {
                     public String toString() { return escapified; } };
             Element[] refs = new Element[s.length()];
             for(int i=0; i<refs.length; i++) refs[i] = new CharAtom(s.charAt(i));
-            ret2.add(Sequence.constant(refs, s));
+            ret2.add(Sequence.create(refs, s));
             ret = ret2;
         }
         return ret;
     }
 
     private static Union epsilon = new Union("()");
-    static { epsilon.add(Sequence.empty); }
+    static { epsilon.add(Sequence.create()); }
 
     public Topology<Atom<Character>>       unwrap() { return this; }
     public Topology<Atom<Character>>       empty()  { return new CharAtom(); }
-    public Topology<Character>             underlying()  { return top(); }
+    public Topology<Character>             getTokenTopology()  { return top(); }
 
     public boolean           contains(Atom<Character> v) { return top().containsAll(((CharAtom)v).top()); }
     public boolean           disjoint(Topology<Atom<Character>> t) { return top().disjoint(((CharAtom)t).top()); }