checkpoint

darcs-hash:20060212002231-5007d-afdf87886cd38407db887064b86058b72f8b517a.gz

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 90c4e43..d47e721 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -43,14 +43,14 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     }
 
     static        <T> Forest<T> singleton(Input.Location loc, Position p) {
     }
 
     static        <T> Forest<T> singleton(Input.Location loc, Position p) {

-        return create(loc, null, new Forest[] { }, false, true, p); }
+        return create(loc, null, new Forest[] { }, new Object[0], false, true, p); }

     static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) {
         //return create(loc, null, new Forest[] { body },  false, true, p);
         return body;
     }
     static        <T> Forest<T> singleton(Input.Location loc, Forest<T> body, Position p) {
         //return create(loc, null, new Forest[] { body },  false, true, p);
         return body;
     }

-    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, false, false, p); }
-    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position p) {
-        return new MyBody<T>(loc, tag, tokens, unwrap, singleton, p);
+    static        <T> Forest<T> leaf(Input.Location loc, T tag, Position p) { return create(loc, tag, null, null, false, false, p); }
+    public static <T> Forest<T> create(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position p) {
+        return new MyBody<T>(loc, tag, tokens, labels, unwrap, singleton, p);

     }
     // Body //////////////////////////////////////////////////////////////////////////////
 
     }
     // Body //////////////////////////////////////////////////////////////////////////////
 

@@ -78,7 +78,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
                 if (i==tokens.length-1 && unwrap) {
                     tokens[i].edges(n);
                 } else {
                 if (i==tokens.length-1 && unwrap) {
                     tokens[i].edges(n);
                 } else {

-                    n.edge(tokens[i]);
+                    n.edge(tokens[i], labels==null?null:labels[i]);

                 }
             }
         }
                 }
             }
         }

@@ -90,11 +90,12 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
         private final Input.Location    location;
         private final T                 tag;
         private final Forest<T>[]       tokens;
         private final Input.Location    location;
         private final T                 tag;
         private final Forest<T>[]       tokens;

+        private final Object[]          labels;

         private final boolean           unwrap;
         private final boolean           singleton;
         private final Sequence.Position reduction;
 
         private final boolean           unwrap;
         private final boolean           singleton;
         private final Sequence.Position reduction;
 

-        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, boolean unwrap, boolean singleton, Position reduction) {
+        private MyBody(Input.Location loc, T tag, Forest<T>[] tokens, Object[] labels, boolean unwrap, boolean singleton, Position reduction) {

             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];
             this.location = loc;
             this.tag = tag;
             this.tokens = tokens==null ? emptyForestArray : new Forest[tokens.length];

@@ -103,6 +104,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             this.unwrap = unwrap;
             this.singleton = singleton;
             this.reduction = reduction;
             this.unwrap = unwrap;
             this.singleton = singleton;
             this.reduction = reduction;

+            this.labels = labels;

         }
 
         public void expand(final int i, final TreeMaker<T> h) {
         }
 
         public void expand(final int i, final TreeMaker<T> h) {

@@ -122,12 +124,13 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }
             } else {
                 tokens[i].visit(new TreeMaker<T>(h.toss) {
                     public void start(T head, Input.Location loc) { }

-                    public void addTree(Tree<T> t) { toks.add(t); }
+                    public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }

                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();
                     public void finish(T head, Input.Location loc) {
                         int old = h.toks.size();

-                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));
+                        h.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)), labels==null?null:labels[i]);

                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);
                         expand(i+1, h);
                         while(h.toks.size() > old) h.toks.remove(h.toks.size()-1);

+                        while(h.labs.size() > old) h.labs.remove(h.labs.size()-1);

                     }
                 }, null, null);
             }
                     }
                 }, null, null);
             }

@@ -167,7 +170,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
             GraphViz.Node n = gv.createNode(this);
             n.label = "?";
             n.color = "red";
             GraphViz.Node n = gv.createNode(this);
             n.label = "?";
             n.color = "red";

