Backport renaming of `Type::_print()` in Chapter13 to earlier chapters (#244)

58 files changed, 96 insertions, 96 deletions

diff --git a/chapter02/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter02/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 671de049..43a22426 100644
--- a/chapter02/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter02/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -30,7 +30,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override
diff --git a/chapter02/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter02/src/main/java/com/seaofnodes/simple/type/Type.java
index 89f6c715..7ea17bfb 100644
--- a/chapter02/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter02/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -36,5 +36,5 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 }
diff --git a/chapter02/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter02/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index 13f816bf..e0324da5 100644
--- a/chapter02/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter02/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -21,11 +21,11 @@ public class TypeInteger extends Type {
 
     @Override
     public String toString() {
-      return _print(new StringBuilder()).toString();
+      return print(new StringBuilder()).toString();
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) { return sb.append(_con); }
+    public StringBuilder print(StringBuilder sb) { return sb.append(_con); }
 
     @Override
     public boolean isConstant() { return true; }
diff --git a/chapter03/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter03/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 671de049..43a22426 100644
--- a/chapter03/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter03/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -30,7 +30,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override
diff --git a/chapter03/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter03/src/main/java/com/seaofnodes/simple/type/Type.java
index 89f6c715..7ea17bfb 100644
--- a/chapter03/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter03/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -36,5 +36,5 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 }
diff --git a/chapter03/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter03/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index 13f816bf..e0324da5 100644
--- a/chapter03/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter03/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -21,11 +21,11 @@ public class TypeInteger extends Type {
 
     @Override
     public String toString() {
-      return _print(new StringBuilder()).toString();
+      return print(new StringBuilder()).toString();
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) { return sb.append(_con); }
+    public StringBuilder print(StringBuilder sb) { return sb.append(_con); }
 
     @Override
     public boolean isConstant() { return true; }
diff --git a/chapter04/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter04/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 23bc4d1a..85277d82 100644
--- a/chapter04/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter04/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -30,7 +30,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override
diff --git a/chapter04/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter04/src/main/java/com/seaofnodes/simple/type/Type.java
index 1687f65a..1e50bdda 100644
--- a/chapter04/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter04/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -41,12 +41,12 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     public Type meet(Type other) { return Type.BOTTOM; }
 
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter04/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter04/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index 9fb4b853..cbaff45f 100644
--- a/chapter04/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter04/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public boolean isBot() { return !_is_con && _con==1; }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if (isTop()) return sb.append("IntTop");
         if (isBot()) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter04/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter04/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 25663dda..52befa38 100644
--- a/chapter04/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter04/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -15,10 +15,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[ ");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter05/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter05/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 23bc4d1a..85277d82 100644
--- a/chapter05/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter05/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -30,7 +30,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override
diff --git a/chapter05/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter05/src/main/java/com/seaofnodes/simple/type/Type.java
index d0916312..6b9130ba 100644
--- a/chapter05/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter05/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -41,12 +41,12 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     public Type meet(Type other) { return BOTTOM; }
 
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter05/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter05/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index 9fb4b853..cbaff45f 100644
--- a/chapter05/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter05/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public boolean isBot() { return !_is_con && _con==1; }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if (isTop()) return sb.append("IntTop");
         if (isBot()) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter05/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter05/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 33417eb2..da701865 100644
--- a/chapter05/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter05/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -15,10 +15,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter06/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter06/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 23bc4d1a..85277d82 100644
--- a/chapter06/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter06/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -30,7 +30,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override
diff --git a/chapter06/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter06/src/main/java/com/seaofnodes/simple/type/Type.java
index 2f0e6171..d66fb3e7 100644
--- a/chapter06/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter06/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -43,7 +43,7 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP || _type == TXCTRL; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     public final Type meet(Type t) {
         // Shortcut for the self case
@@ -72,6 +72,6 @@ public class Type {
 
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter06/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter06/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index b30e21d8..a9f6ee1c 100644
--- a/chapter06/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter06/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public boolean isBot() { return !_is_con && _con==1; }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if (isTop()) return sb.append("IntTop");
         if (isBot()) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter06/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter06/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 0f8b95bd..39d8f72b 100644
--- a/chapter06/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter06/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -15,10 +15,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter07/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter07/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 49bb30ea..b7ec8292 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter07/src/main/java/com/seaofnodes/simple/node/Node.java b/chapter07/src/main/java/com/seaofnodes/simple/node/Node.java
index dade7525..5759a065 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/node/Node.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/node/Node.java
@@ -134,7 +134,7 @@ public abstract class Node {
         for( int i = _outputs.size(); i<lim; i++ )
             sb.append("     ");
         sb.append(" ]]  ");
-        if( _type!= null ) _type._print(sb);
+        if( _type!= null ) _type.print(sb);
         sb.append("\n");
     }
 
diff --git a/chapter07/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter07/src/main/java/com/seaofnodes/simple/type/Type.java
index 2f0e6171..d66fb3e7 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -43,7 +43,7 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP || _type == TXCTRL; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     public final Type meet(Type t) {
         // Shortcut for the self case
@@ -72,6 +72,6 @@ public class Type {
 
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter07/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter07/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index b30e21d8..a9f6ee1c 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public boolean isBot() { return !_is_con && _con==1; }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if (isTop()) return sb.append("IntTop");
         if (isBot()) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter07/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter07/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 0f8b95bd..39d8f72b 100644
--- a/chapter07/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter07/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -15,10 +15,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter08/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 49bb30ea..b7ec8292 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/node/Node.java b/chapter08/src/main/java/com/seaofnodes/simple/node/Node.java
index ce847453..234930b4 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/node/Node.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/node/Node.java
@@ -136,7 +136,7 @@ public abstract class Node {
         for( int i = _outputs.size(); i<lim; i++ )
             sb.append("     ");
         sb.append(" ]]  ");
-        if( _type!= null ) _type._print(sb);
+        if( _type!= null ) _type.print(sb);
         sb.append("\n");
     }
 
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter08/src/main/java/com/seaofnodes/simple/type/Type.java
index 2f0e6171..d66fb3e7 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -43,7 +43,7 @@ public class Type {
 
     public boolean isConstant() { return _type == TTOP || _type == TXCTRL; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     public final Type meet(Type t) {
         // Shortcut for the self case
@@ -72,6 +72,6 @@ public class Type {
 
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter08/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index b30e21d8..a9f6ee1c 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public boolean isBot() { return !_is_con && _con==1; }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if (isTop()) return sb.append("IntTop");
         if (isBot()) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter08/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter08/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 0f8b95bd..39d8f72b 100644
--- a/chapter08/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter08/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -15,10 +15,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter09/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter09/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 2012a30a..d270cb29 100644
--- a/chapter09/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter09/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter09/src/main/java/com/seaofnodes/simple/node/Node.java b/chapter09/src/main/java/com/seaofnodes/simple/node/Node.java
index 2f477ec4..a5f26545 100644
--- a/chapter09/src/main/java/com/seaofnodes/simple/node/Node.java
+++ b/chapter09/src/main/java/com/seaofnodes/simple/node/Node.java
@@ -139,7 +139,7 @@ public abstract class Node {
         for( int i = _outputs.size(); i<lim; i++ )
             sb.append("     ");
         sb.append(" ]]  ");
-        if( _type!= null ) _type._print(sb);
+        if( _type!= null ) _type.print(sb);
         sb.append("\n");
     }
 
diff --git a/chapter09/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter09/src/main/java/com/seaofnodes/simple/type/Type.java
index d0265e83..daaa8af6 100644
--- a/chapter09/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter09/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -52,7 +52,7 @@ public class Type {
     // Excludes both high and low values
     public boolean isConstant() { return false; }
 
-    public StringBuilder _print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) {return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     // ----------------------------------------------------------
 
@@ -136,6 +136,6 @@ public class Type {
     // ----------------------------------------------------------
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 }
diff --git a/chapter09/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter09/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index ba045603..ab9dbcff 100644
--- a/chapter09/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter09/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -29,7 +29,7 @@ public class TypeInteger extends Type {
     public static TypeInteger constant(long con) { return make(true, con); }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this==TOP ) return sb.append("IntTop");
         if( this==BOT ) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter09/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter09/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index e82ea00b..a2a6a095 100644
--- a/chapter09/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter09/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -25,10 +25,10 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter10/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index e4c084d4..d760c0df 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/Field.java b/chapter10/src/main/java/com/seaofnodes/simple/type/Field.java
index 56626482..96088f90 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/Field.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/Field.java
@@ -52,8 +52,8 @@ public class Field extends Type {
 
 
     @Override
-    public StringBuilder _print( StringBuilder sb ) {
-        return _type._print(sb.append(_fname).append(":"));
+    public StringBuilder print( StringBuilder sb ) {
+        return _type.print(sb.append(_fname).append(":"));
     }
 
     @Override public String str() { return _fname; }
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter10/src/main/java/com/seaofnodes/simple/type/Type.java
index aa0ba1ea..93e27c76 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -75,7 +75,7 @@ public class Type {
     /**
      * Display Type name in a format that's good for IR printer
      */
-    public StringBuilder typeName( StringBuilder sb) { return _print(sb); }
+    public StringBuilder typeName( StringBuilder sb) { return print(sb); }
 
     public Type makeInit() { return null; }
 
@@ -177,10 +177,10 @@ public class Type {
     // This is a more verbose dev-friendly print.
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 
-    public StringBuilder _print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     // This is used by error messages, and is a shorted print.
     public String str() { return STRS[_type]; }
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index f2a93a3a..8c77672b 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -35,7 +35,7 @@ public class TypeInteger extends Type {
     // FIXME this display format is problematic
     // In visualizer '#' gets prepended if its a constant
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this==TOP ) return sb.append("IntTop");
         if( this==BOT ) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMem.java b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMem.java
index 198d49ee..f4caf56f 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMem.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMem.java
@@ -52,7 +52,7 @@ public class TypeMem extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         return sb.append("MEM#").append( switch(_alias) {
             case  0 -> "TOP";
             case -1 -> "BOT";
@@ -60,5 +60,5 @@ public class TypeMem extends Type {
             });
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 }
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
index 9392da20..ffedbabc 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
@@ -63,10 +63,10 @@ public class TypeMemPtr extends Type {
 
     // [void,name,MANY]*[,?]
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this== NULLPTR) return sb.append("null");
         if( this== VOIDPTR) return sb.append("*void");
-        return _obj._print(sb.append("*")).append(_nil ? "?" : "");
+        return _obj.print(sb.append("*")).append(_nil ? "?" : "");
     }
 
     @Override public String str() {
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeStruct.java b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
index 29102675..6c837919 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
@@ -107,11 +107,11 @@ public class TypeStruct extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append(_name).append(" {\n");
         for( Field f : _fields ) {
             sb.append("  ").append(f._fname).append(":");
-            f._type._print(sb);
+            f._type.print(sb);
             sb.append(";\n");
         }
         return sb.append("}");
diff --git a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index d57f6c98..0aa019a7 100644
--- a/chapter10/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter10/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -38,16 +38,16 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 
     /**
      * Display Type name in a format that's good for IR printer
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter11/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 31edb848..bbd0ce8a 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/Field.java b/chapter11/src/main/java/com/seaofnodes/simple/type/Field.java
index e1c337d4..b50a4fa6 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/Field.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/Field.java
@@ -52,8 +52,8 @@ public class Field extends Type {
 
 
     @Override
-    public StringBuilder _print( StringBuilder sb ) {
-        return _type._print(sb.append(_fname).append(":"));
+    public StringBuilder print( StringBuilder sb ) {
+        return _type.print(sb.append(_fname).append(":"));
     }
 
     @Override public String str() { return _fname; }
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter11/src/main/java/com/seaofnodes/simple/type/Type.java
index aa0ba1ea..93e27c76 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -75,7 +75,7 @@ public class Type {
     /**
      * Display Type name in a format that's good for IR printer
      */
-    public StringBuilder typeName( StringBuilder sb) { return _print(sb); }
+    public StringBuilder typeName( StringBuilder sb) { return print(sb); }
 
     public Type makeInit() { return null; }
 
@@ -177,10 +177,10 @@ public class Type {
     // This is a more verbose dev-friendly print.
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 
-    public StringBuilder _print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     // This is used by error messages, and is a shorted print.
     public String str() { return STRS[_type]; }
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index f2a93a3a..8c77672b 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -35,7 +35,7 @@ public class TypeInteger extends Type {
     // FIXME this display format is problematic
     // In visualizer '#' gets prepended if its a constant
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this==TOP ) return sb.append("IntTop");
         if( this==BOT ) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMem.java b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMem.java
index 198d49ee..f4caf56f 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMem.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMem.java
@@ -52,7 +52,7 @@ public class TypeMem extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         return sb.append("MEM#").append( switch(_alias) {
             case  0 -> "TOP";
             case -1 -> "BOT";
@@ -60,5 +60,5 @@ public class TypeMem extends Type {
             });
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 }
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
index 9392da20..ffedbabc 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
@@ -63,10 +63,10 @@ public class TypeMemPtr extends Type {
 
     // [void,name,MANY]*[,?]
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this== NULLPTR) return sb.append("null");
         if( this== VOIDPTR) return sb.append("*void");
-        return _obj._print(sb.append("*")).append(_nil ? "?" : "");
+        return _obj.print(sb.append("*")).append(_nil ? "?" : "");
     }
 
     @Override public String str() {
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeStruct.java b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
index 29102675..6c837919 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
@@ -107,11 +107,11 @@ public class TypeStruct extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append(_name).append(" {\n");
         for( Field f : _fields ) {
             sb.append("  ").append(f._fname).append(":");
-            f._type._print(sb);
+            f._type.print(sb);
             sb.append(";\n");
         }
         return sb.append("}");
diff --git a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 01bcbe9f..ec7390ca 100644
--- a/chapter11/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter11/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -38,16 +38,16 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 
     /**
      * Display Type name in a format that's good for IR printer
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/node/ConstantNode.java b/chapter12/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
index 31edb848..bbd0ce8a 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/node/ConstantNode.java
@@ -32,7 +32,7 @@ public class ConstantNode extends Node {
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-        return _con._print(sb);
+        return _con.print(sb);
     }
 
     @Override public boolean isMultiTail() { return true; }
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/Field.java b/chapter12/src/main/java/com/seaofnodes/simple/type/Field.java
index e1c337d4..b50a4fa6 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/Field.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/Field.java
@@ -52,8 +52,8 @@ public class Field extends Type {
 
 
     @Override
-    public StringBuilder _print( StringBuilder sb ) {
-        return _type._print(sb.append(_fname).append(":"));
+    public StringBuilder print( StringBuilder sb ) {
+        return _type.print(sb.append(_fname).append(":"));
     }
 
     @Override public String str() { return _fname; }
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/Type.java b/chapter12/src/main/java/com/seaofnodes/simple/type/Type.java
index f3152719..45d66be4 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/Type.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/Type.java
@@ -76,7 +76,7 @@ public class Type {
     /**
      * Display Type name in a format that's good for IR printer
      */
-    public StringBuilder typeName( StringBuilder sb) { return _print(sb); }
+    public StringBuilder typeName( StringBuilder sb) { return print(sb); }
 
     public Type makeInit() { return null; }
 
@@ -178,10 +178,10 @@ public class Type {
     // This is a more verbose dev-friendly print.
     @Override
     public final String toString() {
-        return _print(new StringBuilder()).toString();
+        return print(new StringBuilder()).toString();
     }
 
-    public StringBuilder _print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
+    public StringBuilder print(StringBuilder sb) { return is_simple() ? sb.append(STRS[_type]) : sb;}
 
     // This is used by error messages, and is a shorted print.
     public String str() { return STRS[_type]; }
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeFloat.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeFloat.java
index 36bc61f5..738aebc9 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeFloat.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeFloat.java
@@ -35,7 +35,7 @@ public class TypeFloat extends Type {
     // FIXME this display format is problematic
     // In visualizer '#' gets prepended if its a constant
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this==TOP ) return sb.append("FltTop");
         if( this==BOT ) return sb.append("FltBot");
         return sb.append(_con);
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeInteger.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
index f2a93a3a..8c77672b 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeInteger.java
@@ -35,7 +35,7 @@ public class TypeInteger extends Type {
     // FIXME this display format is problematic
     // In visualizer '#' gets prepended if its a constant
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this==TOP ) return sb.append("IntTop");
         if( this==BOT ) return sb.append("IntBot");
         return sb.append(_con);
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMem.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMem.java
index 198d49ee..f4caf56f 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMem.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMem.java
@@ -52,7 +52,7 @@ public class TypeMem extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         return sb.append("MEM#").append( switch(_alias) {
             case  0 -> "TOP";
             case -1 -> "BOT";
@@ -60,5 +60,5 @@ public class TypeMem extends Type {
             });
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 }
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
index 9392da20..ffedbabc 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
@@ -63,10 +63,10 @@ public class TypeMemPtr extends Type {
 
     // [void,name,MANY]*[,?]
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         if( this== NULLPTR) return sb.append("null");
         if( this== VOIDPTR) return sb.append("*void");
-        return _obj._print(sb.append("*")).append(_nil ? "?" : "");
+        return _obj.print(sb.append("*")).append(_nil ? "?" : "");
     }
 
     @Override public String str() {
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeStruct.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
index 29102675..6c837919 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
@@ -107,11 +107,11 @@ public class TypeStruct extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append(_name).append(" {\n");
         for( Field f : _fields ) {
             sb.append("  ").append(f._fname).append(":");
-            f._type._print(sb);
+            f._type.print(sb);
             sb.append(";\n");
         }
         return sb.append("}");
diff --git a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeTuple.java b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
index 01bcbe9f..ec7390ca 100644
--- a/chapter12/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
+++ b/chapter12/src/main/java/com/seaofnodes/simple/type/TypeTuple.java
@@ -38,16 +38,16 @@ public class TypeTuple extends Type {
     }
 
     @Override
-    public StringBuilder _print(StringBuilder sb) {
+    public StringBuilder print(StringBuilder sb) {
         sb.append("[");
         for( Type t : _types )
-            t._print(sb).append(",");
+            t.print(sb).append(",");
         sb.setLength(sb.length()-1);
         sb.append("]");
         return sb;
     }
 
-    @Override public String str() { return _print(new StringBuilder()).toString(); }
+    @Override public String str() { return print(new StringBuilder()).toString(); }
 
     /**
      * Display Type name in a format that's good for IR printer