checkpoint

[sbp.git] / src / edu / berkeley / sbp / Forest.java

diff --git a/src/edu/berkeley/sbp/Forest.java b/src/edu/berkeley/sbp/Forest.java
index 13ac199..ed1c9ac 100644 (file)
--- a/src/edu/berkeley/sbp/Forest.java
+++ b/src/edu/berkeley/sbp/Forest.java
@@ -24,7 +24,7 @@ public abstract class Forest<T> {
     static <T> Forest<T>   singleton(Token.Location loc, Sequence creator)                       { return create(loc, null, new Forest[] { }, creator, false, true); }
     static <T> Forest<T>   singleton(Token.Location loc, Forest<T> body, Sequence creator)       { return create(loc, null, new Forest[] { body }, creator, false, true); }
     static <T> Forest<T>   leaf(Token.Location loc, T tag,                     Sequence creator) { return create(loc, tag, null, creator, false, false); }
-    static <T> Forest<T>   create(Token.Location loc, T tag, Forest<T>[] tokens, Sequence creator, boolean unwrap, boolean singleton) {
+    public static <T> Forest<T>   create(Token.Location loc, T tag, Forest<T>[] tokens, Sequence creator, boolean unwrap, boolean singleton) {
         return new MultiForest<T>(loc, tag, tokens, creator, unwrap, singleton);
     }
 
@@ -197,6 +197,11 @@ public abstract class Forest<T> {
         public String toString() {
             if (toString != null) return toString;
             StringBuffer ret = new StringBuffer();
+            if (results.size()==1) {
+                for(Forest.Body<T> r : results)
+                    ret.append(r);
+                return toString = ret.toString();
+            }
             ret.append("<?");
             boolean first = true;
             for(Forest.Body<T> r : results) {