-            for(Forest f : hp) n.edge(f);
+            for(Forest f : hp) n.edge(f, null);

             return n;
         }
 
             return n;
         }
 

@@ -183,24 +186,28 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     private static class TreeMaker2<T> extends TreeMaker<T> {
         private TreeConsumer<T> tc;
         public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }
     private static class TreeMaker2<T> extends TreeMaker<T> {
         private TreeConsumer<T> tc;
         public TreeMaker2(boolean toss, TreeConsumer<T> tc) { super(toss); this.tc = tc; }

-        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint)));; }
+        public void finish(T head, Input.Location loc) { tc.addTree(new Tree<T>(loc, head, toks.toArray(tree_hint), labs.toArray(string_hint)));; }

         public void start(T head, Input.Location loc) { }
         public void start(T head, Input.Location loc) { }

-        public void addTree(Tree<T> t) { toks.add(t); }
+        public void addTree(Tree<T> t, Object label) { toks.add(t); labs.add(label); }

     }
     }

-    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>, TreeConsumer<T> {
+    private static abstract class TreeMaker<T> implements Invokable<Forest.Body<T>,Boolean,Integer>/*, TreeConsumer<T>*/ {

         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();
         public ArrayList<Tree<T>> toks = new ArrayList<Tree<T>>();

+        public ArrayList<Object>  labs = new ArrayList<Object>();

         private boolean toss;
         protected T head;
         public TreeMaker(boolean toss) { this.toss = toss; }
         public abstract void start(T head, Input.Location loc);
         public abstract void finish(T head, Input.Location loc);
         private boolean toss;
         protected T head;
         public TreeMaker(boolean toss) { this.toss = toss; }
         public abstract void start(T head, Input.Location loc);
         public abstract void finish(T head, Input.Location loc);

-        public abstract void addTree(Tree<T> t);
+        public abstract void addTree(Tree<T> t, Object label);

         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;
                 this.toks = new ArrayList<Tree<T>>();
         public void invoke(Forest.Body<T> bod, Boolean o, Integer i) {
             if (i==null) {
                 ArrayList<Tree<T>> toks = this.toks;
                 this.toks = new ArrayList<Tree<T>>();

+                ArrayList<Object> labs = this.labs;
+                this.labs = new ArrayList<Object>();

                 bod.expand(0, this);
                 this.toks = toks;
                 bod.expand(0, this);
                 this.toks = toks;

+                this.labs = labs;

             } else {
                 bod.expand(i, this);
             }
             } else {
                 bod.expand(i, this);
             }

@@ -210,6 +217,7 @@ public abstract class Forest<T> /*extends PrintableTree<Forest.MyBody<T>>*/ impl
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];
     // Statics //////////////////////////////////////////////////////////////////////////////
 
     private static Tree[] tree_hint = new Tree[0];

+    private static String[] string_hint = new String[0];

     private static final Forest[] emptyForestArray = new Forest[0];
 
     protected String  headToString()    { return null; }
     private static final Forest[] emptyForestArray = new Forest[0];
 
     protected String  headToString()    { return null; }

diff --git a/src/edu/berkeley/sbp/Repeat.java b/src/edu/berkeley/sbp/Repeat.java
index bd0dbe0..4267b36 100644 (file)
--- a/src/edu/berkeley/sbp/Repeat.java
+++ b/src/edu/berkeley/sbp/Repeat.java
@@ -39,7 +39,7 @@ public class Repeat extends Union {
             if (manyOkay) add(new Sequence.Singleton(many1(e, separator)));
             else          add(new Sequence.Singleton(e));
         } else {
             if (manyOkay) add(new Sequence.Singleton(many1(e, separator)));
             else          add(new Sequence.Singleton(e));
         } else {

-            add(new Sequence.RewritingSequence(null, new Element[] { e }));
+            add(new Sequence.RewritingSequence(null, new Element[] { e }, null));

             if (separator==null)
                 add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }));
             else
             if (separator==null)
                 add(new Sequence.Unwrap(new Element[] { e,                 Repeat.this }));
             else

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 071c219..fb1262f 100644 (file)
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -39,7 +39,8 @@ 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
      **/
      *  @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); }

 
     ////////////////////////////////////////////////////////////////////////////////
 
 
     ////////////////////////////////////////////////////////////////////////////////
 

