Javadoc and formatting

lisa-analyzer · Dec 20, 2020 · ad2536f · ad2536f
1 parent 6d1a6fc
commit ad2536f
Show file tree

Hide file tree

Showing 23 changed files with 181 additions and 134 deletions.
diff --git a/lisa/src/main/java/it/unive/lisa/callgraph/CallGraph.java b/lisa/src/main/java/it/unive/lisa/callgraph/CallGraph.java
@@ -14,7 +14,6 @@
 import it.unive.lisa.symbolic.SymbolicExpression;
 import it.unive.lisa.symbolic.value.Identifier;
 import it.unive.lisa.util.datastructures.graph.FixpointException;
-
 import java.util.Collection;
 
 /**

diff --git a/lisa/src/main/java/it/unive/lisa/callgraph/impl/intraproc/IntraproceduralCallGraph.java b/lisa/src/main/java/it/unive/lisa/callgraph/impl/intraproc/IntraproceduralCallGraph.java
@@ -18,7 +18,6 @@
 import it.unive.lisa.symbolic.SymbolicExpression;
 import it.unive.lisa.symbolic.value.ValueIdentifier;
 import it.unive.lisa.util.datastructures.graph.FixpointException;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/CFG.java b/lisa/src/main/java/it/unive/lisa/cfg/CFG.java
@@ -1,11 +1,5 @@
 package it.unive.lisa.cfg;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
 import it.unive.lisa.analysis.AnalysisState;
 import it.unive.lisa.analysis.CFGWithAnalysisResults;
 import it.unive.lisa.analysis.FunctionalLattice;
@@ -28,6 +22,11 @@
 import it.unive.lisa.util.datastructures.graph.FixpointGraph;
 import it.unive.lisa.util.workset.FIFOWorkingSet;
 import it.unive.lisa.util.workset.WorkingSet;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * A control flow graph, that has {@link Statement}s as nodes and {@link Edge}s
@@ -705,11 +704,11 @@ public <H extends HeapDomain<H>, V extends ValueDomain<V>> CFGWithAnalysisResult
 	}
 
 	@Override
-	protected <H extends HeapDomain<H>, V extends ValueDomain<V>> FunctionalLattice<?, Statement, AnalysisState<H, V>> mkNewIntermediate(
+	protected <H extends HeapDomain<H>, V extends ValueDomain<V>> FunctionalLattice<?, Statement, AnalysisState<H, V>> mkInternalStore(
 			AnalysisState<H, V> entrystate) {
 		return new StatementStore<>(entrystate);
 	}
-	
+
 	@Override
 	protected DotGraph<Statement, Edge> toDot(Function<Statement, String> labelGenerator) {
 		return DotCFG.fromCFG(this, labelGenerator);

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/edge/Edge.java b/lisa/src/main/java/it/unive/lisa/cfg/edge/Edge.java
@@ -6,7 +6,6 @@
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.cfg.statement.Statement;
 import it.unive.lisa.util.datastructures.graph.SemanticEdge;
-
 import java.util.Objects;
 
 /**

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Assignment.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Assignment.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Call.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Call.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Expression.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Expression.java
@@ -1,9 +1,5 @@
 package it.unive.lisa.cfg.statement;
 
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Objects;
-
 import it.unive.lisa.analysis.AnalysisState;
 import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.caches.Caches;
@@ -13,6 +9,9 @@
 import it.unive.lisa.cfg.type.Untyped;
 import it.unive.lisa.symbolic.value.Identifier;
 import it.unive.lisa.util.collections.ExternalSet;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Objects;
 
 /**
  * An expression that is part of a statement of the program.

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Literal.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Literal.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/NoOp.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/NoOp.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/NullLiteral.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/NullLiteral.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Ret.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Ret.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Return.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Return.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Statement.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Statement.java
@@ -1,17 +1,16 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.InferredTypes;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;
 import it.unive.lisa.cfg.CFG;
 import it.unive.lisa.cfg.type.Type;
 import it.unive.lisa.util.datastructures.graph.Node;
-
 import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Throw.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Throw.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/cfg/statement/Variable.java b/lisa/src/main/java/it/unive/lisa/cfg/statement/Variable.java
@@ -1,9 +1,9 @@
 package it.unive.lisa.cfg.statement;
 
 import it.unive.lisa.analysis.AnalysisState;
-import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.HeapDomain;
 import it.unive.lisa.analysis.SemanticException;
+import it.unive.lisa.analysis.StatementStore;
 import it.unive.lisa.analysis.ValueDomain;
 import it.unive.lisa.analysis.impl.types.TypeEnvironment;
 import it.unive.lisa.callgraph.CallGraph;

diff --git a/lisa/src/main/java/it/unive/lisa/outputs/DotCFG.java b/lisa/src/main/java/it/unive/lisa/outputs/DotCFG.java
@@ -1,10 +1,5 @@
 package it.unive.lisa.outputs;
 
-import java.io.Reader;
-import java.util.function.Function;
-
-import org.graphstream.graph.implementations.MultiGraph;
-
 import it.unive.lisa.cfg.CFG;
 import it.unive.lisa.cfg.edge.Edge;
 import it.unive.lisa.cfg.edge.FalseEdge;
@@ -13,6 +8,9 @@
 import it.unive.lisa.cfg.statement.Return;
 import it.unive.lisa.cfg.statement.Statement;
 import it.unive.lisa.cfg.statement.Throw;
+import java.io.Reader;
+import java.util.function.Function;
+import org.graphstream.graph.implementations.MultiGraph;
 
 /**
  * An {@link DotGraph} built from a {@link CFG}. Instances of this class can be
@@ -65,10 +63,10 @@ else if (edge instanceof FalseEdge)
 		return graph;
 	}
 
-	public static class CFGLegend {
-		public final org.graphstream.graph.Graph graph;
+	private static class CFGLegend {
+		private final org.graphstream.graph.Graph graph;
 
-		public CFGLegend() {
+		private CFGLegend() {
 			graph = new MultiGraph("legend");
 			org.graphstream.graph.Node l = graph.addNode("legend");
 			StringBuilder builder = new StringBuilder();