Skip to content

Commit a92f68b

Browse files
committed
Refactoring LiSAConfiguration to use public self-documenting fields
1 parent 9469f80 commit a92f68b

File tree

21 files changed

+314
-681
lines changed

21 files changed

+314
-681
lines changed

lisa/lisa-core/src/main/java/it/unive/lisa/LiSA.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,9 @@ public class LiSA {
5252
* @param conf the configuration of the analysis to run
5353
*/
5454
public LiSA(LiSAConfiguration conf) {
55-
// since the warnings collection will be filled AFTER the execution of
56-
// every concurrent bit has completed its execution, it is fine to use a
57-
// non thread-safe one
5855
this.warnings = new ArrayList<>();
5956
this.conf = conf;
60-
this.fileManager = new FileManager(conf.getWorkdir());
57+
this.fileManager = new FileManager(conf.workdir);
6158
}
6259

6360
/**
@@ -74,25 +71,25 @@ public void run(Program... programs) throws AnalysisException {
7471

7572
CallGraph callGraph;
7673
try {
77-
callGraph = conf.getCallGraph() == null ? getDefaultFor(CallGraph.class) : conf.getCallGraph();
78-
if (conf.getCallGraph() == null)
74+
callGraph = conf.callGraph == null ? getDefaultFor(CallGraph.class) : conf.callGraph;
75+
if (conf.callGraph == null)
7976
LOG.warn("No call graph set for this analysis, defaulting to {}", callGraph.getClass().getSimpleName());
8077
} catch (AnalysisSetupException e) {
8178
throw new AnalysisExecutionException("Unable to create default call graph", e);
8279
}
8380

8481
InterproceduralAnalysis interproc;
8582
try {
86-
interproc = conf.getInterproceduralAnalysis() == null ? getDefaultFor(InterproceduralAnalysis.class)
87-
: conf.getInterproceduralAnalysis();
88-
if (conf.getInterproceduralAnalysis() == null)
83+
interproc = conf.interproceduralAnalysis == null ? getDefaultFor(InterproceduralAnalysis.class)
84+
: conf.interproceduralAnalysis;
85+
if (conf.interproceduralAnalysis == null)
8986
LOG.warn("No interprocedural analysis set for this analysis, defaulting to {}",
9087
interproc.getClass().getSimpleName());
9188
} catch (AnalysisSetupException e) {
9289
throw new AnalysisExecutionException("Unable to create default interprocedural analysis", e);
9390
}
9491

95-
LiSARunner runner = new LiSARunner(conf, interproc, callGraph, conf.getAbstractState());
92+
LiSARunner runner = new LiSARunner(conf, interproc, callGraph, conf.abstractState);
9693
Application app = new Application(programs);
9794

9895
try {
@@ -103,7 +100,7 @@ public void run(Program... programs) throws AnalysisException {
103100

104101
printStats();
105102

106-
if (conf.isJsonOutput()) {
103+
if (conf.jsonOutput) {
107104
LOG.info("Dumping reported warnings to 'report.json'");
108105
JsonReport report = new JsonReport(warnings, fileManager.createdFiles());
109106
try {

0 commit comments

Comments
 (0)