Add Block type to ControlFlowGraph debug logging

Author: jgardn3r

delphi-frontend/src/main/java/au/com/integradev/delphi/cfg/ControlFlowGraphDebug.java

@@ -83,7 +83,7 @@ private static void appendElement(StringBuilder buffer, int index, DelphiNode no
   }
 
   private static String getBlockString(Block block) {
-    return "B" + ((BlockImpl) block).getId();
+    return "B" + ((BlockImpl) block).getId() + " - " + ((BlockImpl) block).getBlockType();
   }
 
   private static <T> Optional<T> getAs(Block block, Class<T> clazz) {

delphi-frontend/src/main/java/au/com/integradev/delphi/cfg/block/BlockImpl.java

@@ -67,4 +67,6 @@ protected static Block getNewTarget(Block subject, Block inactiveBlock, Block ta
   }
 
   public abstract String getDescription();
+
+  public abstract String getBlockType();
 }

delphi-frontend/src/main/java/au/com/integradev/delphi/cfg/block/ProtoBlockFactory.java

@@ -143,6 +143,11 @@ public String getDescription() {
           "%n\tjumps to: %s%n\texceptions to: %s",
           getBlockString(successor), getBlocksString(exceptions));
     }
+
+    @Override
+    public String getBlockType() {
+      return "UnknownException";
+    }
   }
 
   static class CasesImpl extends BlockImpl implements Cases {
@@ -194,6 +199,11 @@ public String getDescription() {
           "%n\tcases to: %s%n\tfallthrough to: %s",
           getBlocksString(cases), getBlockString(fallthrough));
     }
+
+    @Override
+    public String getBlockType() {
+      return "Cases";
+    }
   }
 
   static class UnconditionalJumpImpl extends BlockImpl implements UnconditionalJump {
@@ -243,6 +253,11 @@ public String getDescription() {
           "%n\tjumps to: %s%n\twithout jump to: %s",
           getBlockString(target), getBlockString(withoutJump));
     }
+
+    @Override
+    public String getBlockType() {
+      return "UnconditionalJump";
+    }
   }
 
   static class LinearImpl extends BlockImpl implements Linear {
@@ -270,6 +285,11 @@ public void replaceInactiveSuccessor(Block inactiveBlock, Block target) {
     public String getDescription() {
       return String.format("%n\tjumps to: %s", getBlockString(successor));
     }
+
+    @Override
+    public String getBlockType() {
+      return "Linear";
+    }
   }
 
   static class FinallyImpl extends BlockImpl implements Finally {
@@ -307,6 +327,11 @@ public String getDescription() {
           "%n\tjumps to: %s%n\texits to: %s",
           getBlockString(successor), getBlockString(exceptionSuccessor));
     }
+
+    @Override
+    public String getBlockType() {
+      return "Finally";
+    }
   }
 
   static class HaltImpl extends BlockImpl implements Halt {
@@ -339,6 +364,11 @@ public void replaceInactiveSuccessor(Block inactiveBlock, Block target) {
     public String getDescription() {
       return String.format("%n\tno successors");
     }
+
+    @Override
+    public String getBlockType() {
+      return "Halt";
+    }
   }
 
   private static class TerminusImpl extends BlockImpl implements Terminus {
@@ -356,6 +386,11 @@ public void replaceInactiveSuccessor(Block inactiveBlock, Block target) {
     public String getDescription() {
       return String.format("%n\t(Exit)");
     }
+
+    @Override
+    public String getBlockType() {
+      return "Terminus";
+    }
   }
 
   static class BranchImpl extends BlockImpl implements Branch {
@@ -405,5 +440,10 @@ public String getDescription() {
           "%n\tjumps to: %s(true) %s(false)",
           getBlockString(trueBlock), getBlockString(falseBlock));
     }
+
+    @Override
+    public String getBlockType() {
+      return "Branch";
+    }
   }
 }