diff --git a/Assignment-3/javaparser-1.0.0/CFGGraph/CFGEdge.java b/Assignment-3/javaparser-1.0.0/CFGGraph/CFGEdge.java index a4d6148..61900e4 100644 --- a/Assignment-3/javaparser-1.0.0/CFGGraph/CFGEdge.java +++ b/Assignment-3/javaparser-1.0.0/CFGGraph/CFGEdge.java @@ -4,10 +4,16 @@ import org.jgrapht.graph.DefaultEdge; public class CFGEdge extends DefaultEdge { //path defines if its a True or False or Null (when either T or F resulkt on the same node) private boolean path; + private CFGNode from; + private CFGNode to; - public CFGEdge(boolean path) { - this.path = path; + public CFGEdge() { + this(null, null); + } + public CFGEdge(CFGNode from, CFGNode to) { + this.from = from; + this.to = to; } - + public void setPath(boolean path) { this.path = path; } } \ No newline at end of file diff --git a/Assignment-3/javaparser-1.0.0/LCA_JP1_0_0.java b/Assignment-3/javaparser-1.0.0/LCA_JP1_0_0.java index af32fe0..f49e069 100644 --- a/Assignment-3/javaparser-1.0.0/LCA_JP1_0_0.java +++ b/Assignment-3/javaparser-1.0.0/LCA_JP1_0_0.java @@ -59,12 +59,12 @@ public class LCA_JP1_0_0 { @Override public void visit(ExpressionStmt n, Void arg) { -// CFGNode exprNode = new CFGNode(n.toString()) -// currCFG.addVertex(exprNode) -// //link nodes -// currCFG.addEdge(currentBlock, exprNode); -// currentBlock = exprNode; -// super.visit(n, arg); + CFGNode exprNode = new CFGNode(n.toString()); + currCFG.addVertex(exprNode); + //link nodes + super.visit(n, arg); + currCFG.addEdge(currentBlock, exprNode); + currentBlock = exprNode; } }