X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=5ee8433431ef5d25137fead50bdb7a8debedd86a;hp=2ba90968333b055a1348b0ab7c3d121d0b5eb215;hb=0e17670bcfa7b0fe8eb3a2cac81f4b080a09fc98;hpb=fa858dc4acddd3e32126ff2558e0860315a84758

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 2ba9096..5ee8433 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -7,17 +7,29 @@ import java.util.*;
 import java.lang.reflect.*;
 import java.lang.ref.*;
 
-/** juxtaposition; zero or more adjacent Elements; can specify a rewriting */
+/** <font color=green>juxtaposition; zero or more adjacent Elements; can specify a rewriting</font> */
 public abstract class Sequence extends Element implements Iterable<Element> {
 
+    protected final Element[] elements;
+
+    final HashSet<Sequence> hated  = new HashSet<Sequence>();
+
+    final HashSet<Sequence> needs  = new HashSet<Sequence>();
+    final HashSet<Sequence> hates  = new HashSet<Sequence>();
+
+    final Position          firstp;
+
+    public Atom follow = null;
+    public final Topology follow() { return follow; }
+
     // Static Constructors //////////////////////////////////////////////////////////////////////////////
 
     abstract Sequence _clone();
     Sequence dup() {
         Sequence ret = _clone();
-        for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
+        for(Sequence s : needs) { ret.needs.add(s); }
         for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
-        ret.noFollow = noFollow;
+        ret.follow = follow;
         return ret;
     }
 
@@ -25,45 +37,36 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     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, boolean lame) { return new Constant.Drop(e, lame); }
+    public static Sequence drop(Element[] e) { return new Constant.Drop(e); }
 
     /** after matching the sequence, insert a constant into the output tree */
     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) { return new Singleton(e, idx); }
