X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=2c36c8db00c2dd2917eaf25e8e7e3e072a7f4b31;hp=5680d6c5f17ca3cb51eb40af4e03c4177adddf2c;hb=a4cd33f348d3802ed746e517c23205958a4ceeb4;hpb=2c1c0293545f3d12c23220fd05c663e6aa3f3de1

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 5680d6c..2c36c8d 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.*;
@@ -12,29 +14,22 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
     protected final Element[] elements;
 
-    final HashSet<Sequence> hated  = new HashSet<Sequence>();
+    boolean needed_or_hated = false;
+    boolean in_a_union = false;
 
     final HashSet<Sequence> needs  = new HashSet<Sequence>();
     final HashSet<Sequence> hates  = new HashSet<Sequence>();
 
+    // FIXME: these are ugly -- migrate into Cache
+    HashMap<Sequence,Boolean> canNeed = new HashMap<Sequence,Boolean>();
+    HashMap<Sequence,Boolean> canKill = new HashMap<Sequence,Boolean>();
+
     final Position          firstp;
 
     Atom follow = null;
 
     // Static Constructors //////////////////////////////////////////////////////////////////////////////
 
-    abstract Sequence _clone();
-    Sequence dup() {
-        Sequence ret = _clone();
-        for(Sequence s : needs) { ret.needs.add(s); }
-        for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
-        ret.follow = follow;
-        return ret;
-    }
-
-    /** create an empty sequence (matches the empty string) */
-    public static Sequence create() { return new Sequence.Constant.Empty(); }
-
     /** create a sequence of one element */
     public static Sequence create(Element e) { return create(new Element[] { e }, 0); }
 
@@ -60,21 +55,45 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
             : new RewritingSequence(head, e, drop);
     }
 
-    ////////////////////////////////////////////////////////////////////////////////
-
     /** return a new sequence identical to this one, but with a positive conjunct <tt>s</tt> */
-    public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); return ret; }
+    public Sequence and(Sequence s) {
+        if (s.in_a_union)
+            throw new RuntimeException("you may not use a sequence as a conjunct if it belongs to a Union");
+        Sequence ret = dup();
+        ret.needs.add(s);
+        s.needed_or_hated=true;
+        return ret;
+    }
 
     /** return a new sequence identical to this one, but with a negative conjunct <tt>s</tt> */
