X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=968d78f555c968c85cba4e58192456ffb94d04cb;hp=0ce5f55c34e14380e1be527e6cfaabc00d6b0c4b;hb=eef891a53c43901acccac0dead16a79dbdb34c77;hpb=dc9bb3a45ed306e2e35549076842b3e74efecb48

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 0ce5f55..968d78f 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -20,7 +20,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
     final HashSet<Sequence> needs  = new HashSet<Sequence>();
     final HashSet<Sequence> hates  = new HashSet<Sequence>();
 
-    // FIXME: these are ugly -- migrate into Cache
+    // FIXME: these are ugly -- migrate into Grammar
     HashMap<Sequence,Boolean> canNeed = new HashMap<Sequence,Boolean>();
     HashMap<Sequence,Boolean> canKill = new HashMap<Sequence,Boolean>();
 
@@ -104,7 +104,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         this.firstp = new Position(0, null);
     }
 
-    abstract Forest epsilonForm(Input.Region loc, Cache cache);
+    abstract Forest epsilonForm(Input.Region loc, Grammar cache);
 
     protected abstract <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p);
 
@@ -154,7 +154,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
         // Position /////////////////////////////////////////////////////////////////////////////////
 
-        final <T> Forest<T> rewrite(Input.Region loc, Cache cache) {
+        final <T> Forest<T> rewrite(Input.Region loc, Grammar cache) {
             if (this==firstp()) epsilonForm(loc, cache);
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);
             for(int i=pos; i<elements.length; i++) {
@@ -219,7 +219,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
             return (Forest<T>)Forest.create(loc, result, null, false);
         }
-        Forest epsilonForm(Input.Region loc, Cache cache) {
+        Forest epsilonForm(Input.Region loc, Grammar cache) {
             return Forest.create(loc, result, null, false);
         }
     }
@@ -230,7 +230,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         public Singleton(Element[] e, int idx) { super(e); this.idx = idx; }
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) { return args[idx]; }
         Sequence _clone() { return new Singleton(elements,idx); }
-        Forest epsilonForm(Input.Region loc, Cache cache) {
+        Forest epsilonForm(Input.Region loc, Grammar cache) {
             return ((Union)elements[idx]).epsilonForm(loc, cache);
         }
     }
@@ -251,7 +251,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
             for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
             return Forest.create(loc, (T)tag, args2, true);
         }
-        Forest epsilonForm(Input.Region loc, Cache cache) {
+        Forest epsilonForm(Input.Region loc, Grammar cache) {
             return Forest.create(loc, tag, new Forest[0], false);
         }
     }
@@ -284,7 +284,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
             if (spacing) for(int i=0; i<50-len; i++) sb.append(' ');
             return sb;
         }
-        Forest epsilonForm(Input.Region loc, Cache cache) {
+        Forest epsilonForm(Input.Region loc, Grammar cache) {
             return Forest.create(loc, tag, new Forest[0], false);
         }
     }