Keyboard shortcuts

Fast forward/reverse, pick-a-frame.
Shorter type names.

3 files changed, 13 insertions, 1 deletions

diff --git a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMem.java b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMem.java
index b2d081f4..38b3635a 100644
--- a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMem.java
+++ b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMem.java
@@ -52,6 +52,8 @@ public class TypeMem extends Type {
 
     @Override
     public StringBuilder print(StringBuilder sb) {
+        if( this==BOT ) return sb.append("MemBot");
+        if( this==TOP ) return sb.append("MemTop");
         return sb.append("MEM#").append( switch(_alias) {
             case  0 -> "TOP";
             case -1 -> "BOT";
diff --git a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
index c93c3074..e6e40fe2 100644
--- a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
+++ b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeMemPtr.java
@@ -69,12 +69,16 @@ public class TypeMemPtr extends Type {
     // [void,name,MANY]*[,?]
     @Override
     public StringBuilder print(StringBuilder sb) {
+        if( this==BOT ) return sb.append("PtrBot");
+        if( this==TOP ) return sb.append("PtrTop");
         if( this== NULLPTR) return sb.append("null");
         if( this== VOIDPTR) return sb.append("*void");
         return _obj.print(sb.append("*")).append(_nil ? "?" : "");
     }
 
     @Override public String str() {
+        if( this==BOT ) return "PtrBot";
+        if( this==TOP ) return "PtrTop";
         if( this== NULLPTR) return "null";
         if( this== VOIDPTR) return "*void";
         return "*"+_obj.str()+(_nil ? "?" : "");
diff --git a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeStruct.java b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
index e2489d6f..2599a383 100644
--- a/chapter14/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
+++ b/chapter14/src/main/java/com/seaofnodes/simple/type/TypeStruct.java
@@ -130,6 +130,8 @@ public class TypeStruct extends Type {
 
     @Override
     public StringBuilder print(StringBuilder sb) {
+        if( this==BOT ) return sb.append("StructBot");
+        if( this==TOP ) return sb.append("StructTop");
         sb.append(_name);
         if( _fields == null ) return sb; // Forward reference struct, just print the name
         sb.append(" {\n");
@@ -140,5 +142,9 @@ public class TypeStruct extends Type {
         return sb.append("}");
     }
 
-    @Override public String str() { return _name; }
+    @Override public String str() {
+        if( this==BOT ) return "StructBot";
+        if( this==TOP ) return "StructTop";
+        return _name;
+    }
 }