Rename Empty.e to Empty.empty

tmmcguire · Jun 7, 2012 · 27c5433 · 27c5433
1 parent fa3b99e
commit 27c5433
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/src/net/crsr/derivative/c/Alternative.java b/src/net/crsr/derivative/c/Alternative.java
@@ -10,11 +10,11 @@ public class Alternative extends Fix
 
   public static Parser alternative(Parser l1, Parser l2)
   {
-    if (l1 == Empty.e)
+    if (l1 == Empty.empty)
     {
       return l2;
     }
-    else if (l2 == Empty.e)
+    else if (l2 == Empty.empty)
     {
       return l1;
     }
@@ -54,11 +54,11 @@ public Parser compact(Set seen)
       l1 = l1.compact(seen);
       l2 = l2.compact(seen);
     }
-    if (l1 == Empty.e)
+    if (l1 == Empty.empty)
     {
       return l2;
     }
-    else if (l2 == Empty.e)
+    else if (l2 == Empty.empty)
     {
       return l1;
     }

diff --git a/src/net/crsr/derivative/c/Concat.java b/src/net/crsr/derivative/c/Concat.java
@@ -10,9 +10,9 @@ public class Concat extends Fix
 
   public static Parser concat(Parser l1, Parser l2)
   {
-    if (l1 == Empty.e || l2 == Empty.e)
+    if (l1 == Empty.empty || l2 == Empty.empty)
     {
-      return Empty.e;
+      return Empty.empty;
     }
     else
     {
@@ -60,9 +60,9 @@ public Parser compact(Set seen)
       l1 = l1.compact(seen);
       l2 = l2.compact(seen);
     }
-    if (l1 == Empty.e || l2 == Empty.e)
+    if (l1 == Empty.empty || l2 == Empty.empty)
     {
-      return Empty.e;
+      return Empty.empty;
     }
     else if (l1 instanceof Epsilon && ((Epsilon) l1).size() == 1)
     {

diff --git a/src/net/crsr/derivative/c/Delta.java b/src/net/crsr/derivative/c/Delta.java
@@ -11,7 +11,7 @@ public class Delta extends Parser
   @Override
   public Parser derive(char ch)
   {
-    return Empty.e;
+    return Empty.empty;
   }
 
   @Override

diff --git a/src/net/crsr/derivative/c/Empty.java b/src/net/crsr/derivative/c/Empty.java
@@ -5,12 +5,12 @@
 
 public class Empty extends Parser
 {
-  public static final Empty e = new Empty();
+  public static final Empty empty = new Empty();
 
   @Override
   public Parser derive(char ch)
   {
-    return e;
+    return empty;
   }
 
   @Override

diff --git a/src/net/crsr/derivative/c/Epsilon.java b/src/net/crsr/derivative/c/Epsilon.java
@@ -17,7 +17,7 @@ public static Parser epsilon(Set trees)
   {
     if (trees.isEmpty())
     {
-      return Empty.e;
+      return Empty.empty;
     }
     else if (trees.size() == 1 && trees.contains(""))
     {
@@ -47,7 +47,7 @@ private Epsilon(Set trees)
   @Override
   public Parser derive(char ch)
   {
-    return Empty.e;
+    return Empty.empty;
   }
 
   @Override

diff --git a/src/net/crsr/derivative/c/Literal.java b/src/net/crsr/derivative/c/Literal.java
@@ -15,7 +15,7 @@ public Literal(char ch)
   @Override
   public Parser derive(char ch)
   {
-    return this.ch == ch ? Epsilon.epsilon(ch) : Empty.e;
+    return this.ch == ch ? Epsilon.epsilon(ch) : Empty.empty;
   }
 
   @Override

diff --git a/src/net/crsr/derivative/c/Main.java b/src/net/crsr/derivative/c/Main.java
@@ -47,6 +47,7 @@ public Object reduce(Object t)
       GraphWriter.writeGraph("/tmp/S" + i++ + ".dot", a);
     }
     System.out.println( a.deriveNull() );
+    System.out.println();
 
     Recurrence term = new Recurrence();
     Parser one = new Literal('1');
@@ -65,6 +66,7 @@ public Object reduce(Object t)
       GraphWriter.writeGraph("/tmp/l" + (++i) + ".dot", l);
     }
     System.out.println( l.deriveNull() );
-}
+    System.out.println();
+  }
 
 }
diff --git a/src/net/crsr/derivative/c/Reduce.java b/src/net/crsr/derivative/c/Reduce.java
@@ -47,9 +47,9 @@ public Parser compact(Set seen)
       final Reduction combination = new Reduction<Object,Object>() { @Override public Object reduce(Object t) { return outer.reduce( inner.reduce(t) ); } };
       return new Reduce(subReduction.parser,combination);
     }
-    else if (parser == Empty.e)
+    else if (parser == Empty.empty)
     {
-      return Empty.e;
+      return Empty.empty;
     }
     else
     {