@@ -201,34 +202,36 @@ 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();
         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, null, args, true, false, p);
+            if (drops==null) return Forest.create(loc, null, 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];
             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, p);
+            return Forest.create(loc, null, args2, new Object[args.length], true, false, p);

         }
     }
 
     static class RewritingSequence extends Sequence {
         /*private*/public final Object tag;
         private final boolean[] drops;
         }
     }
 
     static class RewritingSequence extends Sequence {
         /*private*/public final Object tag;
         private final boolean[] drops;

+        private final Object[] labs;

         private int count = 0;
         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++;
             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];
             int j = 0;
             for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
             //System.out.println("reduce \""+tag+"\"");
         }
         public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
             Forest<T>[] args2 = new Forest[count];
             int j = 0;
             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, false, false, p);
+            return Forest.create(loc, (T)tag, args2, labs, false, false, p);

         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {
             int len = sb.length();
         }
         public StringBuffer toString(StringBuffer sb, boolean spacing) {
             int len = sb.length();

diff --git a/src/edu/berkeley/sbp/Tree.java b/src/edu/berkeley/sbp/Tree.java
index b867766..220d1dd 100644 (file)
--- a/src/edu/berkeley/sbp/Tree.java
+++ b/src/edu/berkeley/sbp/Tree.java
@@ -11,6 +11,7 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
 
     final T           head;
           Tree<T>[]   children;
 
     final T           head;
           Tree<T>[]   children;

+          Object[]    labels;

     final Input.Location    location;
 
     public T                 head()        { return head; }
     final Input.Location    location;
 
     public T                 head()        { return head; }

@@ -18,16 +19,23 @@ public class Tree<T> extends PrintableTree<Tree<T>> implements Iterable<Tree<T>>
     public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }
     public Iterable<Tree<T>> children()    { return new ArrayIterator(children); }
     public Iterator<Tree<T>> iterator()    { return new ArrayIterator(children); }
     public Tree<T>           child(int i)  { return children[i]; }

+    public Object            label(int i)  { return labels[i]; }

 
 

-    public       Input.Location    getLocation() { return location; }
+    public Input.Location    getLocation() { return location; }

 
     public Tree(Input.Location loc, T head)                   { this(loc, head, null); }
 
     public Tree(Input.Location loc, T head)                   { this(loc, head, null); }

-    public Tree(Input.Location loc, T head, Tree<T>[] children) {
+    public Tree(Input.Location loc, T head, Tree<T>[] children) { this(loc, head, children, null); }
+    public Tree(Input.Location loc, T head, Tree<T>[] children, Object[] labels) {

         this.location = loc;
         this.head = head;
         this.location = loc;
         this.head = head;

+

         Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
         if (children != null) System.arraycopy(children, 0, children2, 0, children.length);
         this.children = children2;
         Tree<T>[] children2 = children==null ? new Tree[0] : new Tree[children.length];
         if (children != null) System.arraycopy(children, 0, children2, 0, children.length);
         this.children = children2;

+
+        Object[] labels2 = labels==null ? new Object[0] : new Object[labels.length];
+        if (labels != null) System.arraycopy(labels, 0, labels2, 0, labels.length);
+        this.labels = labels2;

     }
 
     protected String headToString() { return head==null?null:head.toString(); }
     }
 
     protected String headToString() { return head==null?null:head.toString(); }