+    public static Sequence singleton(Element e) { return singleton(new Element[] { e }, 0); }
 
     /**
      *  after matching the sequence, create the specified output tree
      *  @param tag   the tag for the output tree
      *  @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
+     *  @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, Object[] labs, boolean[] drops) {
-        return new RewritingSequence(tag, e, labs, drops); }
+    public static Sequence rewritingSequence(Object tag, Element[] e, boolean[] drops) {
+        return new RewritingSequence(tag, e, drops); }
 
-    ////////////////////////////////////////////////////////////////////////////////
-
-    public Element noFollow = null;
-    public final Topology noFollow() { return noFollow==null ? null : Atom.toAtom(noFollow); }
+    public static Sequence regionRewritingSequence(Functor<Input.Region,Object> tagfunctor, Element[] e, boolean[] drops) {
+        return new RegionRewritingSequence(tagfunctor, e, drops); }
 
-    Topology toAtom() {
-        if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
-        return Atom.toAtom(elements[0]);
-    }
+    ////////////////////////////////////////////////////////////////////////////////
 
-    public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); s.needed.add(ret); return ret; }
+    public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); return ret; }
     public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
 
-    protected final Element[] elements;
-
-    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;
+    public Iterable<Sequence> needs() { return needs; }
+    public Iterable<Sequence> hates() { return hates; }
 
-    final Position          firstp;
     Position firstp() { return firstp; }
 
     public Iterator<Element> iterator()    { return new ArrayIterator<Element>(elements); }
@@ -73,15 +76,15 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     }
 
     // DO NOT MESS WITH THE FOLLOWING LINE!!!
-    private Forest.Ref epsilonForm = null;
+    private Forest.Many epsilonForm = null;
     Forest epsilonForm() {
         if (epsilonForm!=null) return epsilonForm;
-        epsilonForm = new Forest.Ref();
+        epsilonForm = new Forest.Many();
         epsilonForm.merge(firstp().rewrite(null, false));
         return epsilonForm;
     }
 
-    protected abstract <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p);
+    protected abstract <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p);
 
 
     // Position //////////////////////////////////////////////////////////////////////////////
@@ -123,8 +126,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
         // Position /////////////////////////////////////////////////////////////////////////////////
 
-        final <T> Forest<T> rewrite(Input.Location loc) { return rewrite(loc, true); }
-        private final <T> Forest<T> rewrite(Input.Location loc, boolean epsilonCheck) {
+        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();
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);
             for(int i=pos; i<elements.length; i++) {
@@ -132,7 +135,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
                 if (holder[i]==null) throw new Error("bad " + i);
             }
             Forest<T> ret = Sequence.this.postReduce(loc, holder, this);
-            for(int k=0; k<pos; k++) holder[k] = null; // to help GC
+            //for(int k=0; k<pos; k++) holder[k] = null; // to help GC
             return ret;
         }
 
@@ -162,6 +165,10 @@ public abstract class Sequence extends Element implements Iterable<Element> {
             sb.append(elements[i].toString());
             sb.append(' ');
         }
+        if (follow != null) {
+            sb.append("-> ");
+            sb.append(follow);
+        }
         return sb;
     }
 
@@ -172,26 +179,23 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         private final Object result;
         public Constant(Element[] e, Object result) { super(e); this.result = result; }
         Sequence _clone() { return new Constant(elements, result); }
-        public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
-            return (Forest<T>)Forest.leaf(loc, result, p);
+        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, lame); }
-            public Drop(Element[] e, boolean lame) {
-                super(e, null);
-                this.lame = lame;
-            }
+            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[] { }, false); } }
+            public Empty() { super(new Element[] { }); } }
     }
 
     static class Singleton extends Sequence {
         private final int 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, Position p) { return (Forest<T>)Forest.singleton(loc, args[idx], p); }
+        public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) { return args[idx]; }
         Sequence _clone() { return new Singleton(elements,idx); }
     }
 
@@ -202,47 +206,60 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         public Unwrap(Element[] e, Object tag)                  { super(e); this.drops = null; this.tag = tag; }
         public Unwrap(Element[] e, Object tag, boolean[] drops) { super(e); this.drops = drops; this.tag = tag; }
         Sequence _clone() { return new Unwrap(elements, drops); }
-        public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
+        public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
             for(int i=0; i<args.length; i++) if (args[i]==null) throw new Error();
-            if (drops==null) return Forest.create(loc, (T)tag, args, new Object[args.length], true, false, p);
+            if (drops==null) return Forest.create(loc, (T)tag, args, true);
             int count = 0;
             for(int i=0; i<drops.length; i++) if (!drops[i]) count++;
             Forest<T>[] args2 = new Forest[count];
             int j = 0;
             for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
-            return Forest.create(loc, (T)tag, args2, new Object[args.length], true, false, p);
+            return Forest.create(loc, (T)tag, args2, true);
+        }
+    }
+
+
+
+    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*/public /*final*/ Object tag;
         private final boolean[] drops;
-        private final Object[] labs;
         private int count = 0;
-        Sequence _clone() { return new RewritingSequence(tag, elements, labs, drops); }
-        public RewritingSequence(Object tag, Element[] e, Object[] labs) { this(tag, e, labs, null); }
-        public RewritingSequence(Object tag, Element[] e, Object[] labs, boolean[] drops) {
+        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);
             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++;
-            this.labs = labs;
         }
-        public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
+        public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) {
             Forest<T>[] args2 = new Forest[count];
-            Object[] labs2 = new Object[count];
             int j = 0;
-            for(int i=0; i<args.length; i++) if (!drops[i]) { labs2[j] = labs==null?null:labs[i]; args2[j++] = args[i]; }
+            for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
             //System.out.println("reduce \""+tag+"\"");
-            return Forest.create(loc, (T)tag, args2, labs2, false, false, p);
+            return Forest.create(loc, (T)tag, args2, false);
         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {
             int len = sb.length();
+            if (tag != null)
+                sb.append("\""+StringUtil.escapify(tag.toString(),"\"\r\n")+"\":: ");
             super.toString(sb, spacing);
             len = sb.length()-len;
             if (spacing) for(int i=0; i<50-len; i++) sb.append(' ');
-            sb.append(" => ");
-            sb.append(tag);
             return sb;
         }
     }
@@ -250,30 +267,37 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     // Repeat //////////////////////////////////////////////////////////////////////////////
 
     /** repeat zero or one times */
