X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=a75bafa008243da5b7f83fd045e8362002e1af5d;hp=6b615dcd4460f7ffa3a0133474120924e0947294;hb=6ae224025882c9929e2e4e9e8461decbf3b9cae4;hpb=5d18f5606c9296e6b0c5749f05fc68f358ace2f6

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 6b615dc..a75bafa 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -12,14 +12,12 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     // Static Constructors //////////////////////////////////////////////////////////////////////////////
 
-    public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); s.needed.add(ret); return ret; }
-    public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
     abstract Sequence _clone();
     Sequence dup() {
         Sequence ret = _clone();
         for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
         for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
-        ret.noFollow = noFollow;
+        ret.follow = follow;
         return ret;
     }
 
@@ -34,6 +32,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
 
     /** 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
@@ -41,18 +40,22 @@ 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) { return new RewritingSequence(tag, e, drops); }
+    public static Sequence rewritingSequence(Object tag, Element[] e, Object[] labs, boolean[] drops) {
+        return new RewritingSequence(tag, e, labs, drops); }
 
     ////////////////////////////////////////////////////////////////////////////////
 
-    public Element noFollow = null;
-    public final Topology noFollow() { return noFollow==null ? null : Atom.toAtom(noFollow); }
+    public Element follow = null;
+    public final Topology follow() { return follow==null ? null : Atom.toAtom(follow); }
 
     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 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>();
@@ -79,7 +82,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         return epsilonForm;
     }
 
-    protected abstract <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args);
+    protected abstract <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p);
 
 
     // Position //////////////////////////////////////////////////////////////////////////////
@@ -129,7 +132,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
                 if (holder[i]==null) holder[i] = elements[i].epsilonForm();
                 if (holder[i]==null) throw new Error("bad " + i);
             }
-            Forest<T> ret = Sequence.this.postReduce(loc, holder);
+            Forest<T> ret = Sequence.this.postReduce(loc, holder, this);
             for(int k=0; k<pos; k++) holder[k] = null; // to help GC
             return ret;
         }
@@ -160,6 +163,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;
     }
 
@@ -170,8 +177,8 @@ 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) {
-            return (Forest<T>)Forest.leaf(loc, result);
+        public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
+            return (Forest<T>)Forest.leaf(loc, result, p);
         }
         static class Drop extends Constant {
             Sequence _clone() { return new Drop(elements, lame); }
@@ -189,54 +196,96 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         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) { return (Forest<T>)Forest.singleton(loc, args[idx]); }
+        public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) { return (Forest<T>)Forest.singleton(loc, args[idx], p); }
         Sequence _clone() { return new Singleton(elements,idx); }
     }
 
-    public static class Unwrap extends Sequence {
+    public static Unwrap unwrap(Element[] e, Object tag, boolean[] drops) { return new Unwrap(e, tag, drops); }
+    static class Unwrap extends Sequence {
         private boolean[] drops;
-        public Unwrap(Element[] e)                  { super(e); this.drops = null; }
-        public Unwrap(Element[] e, boolean[] drops) { super(e); this.drops = 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, 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) {
+        public <T> Forest<T> postReduce(Input.Location 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, null, args, true, false);
+            if (drops==null) return Forest.create(loc, (T)tag, args, new Object[args.length], true, false, p);
             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, null, args2, true, false);            
+            return Forest.create(loc, (T)tag, args2, new Object[args.length], true, false, p);
         }
     }
 
     static class RewritingSequence extends Sequence {
         /*private*/public final Object tag;
         private final boolean[] drops;
+        private final Object[] labs;
         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) {
+        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) {
             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) {
+        public <T> Forest<T> postReduce(Input.Location 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]) args2[j++] = args[i];
+            for(int i=0; i<args.length; i++) if (!drops[i]) { labs2[j] = labs==null?null:labs[i]; args2[j++] = args[i]; }
             //System.out.println("reduce \""+tag+"\"");
-            return Forest.create(loc, (T)tag, args2, false, false);
+            return Forest.create(loc, (T)tag, args2, labs2, false, false, p);
         }
         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;
         }
     }
+
+    // Repeat //////////////////////////////////////////////////////////////////////////////
+
+    /** repeat zero or one times */
+    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 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 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 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 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 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 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 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); }
 }