fixup! Add ControlFlowGraph and implementation

Author: jgardn3r

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

@@ -240,7 +240,7 @@ public ProtoBlock addBlockBeforeCurrent() {
   }
 
   public void addBlockBefore(ProtoBlock successor) {
-    addBlock(ProtoBlockFactory.succeedingTo(successor));
+    addBlock(ProtoBlockFactory.linear(successor));
   }
 
   public void addBlock(ProtoBlock block) {

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

@@ -263,7 +263,7 @@ public ControlFlowGraphBuilder visit(IfStatementNode node, ControlFlowGraphBuild
     ProtoBlock thenBlock = builder.getCurrentBlock();
 
     // process condition
-    builder.addBlock(ProtoBlockFactory.withBranch(node, thenBlock, elseBlock));
+    builder.addBlock(ProtoBlockFactory.branch(node, thenBlock, elseBlock));
     return buildCondition(builder, node.getGuardExpression(), thenBlock, elseBlock);
   }
 
@@ -295,7 +295,7 @@ private ControlFlowGraphBuilder buildConditionAnd(
     buildCondition(builder, node.getRight(), trueBlock, falseBlock);
     ProtoBlock newTrueBlock = builder.getCurrentBlock();
     // LHS
-    builder.addBlock(ProtoBlockFactory.withBranch(node, newTrueBlock, falseBlock));
+    builder.addBlock(ProtoBlockFactory.branch(node, newTrueBlock, falseBlock));
     return buildCondition(builder, node.getLeft(), newTrueBlock, falseBlock);
   }
 
@@ -308,7 +308,7 @@ private ControlFlowGraphBuilder buildConditionOr(
     buildCondition(builder, node.getRight(), trueBlock, falseBlock);
     ProtoBlock newFalseBlock = builder.getCurrentBlock();
     // LHS
-    builder.addBlock(ProtoBlockFactory.withBranch(node, trueBlock, newFalseBlock));
+    builder.addBlock(ProtoBlockFactory.branch(node, trueBlock, newFalseBlock));
     return buildCondition(builder, node.getLeft(), trueBlock, newFalseBlock);
   }
 
@@ -412,7 +412,7 @@ public ControlFlowGraphBuilder visit(RepeatStatementNode node, ControlFlowGraphB
     ProtoBlock body = builder.addBlockBeforeCurrent();
 
     // Condition
-    builder.addBlock(ProtoBlockFactory.withBranch(node, after, body));
+    builder.addBlock(ProtoBlockFactory.branch(node, after, body));
     buildCondition(builder, node.getGuardExpression(), after, body);
 
     // Body
@@ -421,7 +421,7 @@ public ControlFlowGraphBuilder visit(RepeatStatementNode node, ControlFlowGraphB
     build(node.getStatementList(), builder);
     builder.popLoopContext();
 
-    body.update(ProtoBlockFactory.succeedingTo(builder.getCurrentBlock()));
+    body.update(ProtoBlockFactory.linear(builder.getCurrentBlock()));
     builder.addBlockBeforeCurrent();
     return builder;
   }
@@ -458,10 +458,10 @@ public ControlFlowGraphBuilder visit(WhileStatementNode node, ControlFlowGraphBu
 
     // Condition
     builder.setCurrentBlock(condition);
-    builder.addBlock(ProtoBlockFactory.withBranch(node, body, after));
+    builder.addBlock(ProtoBlockFactory.branch(node, body, after));
     buildCondition(builder, node.getGuardExpression(), body, after);
 
-    condition.update(ProtoBlockFactory.succeedingTo(builder.getCurrentBlock()));
+    condition.update(ProtoBlockFactory.linear(builder.getCurrentBlock()));
     builder.addBlockBeforeCurrent();
     return builder;
   }
@@ -523,7 +523,7 @@ private ControlFlowGraphBuilder buildForLoop(
     build(node.getStatement(), builder);
     builder.popLoopContext();
 
-    loopback.update(ProtoBlockFactory.withBranch(node, builder.getCurrentBlock(), after));
+    loopback.update(ProtoBlockFactory.branch(node, builder.getCurrentBlock(), after));
 
     builder.setCurrentBlock(loopback);
     parts.forEach(
@@ -737,7 +737,7 @@ private ControlFlowGraphBuilder buildBooleanLHS(
       BinaryExpressionNode node,
       ProtoBlock trueBlock,
       ProtoBlock falseBlock) {
-    builder.addBlock(ProtoBlockFactory.withBranch(node, trueBlock, falseBlock));
+    builder.addBlock(ProtoBlockFactory.branch(node, trueBlock, falseBlock));
     return build(node.getLeft(), builder);
   }
 

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

@@ -47,7 +47,7 @@ public static ProtoBlock halt(DelphiNode terminator) {
     return new ProtoBlock(HaltImpl::new, (blocks, block) -> ((HaltImpl) block).setData(terminator));
   }
 
-  public static ProtoBlock withBranch(
+  public static ProtoBlock branch(
       DelphiNode terminator, ProtoBlock trueBlock, ProtoBlock falseBlock) {
     return new ProtoBlock(
         BranchImpl::new,
@@ -63,7 +63,7 @@ public static ProtoBlock finallyBlock(ProtoBlock successor, ProtoBlock finallySu
             ((FinallyImpl) block).setData(blocks.get(successor), blocks.get(finallySuccessor)));
   }
 
-  public static ProtoBlock succeedingTo(ProtoBlock successor) {
+  public static ProtoBlock linear(ProtoBlock successor) {
     return new ProtoBlock(
         LinearImpl::new, (blocks, block) -> ((LinearImpl) block).setData(blocks.get(successor)));
   }

delphi-frontend/src/test/java/au/com/integradev/delphi/cfg/checker/BlockChecker.java

@@ -24,8 +24,8 @@
 import au.com.integradev.delphi.cfg.api.Branch;
 import au.com.integradev.delphi.cfg.api.Cases;
 import au.com.integradev.delphi.cfg.api.Finally;
-import au.com.integradev.delphi.cfg.api.Linear;
 import au.com.integradev.delphi.cfg.api.Halt;
+import au.com.integradev.delphi.cfg.api.Linear;
 import au.com.integradev.delphi.cfg.api.Terminated;
 import au.com.integradev.delphi.cfg.api.UnconditionalJump;
 import au.com.integradev.delphi.cfg.api.UnknownException;