From: adam <adam@megacz.com>
Date: Sun, 16 Jul 2006 07:59:31 +0000 (-0400)
Subject: checkpoint
X-Git-Tag: tag_for_25-Mar~119
X-Git-Url: http://git.megacz.com/?p=sbp.git;a=commitdiff_plain;h=4867dcc8c43621ec974d1d6c32736f067efd5cd1;hp=38eb7943a4be918d46cb6517004e57ca91410ce0

checkpoint

darcs-hash:20060716075931-5007d-ccf1209e69ed0de1ee8fcf8c2347b46c1a895e3e.gz
---

diff --git a/TODO b/TODO
index d58eb06..31dbd1d 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,9 @@
 _____________________________________________________________________________
 Immediately
 
+  * we can nuke Atom.toAtom() now!
+  - Topology crap is kinda messed up
+
   - do Forest/Tree still need a Region?
   - reconsider the degree of genericization
   - GraphViz stuff pollutes the API...
diff --git a/src/edu/berkeley/sbp/Union.java b/src/edu/berkeley/sbp/Union.java
index 484616d..ece239d 100644
--- a/src/edu/berkeley/sbp/Union.java
+++ b/src/edu/berkeley/sbp/Union.java
@@ -14,6 +14,9 @@ public class Union extends Element implements Iterable<Sequence> {
     private final boolean synthetic;
     private final List<Sequence> alternatives = new ArrayList<Sequence>();
 
+    public Union() { this(null, false); }
+    public Union(String name) { this(name, false); }
+
     /**
      *  Since every cycle in a non-degenerate grammar contains at
      *  least one Union, every instance of this class must be able to
@@ -23,8 +26,6 @@ public class Union extends Element implements Iterable<Sequence> {
      *  @param shortForm the "short form" display; usually 
      *  @param synthetic if true, this Union's "long form" is "obvious" and should not be displayed when printing the grammar
      */
-    public Union() { this(null, false); }
-    public Union(String name) { this(name, false); }
     public Union(String name, boolean synthetic) {
         this.name = name;
         this.synthetic = synthetic;
@@ -42,6 +43,7 @@ public class Union extends Element implements Iterable<Sequence> {
         for(Sequence n : s.hates) add(n);
     }
 
+
     // Epsilon Form //////////////////////////////////////////////////////////////////////////////
 
     // FIXME
@@ -57,6 +59,7 @@ public class Union extends Element implements Iterable<Sequence> {
         return epsilonForm;
     }
 
+
     // Display //////////////////////////////////////////////////////////////////////////////
 
     public String getName() {