-    public  static Repeat maybe(Element e)              { return new Repeat(e, true, false, null, false); }
-    public  static Repeat maybe(Element e, Object tag)              { return new Repeat(e, true, false, null, false, tag); }
+    public  static Element maybe(Element e)                             { return new Repeat(e, true, false, null, null); }
+    public  static Element maybe(Element e, Object tag)                 { return new Repeat(e, true, false, null, tag); }
     /** repeat zero or more times */
-    public  static Repeat many0(Element e)              { return new Repeat(e, true, true, null, false); }
-    public  static Repeat many0(Element e, Object tag)              { return new Repeat(e, true, true, null, false, tag); }
+    public  static Element many0(Element e)                             { return new Repeat(e, true, true, null, null); }
+    public  static Element many0(Element e, Object tag)                 { return new Repeat(e, true, true, null, tag); }
     /** repeat zero or more times, separated by <tt>sep</tt> */
-    public  static Repeat many0(Element e, Element sep) { return new Repeat(e, true, true, sep, false); }
-    public  static Repeat many0(Element e, Element sep, Object tag) { return new Repeat(e, true, true, sep, false, tag); }
+    public  static Element many0(Element e, Element sep)                { return new Repeat(e, true, true, sep, null); }
+    public  static Element many0(Element e, Element sep, Object tag)    { return new Repeat(e, true, true, sep, tag); }
     /** repeat one or more times */
-    public  static Repeat many1(Element e)              { return new Repeat(e, false, true, null, false); }
-    public  static Repeat many1(Element e, Object tag)              { return new Repeat(e, false, true, null, false, tag); }
+    public  static Element many1(Element e)                             { return new Repeat(e, false, true, null, null); }
+    public  static Element many1(Element e, Object tag)                 { return new Repeat(e, false, true, null, tag); }
     /** repeat one or more times, separated by <tt>sep</tt> */
-    public  static Repeat many1(Element e, Element sep) { return new Repeat(e, false, true, sep, false); }
-    public  static Repeat many1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, false, tag); }
+    public  static Element many1(Element e, Element sep)                { return new Repeat(e, false, true, sep, null); }
+    public  static Element many1(Element e, Element sep, Object tag)    { return new Repeat(e, false, true, sep, tag); }
 
     /** repeat zero or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal0(Element e)              { return new Repeat(e, true, true, null, true); }
-    public  static Repeat maximal0(Element e, Object tag)              { return new Repeat(e, true, true, null, true, tag); }
+    public  static Element maximal0(Atom e)                             { return new Repeat.Maximal(e, true, true, null); }
+    public  static Element maximal0(Atom e, Object tag)                 { return new Repeat.Maximal(e, true, true, tag); }
     /** repeat one or more times, matching a maximal sequence of atoms */
-    public  static Repeat maximal1(Element e)              { return new Repeat(e, false, true, null, true); }
-    public  static Repeat maximal1(Element e, Object tag)              { return new Repeat(e, false, true, null, true, tag); }
+    public  static Element maximal1(Atom e)                             { return new Repeat.Maximal(e, false, true, null); }
+    public  static Element maximal1(Atom e, Object tag)                 { return new Repeat.Maximal(e, false, true, tag); }
     /** repeat one or more times, separated by an atom <tt>sep</tt>, matching a maximal sequence */
-    public  static Repeat maximal1(Element e, Element sep) { return new Repeat(e, false, true, sep, true); }
-    public  static Repeat maximal1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, true, tag); }
-
-
+    public  static Element maximal1(Element e, Atom sep)                { return new Repeat.Maximal(e, false, true, sep, null); }
+    public  static Element maximal1(Element e, Atom sep, Object tag)    { return new Repeat.Maximal(e, false, true, sep, tag); }
+
+    public  static Element repeatMaximal(Atom e, boolean zero, boolean many, Object tag) {
+        return new Repeat.Maximal(e, zero, many, tag); }
+    public  static Element repeatMaximal(Element e, boolean zero, boolean many, Atom sep, Object tag) {
+        return new Repeat.Maximal(e, zero, many, sep, tag); }
+    public  static Element repeat(Element e, boolean zero, boolean many, Object tag) {
+        return new Repeat(e, zero, many, tag); }
+    public  static Element repeat(Element e, boolean zero, boolean many, Element sep, Object tag) {
+        return new Repeat(e, zero, many, sep, tag); }
 }