checkpoint

darcs-hash:20060115213542-5007d-969c02e4e5d3c93436283a6d4f1637d8acfb031d.gz

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 328550d..0283c2b 100644 (file)
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -25,10 +25,10 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     public static Sequence drop(Element[] e, boolean lame) { return new Constant.Drop(e, null, null, lame); }
 
     /** after matching the sequence, insert a constant into the output tree */
-    public static Sequence constant(Element[] e, Object o, HashSet<Sequence> and, HashSet<Sequence> not) { return new Constant(e, o, and, not); }
+    public static Sequence constant(Element[] e, Object o) { return new Constant(e, o, null, null); }
 
     /** after matching the sequence, place the result of the <tt>idx</tt>th match in the output tree */
-    public static Sequence singleton(Element[] e, int idx, HashSet<Sequence> and, HashSet<Sequence> not) { return new Singleton(e, idx, and, not); }
+    public static Sequence singleton(Element[] e, int idx) { return new Singleton(e, idx, null, null); }
 
     /**
      *  after matching the sequence, create the specified output tree
@@ -53,10 +53,10 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     protected final Element[] elements;
 
-          HashSet<Sequence> needed;
-          HashSet<Sequence> hated;
-    final HashSet<Sequence> needs;
-    final HashSet<Sequence> hates;
+    final HashSet<Sequence> needed = new HashSet<Sequence>();
+    final HashSet<Sequence> hated = new HashSet<Sequence>();
+    final HashSet<Sequence> needs = new HashSet<Sequence>();
+    final HashSet<Sequence> hates = new HashSet<Sequence>();
     public boolean           lame  = false;
 
     final Position          firstp;
@@ -64,14 +64,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     public Iterator<Element> iterator()    { return new ArrayIterator<Element>(elements); }
     protected Sequence(Element[] elements, HashSet<Sequence> and, HashSet<Sequence> not) {
-        this.needs = and==null ? new HashSet<Sequence>() : and;
-        this.hates = not==null ? new HashSet<Sequence>() : not;
-        if (this.needs != null)
-            for(Sequence s : this.needs)
-                (s.needed==null?(s.needed=new HashSet<Sequence>()):s.needed).add(this);
-        if (this.hates != null)
-            for(Sequence s : this.hates)
-                (s.hated==null?(s.hated=new HashSet<Sequence>()):s.hated).add(this);
+        if (and!=null) for(Sequence s : and) { needs.add(s); s.needed.add(this); }
+        if (not!=null) for(Sequence s : not) { hates.add(s); s.hated.add(this); }
         this.elements = elements;
         this.firstp = new Position(0);
     }

diff --git a/src/edu/berkeley/sbp/chr/CharRange.java b/src/edu/berkeley/sbp/chr/CharRange.java
index cac3bbb..deea38e 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharRange.java
+++ b/src/edu/berkeley/sbp/chr/CharRange.java
@@ -40,7 +40,7 @@ public class CharRange 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 CharRange(s.charAt(i));
-            ret2.add(Sequence.constant(refs, s, null, null));
+            ret2.add(Sequence.constant(refs, s));
             ret = ret2;
         }
         return ret;

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index b1a3e8c..24d3a46 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -271,12 +271,10 @@ public class MetaGrammar extends StringWalker {
                     if (!drops[i])
                         if (idx==-1) idx = i;
                         else throw new Error("multiple non-dropped elements in sequence: " + Sequence.drop(expansion,false));
-                if (idx != -1) ret = Sequence.singleton(expansion, idx, and, not);
-                else           {
-                    ret = Sequence.drop(expansion, false);
-                    for(Sequence s : and) ret = ret.and(s);
-                    for(Sequence s : not) ret = ret.not(s);
-                }
+                if (idx != -1) ret = Sequence.singleton(expansion, idx);
+                else           ret = Sequence.drop(expansion, false);
+                for(Sequence s : and) ret = ret.and(s);
+                for(Sequence s : not) ret = ret.not(s);
             }
             set.add(ret);
             if (this.noFollow != null) ret.noFollow = new Atom.Invert(new Atom.Infer(this.noFollow));

diff --git a/src/edu/berkeley/sbp/tib/Tib.java b/src/edu/berkeley/sbp/tib/Tib.java
index 3c3e184..f15bfbb 100644 (file)
--- a/src/edu/berkeley/sbp/tib/Tib.java
+++ b/src/edu/berkeley/sbp/tib/Tib.java
@@ -145,7 +145,7 @@ public class Tib implements Input<Character> {
             if ("{".equals(head)) {
                 Union u = new Union("???");
                 Union u2 = ((PreSequence)walk(tree, 0)).sparse(ws).buildUnion();
-                u2.add(Sequence.singleton(new Element[] { u }, 0, null, null));
+                u2.add(Sequence.singleton(new Element[] { u }, 0));
                 return anonymousNonTerminal(new PreSequence[][] {
                     new PreSequence[] {
                         new PreSequence(new Element[] { CharRange.leftBrace,