-    public Sequence andnot(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
+    public Sequence andnot(Sequence s) {
+        if (s.in_a_union)
+            throw new RuntimeException("you may not use a sequence as a conjunct if it belongs to a Union");
+        Sequence ret = dup();
+        ret.hates.add(s);
+        s.needed_or_hated=true;
+        return ret;
+    }
 
     /** return a new sequence identical to this one, but with a follow-set restricted to <tt>a</tt> */
     public Sequence followedBy(Atom a) { Sequence ret = dup(); ret.follow = a; return ret; }
 
+    ////////////////////////////////////////////////////////////////////////////////
+
+    abstract Sequence _clone();
+    private Sequence dup() {
+        Sequence ret = _clone();
+        for(Sequence s : needs) { ret.needs.add(s); }
+        for(Sequence s : hates) { ret.hates.add(s); }
+        ret.follow = follow;
+        return ret;
+    }
+
     Iterable<Sequence> needs() { return needs; }
     Iterable<Sequence> hates() { return hates; }
 
     Position firstp() { return firstp; }
+    Position lastp() { return firstp().last(); }
 
     public Iterator<Element> iterator()    { return new ArrayIterator<Element>(elements); }
     protected Sequence(Element[] elements) {
@@ -84,10 +103,10 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
     // DO NOT MESS WITH THE FOLLOWING LINE!!!
     private Forest.Many epsilonForm = null;
-    Forest epsilonForm() {
+    Forest epsilonForm(Input.Region loc) {
         if (epsilonForm!=null) return epsilonForm;
         epsilonForm = new Forest.Many();
-        epsilonForm.merge(firstp().rewrite(null, false));
+        epsilonForm.merge(firstp().rewrite(loc, false));
         return epsilonForm;
     }
 
@@ -99,22 +118,38 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
     /** the imaginary position before or after an element of a sequence; corresponds to an "LR item" */
     class Position implements IntegerMappable {
 
+        public int ord = -1;
+        public int compareTo(Position p, Walk.Cache cache) {
+            Position position = this;
+            Position rposition = p;
+            int ret = 0;
+            if (Reduction.canKill(cache, position, rposition) &&
+                Reduction.canKill(cache, rposition, position)) throw new Error();
+            if      (Reduction.canKill(cache, position,   rposition)) ret =  1;
+            else if (Reduction.canKill(cache, rposition, position)) ret = -1;
+            if      (Reduction.canNeed(cache, position,   rposition)) ret =  1;
+            else if (Reduction.canNeed(cache, rposition, position)) ret = -1;
+            return ret;
+        }
+
         private Forest zero = null;
-        public Forest zero() {
+        public Forest zero(Input.Region reg) {
             if (zero != null) return zero;
             if (pos > 0) throw new Error();
-            return zero = rewrite(null);
+            return zero = rewrite(reg);
         }
 
 
                 final int      pos;
         private final Position next;
+        private final Position prev;
                 final Forest[] holder;
         
         private Position(int pos) {
             this.pos      = pos;
             this.next     = pos==elements.length ? null : new Position(pos+1);
             this.holder   = new Forest[elements.length];
+            this.prev     = prev;
         }
 
         boolean isFirst() { return pos==0; }
@@ -130,15 +165,17 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
         /** true iff this Position is the last one in the sequence */
         public boolean isLast() { return next()==null; }
+        public Position last() { return isLast() ? this : next().last(); }
+        public Position prev() { return prev; }
 
         // Position /////////////////////////////////////////////////////////////////////////////////
 
         final <T> Forest<T> rewrite(Input.Region loc) { return rewrite(loc, true); }
         private final <T> Forest<T> rewrite(Input.Region loc, boolean epsilonCheck) {
-            if (epsilonCheck && this==firstp()) return epsilonForm();
+            if (epsilonCheck && this==firstp()) return epsilonForm(loc);
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);
             for(int i=pos; i<elements.length; i++) {
-                if (holder[i]==null) holder[i] = elements[i].epsilonForm();
+                if (holder[i]==null) holder[i] = elements[i].epsilonForm(loc);
                 if (holder[i]==null) throw new Error("bad " + i);
             }
             Forest<T> ret = Sequence.this.postReduce(loc, holder, this);
@@ -169,7 +206,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
     StringBuffer toString(StringBuffer sb) { return toString(sb, true); }
     StringBuffer toString(StringBuffer sb, boolean spacing) {
         for(int i=0; i<elements.length; i++) {
-            sb.append(elements[i].toString());
+            sb.append(elements[i]+"");
             sb.append(' ');
         }
         if (follow != null) {
@@ -192,18 +229,15 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
     static class Constant extends Sequence {
         private final Object result;
-        public Constant(Element[] e, Object result) { super(e); this.result = result; }
+        public Constant(Element[] e, Object result) {
+            super(e);
+            if (result==null) throw new Error("constant sequences may not have result==null");
+            this.result = result;
+        }
         Sequence _clone() { return new Constant(elements, result); }
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
             return (Forest<T>)Forest.create(loc, result, null, false);
         }
-        static class Drop extends Constant {
-            Sequence _clone() { return new Drop(elements); }
-            public Drop(Element[] e) { super(e, null); }
-        }
-        static class Empty extends Sequence.Constant.Drop {
-            Sequence _clone() { return new Empty(); }
-            public Empty() { super(new Element[] { }); } }
     }
 
     static class Singleton extends Sequence {
@@ -217,7 +251,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
     static class Unwrap extends Sequence {
         private boolean[] drops;
         private final Object tag;
-        public Unwrap(Element[] e, Object tag)                  { super(e); this.drops = null; this.tag = tag; }
+        public Unwrap(Element[] e, Object tag)                  { this(e, tag, null); }
         public Unwrap(Element[] e, Object tag, boolean[] drops) { super(e); this.drops = drops; this.tag = tag; }
         Sequence _clone() { return new Unwrap(elements, tag, drops); }
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
@@ -232,30 +266,15 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         }
     }
 
-
-
-    static class RegionRewritingSequence extends RewritingSequence {
-        private Functor<Input.Region, Object> tagf;
-        public RegionRewritingSequence(Functor<Input.Region,Object> tagfunctor, Element[] e, boolean[] drops) {
-            super(null, e, drops);
-            this.tagf = tagfunctor;
-        }
-        public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
-            this.tag = tagf.invoke(loc);
-            Forest<T> ret = super.postReduce(loc, args, p);
-            this.tag = null;
-            return ret;
-        }
-    }
-
     static class RewritingSequence extends Sequence {
-        /*private*/public /*final*/ Object tag;
+        private Object tag;
         private final boolean[] drops;
         private int count = 0;
         Sequence _clone() { return new RewritingSequence(tag, elements, drops); }
         public RewritingSequence(Object tag, Element[] e) { this(tag, e, null); }
         public RewritingSequence(Object tag, Element[] e, boolean[] drops) {
             super(e);
+            if (tag==null) throw new Error();
             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++;