diff --git a/src/edu/berkeley/sbp/chr/CharParser.java b/src/edu/berkeley/sbp/chr/CharParser.java
index b3ba6cb..657afaf 100644 (file)
--- a/src/edu/berkeley/sbp/chr/CharParser.java
+++ b/src/edu/berkeley/sbp/chr/CharParser.java
@@ -16,7 +16,7 @@ public class CharParser extends Parser<Character,String> {
     public CharParser(Union u) { super(u, new CharTopology()); }
 
     public Forest<String> shiftToken(Character ct, Location loc) {
     public CharParser(Union u) { super(u, new CharTopology()); }
 
     public Forest<String> shiftToken(Character ct, Location loc) {

-        return Forest.create(loc, ct.toString(), null, false, false, null);
+        return Forest.create(loc, ct.toString(), null, null, false, false, null);

     }
 
 }
     }
 
 }

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 92c05de..aa433d3 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -292,7 +292,7 @@ public class MetaGrammar extends StringWalker {
             Sequence ret = null;
             if (dropAll || lame) ret = Sequence.drop(expansion, lame);
             else if (unwrap)    ret = new Sequence.Unwrap(expansion, drops);
             Sequence ret = null;
             if (dropAll || lame) ret = Sequence.drop(expansion, lame);
             else if (unwrap)    ret = new Sequence.Unwrap(expansion, drops);

-            else if (tag!=null) ret = Sequence.rewritingSequence(tag, expansion, drops);
+            else if (tag!=null) ret = Sequence.rewritingSequence(tag, expansion, null, drops);

             else {
                 int idx = -1;
                 for(int i=0; i<expansion.length; i++)
             else {
                 int idx = -1;
                 for(int i=0; i<expansion.length; i++)

diff --git a/src/edu/berkeley/sbp/util/GraphViz.java b/src/edu/berkeley/sbp/util/GraphViz.java
index 13899bb..bfef2f6 100644 (file)
--- a/src/edu/berkeley/sbp/util/GraphViz.java
+++ b/src/edu/berkeley/sbp/util/GraphViz.java
@@ -23,11 +23,13 @@ public class GraphViz {
         public boolean directed = false;
         public String color="black";
         public ArrayList<Node> edges = new ArrayList<Node>();
         public boolean directed = false;
         public String color="black";
         public ArrayList<Node> edges = new ArrayList<Node>();

+        public ArrayList<Object> labels = new ArrayList<Object>();

         public ArrayList<Node> inbound = new ArrayList<Node>();
         public ArrayList<Node> inbound = new ArrayList<Node>();

-        public void edge(ToGraphViz o) {
+        public void edge(ToGraphViz o, Object label) {

             Node n = o.toGraphViz(GraphViz.this);
             if (n==null) return;
             edges.add(n);
             Node n = o.toGraphViz(GraphViz.this);
             if (n==null) return;
             edges.add(n);

+            labels.add(label);

             n.inbound.add(this);
         }
         public String name() {
             n.inbound.add(this);
         }
         public String name() {

@@ -37,8 +39,11 @@ public class GraphViz {
         }
         public void edges(PrintWriter pw) {
             if (simple()) return;
         }
         public void edges(PrintWriter pw) {
             if (simple()) return;

-            for(Node n : edges)
-                pw.println("    "+name()+" -> " + n.name() + " [color="+color+"];\n");
+            for(int i=0; i<edges.size(); i++) {
+                Node n = edges.get(i);
+                Object label = labels.get(i);
+                pw.println("    "+name()+" -> " + n.name() + " [color="+color+" " +(label==null?"":("label=\""+label+"\""))+ "];\n");
+            }

         }
         public int numEdges() { return edges.size(); }
         public boolean simple() {
         }
         public int numEdges() { return edges.size(); }
         public boolean simple() {

diff --git a/tests/meta.g b/tests/meta.g
index 062bf25..3ee8fdf 100644 (file)
--- a/tests/meta.g
+++ b/tests/meta.g
@@ -4,7 +4,7 @@
 // #include (with renaming?)
 // ANTLR uses ! and ^ suffixes
 
 // #include (with renaming?)
 // ANTLR uses ! and ^ suffixes
 

-s             =  ws grammar:Grammar ws
+s             =  !ws (grammar::Grammar) !ws

 Grammar       =  NonTerminal +/ ws
 NonTerminal   =  Word ^"=" RHS /ws
         
 Grammar       =  NonTerminal +/ ws
 NonTerminal   =  Word ^"=" RHS /ws