X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=32b8ba94668e9eb33b86aa727858cf5e361d3cbf;hb=b648ea33534fea67c9926a67b38d2e992c2f5752;hp=b31b307ad39b466b0ac54517cb5683a2b551b84d;hpb=6a2ea790f843e058c7e67d3c7d1deebadcfe1fd5;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index b31b307..32b8ba9 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -12,17 +12,29 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     // Static Constructors //////////////////////////////////////////////////////////////////////////////
 
+    public abstract Sequence and(Sequence s);
+    public abstract Sequence not(Sequence s);
+
+    private void needs(Sequence s) { s.needed.add(this); needs.add(s); }
+    private void hates(Sequence s) { s.hated.add(this); hates.add(s); }
+
+    void clone(Sequence seq) {
+        for(Sequence s : seq.hates) hates(s);
+        for(Sequence s : seq.needs) needs(s);
+        noFollow = seq.noFollow;
+    }
+
     /** the empty sequence (matches the empty string) */
     public static final Sequence empty = new Sequence.Constant.Empty();
 
     /** after matching the sequence, do not add anything to the output tree */
-    public static Sequence drop(Element[] e, HashSet<Sequence> and, HashSet<Sequence> not, boolean lame) { return new Constant.Drop(e, and, not, lame); }
+    public static Sequence drop(Element[] e, boolean lame) { return new Constant.Drop(e, 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); }
 
     /** 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); }
 
     /**
      *  after matching the sequence, create the specified output tree
@@ -30,8 +42,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
      *  @param e     the elements to match
      *  @param drops only elements of <tt>e</tt> whose corresponding <tt>boolean</tt> in <tt>drops</tt> is <i>false</i> will be included in the output tree
      **/
-    public static Sequence rewritingSequence(Object tag, Element[] e, boolean[] drops, HashSet<Sequence> and, HashSet<Sequence> not) {
-        return new RewritingSequence(tag, e, drops, and, not); }
+    public static Sequence rewritingSequence(Object tag, Element[] e, boolean[] drops) { return new RewritingSequence(tag, e, drops); }
 
     ////////////////////////////////////////////////////////////////////////////////
 
@@ -47,25 +58,17 @@ 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;
     Position firstp() { return firstp; }
 
     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);
+    protected Sequence(Element[] elements) {
         this.elements = elements;
         this.firstp = new Position(0);
     }
@@ -173,30 +176,38 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     static class Constant extends Sequence {
         private final Object result;
-        public Constant(Element[] e, Object result, HashSet<Sequence> and, HashSet<Sequence> not) { super(e, and, not); this.result = result; }
+        public Constant(Element[] e, Object result) { super(e); this.result = result; }
+        public Sequence and(Sequence s) { Sequence ret = new Constant(elements, result); ret.needs(s); ret.clone(this); return ret; }
+        public Sequence not(Sequence s) { Sequence ret = new Constant(elements, result); ret.hates(s); ret.clone(this); return ret; }
         public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args) {
             return (Forest<T>)Forest.leaf(loc, result);
         }
         static class Drop extends Constant {
-            public Drop(Element[] e, HashSet<Sequence> and, HashSet<Sequence> not, boolean lame) {
-                super(e, null, and, not);
+            public Drop(Element[] e, boolean lame) {
+                super(e, null);
                 this.lame = lame;
             }
+            public Sequence and(Sequence s) { Sequence ret = new Drop(elements, lame); ret.needs(s); ret.clone(this); return ret; }
+            public Sequence not(Sequence s) { Sequence ret = new Drop(elements, lame); ret.hates(s); ret.clone(this); return ret; }
         }
-        static class Empty extends Sequence.Constant.Drop { public Empty() { super(new Element[] { }, null, null, false); } }
+        static class Empty extends Sequence.Constant.Drop { public Empty() { super(new Element[] { }, false); } }
     }
 
     static class Singleton extends Sequence {
         private final int idx;
-        public Singleton(Element e, HashSet<Sequence> and, HashSet<Sequence> not) { this(new Element[] { e }, 0, and, not); }
-        public Singleton(Element[] e, int idx, HashSet<Sequence> and, HashSet<Sequence> not) { super(e, and, not); this.idx = idx; }
+        public Singleton(Element e) { this(new Element[] { e }, 0); }
+        public Singleton(Element[] e, int idx) { super(e); this.idx = idx; }
         public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args) { return (Forest<T>)Forest.singleton(loc, args[idx]); }
+        public Sequence and(Sequence s) { Sequence ret = new Singleton(elements, idx); ret.needs(s); ret.clone(this); return ret; }
+        public Sequence not(Sequence s) { Sequence ret = new Singleton(elements, idx); ret.hates(s); ret.clone(this); return ret; }
     }
 
     public static class Unwrap extends Sequence {
         private boolean[] drops;
-        public Unwrap(Element[] e, HashSet<Sequence> and, HashSet<Sequence> not)                  { super(e, and, not); this.drops = null; }
-        public Unwrap(Element[] e, boolean[] drops, HashSet<Sequence> and, HashSet<Sequence> not) { super(e, and, not); this.drops = drops; }
+        public Unwrap(Element[] e)                  { super(e); this.drops = null; }
+        public Unwrap(Element[] e, boolean[] drops) { super(e); this.drops = drops; }
+        public Sequence and(Sequence s) { Sequence ret = new Unwrap(elements, drops); ret.needs(s); ret.clone(this); return ret; }
+        public Sequence not(Sequence s) { Sequence ret = new Unwrap(elements, drops); ret.hates(s); ret.clone(this); return ret; }
         public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args) {
             for(int i=0; i<args.length; i++) if (args[i]==null) throw new Error();
             if (drops==null) return Forest.create(loc, null, args, true, false);
@@ -213,9 +224,11 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         /*private*/public final Object tag;
         private final boolean[] drops;
         private int count = 0;
-        public RewritingSequence(Object tag, Element[] e, HashSet<Sequence> and, HashSet<Sequence> not) { this(tag, e, null, and, not); }
-        public RewritingSequence(Object tag, Element[] e, boolean[] drops, HashSet<Sequence> and, HashSet<Sequence> not) {
-            super(e, and, not);
+        public Sequence and(Sequence s) { Sequence ret = new RewritingSequence(tag, elements, drops); ret.needs(s); ret.clone(this); return ret; }
+        public Sequence not(Sequence s) { Sequence ret = new RewritingSequence(tag, elements, drops); ret.hates(s); ret.clone(this); return ret; }
+        public RewritingSequence(Object tag, Element[] e) { this(tag, e, null); }
+        public RewritingSequence(Object tag, Element[] e, boolean[] drops) {
+            super(e);
             this.tag = tag;
             this.drops = drops == null ? new boolean[e.length] : drops;
             for(int i=0; i<this.drops.length; i++) if (!this.drops[i]) count++;