X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=61a18e8746aefe9730e1487db017dfbe29f32b62;hb=a7ba8d8a5f0cb7fbb5bf67f1a95f1cad5226c507;hp=1adfaddfdc542912c6a76b1f71178bfee13b5e75;hpb=7d1d5b9e2969e687cc07592f5a212681f8d26479;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 1adfadd..61a18e8 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -18,6 +18,7 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         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.follow = follow;
+        ret.lame = lame;
         return ret;
     }
 
@@ -38,10 +39,11 @@ public abstract class Sequence extends Element implements Iterable<Element> {
      *  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); }
 
     ////////////////////////////////////////////////////////////////////////////////
 
@@ -49,7 +51,8 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     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);
+        if (elements.length!=1)
+            throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
         return Atom.toAtom(elements[0]);
     }
 
@@ -59,9 +62,9 @@ public abstract class Sequence extends Element implements Iterable<Element> {
     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>();
+    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;
@@ -133,7 +136,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;
         }
 
@@ -209,37 +212,34 @@ public abstract class Sequence extends Element implements Iterable<Element> {
         Sequence _clone() { return new Unwrap(elements, drops); }
         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, (T)tag, args, new Object[args.length], true, false, p);
+            if (drops==null) return Forest.create(loc, (T)tag, args, 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, (T)tag, args2, new Object[args.length], true, false, p);
+            return Forest.create(loc, (T)tag, args2, 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, 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) {
             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, false, p);
         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {
             int len = sb.length();
@@ -255,30 +255,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); }
 }