diff --git a/examples/falo.ini b/examples/falo.ini index 3a7d07f..f2ed9de 100644 --- a/examples/falo.ini +++ b/examples/falo.ini @@ -21,4 +21,4 @@ writeTo: DOT,TRACE,COVERAGE,DD_DOT,LINES,COMBINED_DOT format: {class}#{line} -fastDD: true +fast: true diff --git a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/FieldTracer.java b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/FieldTracer.java index 5d8a3fa..31bf442 100644 --- a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/FieldTracer.java +++ b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/FieldTracer.java @@ -85,7 +85,7 @@ public class FieldTracer extends ExprEditor { private static final Pattern IGNORE_VAL = Pattern.compile("^val\\$[a-zA-Z_$][a-zA-Z_$0-9]*$"); private static final String TARGET = - Config.getInst().fastDD() ? FastFieldAccessRecorder.class.getCanonicalName() : + Config.getInst().fast() ? FastFieldAccessRecorder.class.getCanonicalName() : FieldAccessRecorder.class.getCanonicalName(); public final void edit(FieldAccess f) throws CannotCompileException { diff --git a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/callgraph/CallGraph.java b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/callgraph/CallGraph.java index 24c04f0..24d0a19 100644 --- a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/callgraph/CallGraph.java +++ b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/callgraph/CallGraph.java @@ -91,7 +91,7 @@ String checkStartCondition(StackItem method) { } public void called(StackItem method) throws IOException { - //reads.push(0); + reads.push(0); if (calls.isEmpty()) { // First node String identifier = checkStartCondition(method); @@ -146,9 +146,9 @@ public void returned(StackItem method) throws IOException { } public void dataEdge(StackItem from, StackItem to) throws IOException { - //if (!reads.isEmpty()) { - // reads.push(reads.pop() + 1); - //} + if (!reads.isEmpty()) { + reads.push(reads.pop() + 1); + } if (calls.isEmpty()) { LOG.info("Ignore dd egde {} -> {}", from, to); } else { diff --git a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/util/config/Config.java b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/util/config/Config.java index 9cff88d..2ebc017 100644 --- a/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/util/config/Config.java +++ b/jdcallgraph/src/main/java/com/dkarv/jdcallgraph/util/config/Config.java @@ -64,7 +64,7 @@ static void reset() { private String format = "{class}::{method}#{line}"; @Option - private boolean fastDD = false; + private boolean fast = false; private boolean dataDependency = false; @@ -148,7 +148,7 @@ public String format() { return format; } - public boolean fastDD() { - return fastDD; + public boolean fast() { + return fast; } }