diff --git a/lisa/lisa-analyses/src/test/java/it/unive/lisa/program/cfg/SemanticsSanityTest.java b/lisa/lisa-analyses/src/test/java/it/unive/lisa/program/cfg/SemanticsSanityTest.java index 9251e6957..1eaf62093 100644 --- a/lisa/lisa-analyses/src/test/java/it/unive/lisa/program/cfg/SemanticsSanityTest.java +++ b/lisa/lisa-analyses/src/test/java/it/unive/lisa/program/cfg/SemanticsSanityTest.java @@ -2,26 +2,6 @@ import static org.junit.Assert.fail; -import java.lang.reflect.Constructor; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.Before; -import org.junit.Test; -import org.reflections.Reflections; -import org.reflections.scanners.SubTypesScanner; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.AnalyzedCFG; @@ -95,6 +75,24 @@ import it.unive.lisa.util.datastructures.graph.GraphVisitor; import it.unive.lisa.util.representation.StringRepresentation; import it.unive.lisa.util.representation.StructuredRepresentation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; +import org.junit.Before; +import org.junit.Test; +import org.reflections.Reflections; +import org.reflections.scanners.SubTypesScanner; public class SemanticsSanityTest { diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/serializableGraph/SerializableCFG.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/serializableGraph/SerializableCFG.java index 537186e20..e2080024d 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/serializableGraph/SerializableCFG.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/outputs/serializableGraph/SerializableCFG.java @@ -1,5 +1,12 @@ package it.unive.lisa.outputs.serializableGraph; +import it.unive.lisa.analysis.AnalyzedCFG; +import it.unive.lisa.program.cfg.CFG; +import it.unive.lisa.program.cfg.edge.Edge; +import it.unive.lisa.program.cfg.statement.NaryExpression; +import it.unive.lisa.program.cfg.statement.NaryStatement; +import it.unive.lisa.program.cfg.statement.Statement; +import it.unive.lisa.util.datastructures.graph.GraphVisitor; import java.util.Arrays; import java.util.IdentityHashMap; import java.util.LinkedList; @@ -9,17 +16,8 @@ import java.util.TreeSet; import java.util.function.BiFunction; import java.util.stream.Collectors; - import org.apache.commons.lang3.tuple.Pair; -import it.unive.lisa.analysis.AnalyzedCFG; -import it.unive.lisa.program.cfg.CFG; -import it.unive.lisa.program.cfg.edge.Edge; -import it.unive.lisa.program.cfg.statement.NaryExpression; -import it.unive.lisa.program.cfg.statement.NaryStatement; -import it.unive.lisa.program.cfg.statement.Statement; -import it.unive.lisa.util.datastructures.graph.GraphVisitor; - /** * Utility class to build {@link SerializableGraph}s from {@link CFG}s. * diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java index 04ae23ef1..ee7a1ba7d 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryExpression.java @@ -1,11 +1,5 @@ package it.unive.lisa.program.cfg.statement; -import java.util.Arrays; -import java.util.Collection; -import java.util.Objects; - -import org.apache.commons.lang3.StringUtils; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.SemanticException; @@ -21,6 +15,10 @@ import it.unive.lisa.type.Type; import it.unive.lisa.type.Untyped; import it.unive.lisa.util.datastructures.graph.GraphVisitor; +import java.util.Arrays; +import java.util.Collection; +import java.util.Objects; +import org.apache.commons.lang3.StringUtils; /** * A generic expression with {@code n} sub-expressions. diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryStatement.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryStatement.java index 1ff792103..227beebb9 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryStatement.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/NaryStatement.java @@ -1,10 +1,5 @@ package it.unive.lisa.program.cfg.statement; -import java.util.Arrays; -import java.util.Objects; - -import org.apache.commons.lang3.StringUtils; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.SemanticException; @@ -17,6 +12,9 @@ import it.unive.lisa.program.cfg.statement.evaluation.EvaluationOrder; import it.unive.lisa.program.cfg.statement.evaluation.LeftToRightEvaluation; import it.unive.lisa.util.datastructures.graph.GraphVisitor; +import java.util.Arrays; +import java.util.Objects; +import org.apache.commons.lang3.StringUtils; /** * A generic statement with {@code n} sub-expressions. diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/Statement.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/Statement.java index d63e5128f..6c09865ed 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/Statement.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/Statement.java @@ -1,7 +1,5 @@ package it.unive.lisa.program.cfg.statement; -import java.util.Objects; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.SemanticException; @@ -13,6 +11,7 @@ import it.unive.lisa.program.cfg.edge.Edge; import it.unive.lisa.program.cfg.statement.call.Call; import it.unive.lisa.util.datastructures.graph.code.CodeNode; +import java.util.Objects; /** * A statement of the program to analyze. diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/VariableRef.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/VariableRef.java index 841d39a26..05269578d 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/VariableRef.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/VariableRef.java @@ -1,7 +1,5 @@ package it.unive.lisa.program.cfg.statement; -import java.util.Objects; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.SemanticException; @@ -18,6 +16,7 @@ import it.unive.lisa.type.Type; import it.unive.lisa.type.Untyped; import it.unive.lisa.util.datastructures.graph.GraphVisitor; +import java.util.Objects; /** * A reference to a variable of the current CFG, identified by its name. diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/call/TruncatedParamsCall.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/call/TruncatedParamsCall.java index 8a0986b31..2cf04ee30 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/call/TruncatedParamsCall.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/program/cfg/statement/call/TruncatedParamsCall.java @@ -1,7 +1,5 @@ package it.unive.lisa.program.cfg.statement.call; -import java.util.Collection; - import it.unive.lisa.analysis.AbstractState; import it.unive.lisa.analysis.AnalysisState; import it.unive.lisa.analysis.SemanticException; @@ -10,6 +8,7 @@ import it.unive.lisa.interprocedural.InterproceduralAnalysis; import it.unive.lisa.program.cfg.CodeMember; import it.unive.lisa.program.cfg.statement.Expression; +import java.util.Collection; /** * A call that wraps another one that has been created through diff --git a/lisa/lisa-sdk/src/main/java/it/unive/lisa/util/datastructures/graph/code/NodeList.java b/lisa/lisa-sdk/src/main/java/it/unive/lisa/util/datastructures/graph/code/NodeList.java index 68a557bcf..b45440464 100644 --- a/lisa/lisa-sdk/src/main/java/it/unive/lisa/util/datastructures/graph/code/NodeList.java +++ b/lisa/lisa-sdk/src/main/java/it/unive/lisa/util/datastructures/graph/code/NodeList.java @@ -1,5 +1,9 @@ package it.unive.lisa.util.datastructures.graph.code; +import it.unive.lisa.program.ProgramValidationException; +import it.unive.lisa.util.collections.CollectionUtilities.SortedSetCollector; +import it.unive.lisa.util.datastructures.graph.Edge; +import it.unive.lisa.util.datastructures.graph.Node; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -15,15 +19,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; -import it.unive.lisa.program.ProgramValidationException; -import it.unive.lisa.util.collections.CollectionUtilities.SortedSetCollector; -import it.unive.lisa.util.datastructures.graph.Edge; -import it.unive.lisa.util.datastructures.graph.Node; - /** * A list of nodes of a {@link CodeGraph}, together with the edges connecting * them. diff --git a/lisa/lisa-sdk/src/test/java/it/unive/lisa/outputs/SerializableGraphTest.java b/lisa/lisa-sdk/src/test/java/it/unive/lisa/outputs/SerializableGraphTest.java index 1bc30959b..8949cf43d 100644 --- a/lisa/lisa-sdk/src/test/java/it/unive/lisa/outputs/SerializableGraphTest.java +++ b/lisa/lisa-sdk/src/test/java/it/unive/lisa/outputs/SerializableGraphTest.java @@ -2,14 +2,6 @@ import static org.junit.Assert.assertEquals; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.SortedSet; -import java.util.TreeSet; - -import org.junit.Test; - import it.unive.lisa.TestLanguageFeatures; import it.unive.lisa.TestTypeSystem; import it.unive.lisa.outputs.serializableGraph.SerializableCFG; @@ -29,6 +21,12 @@ import it.unive.lisa.program.cfg.statement.Return; import it.unive.lisa.program.cfg.statement.Statement; import it.unive.lisa.program.cfg.statement.VariableRef; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; +import org.junit.Test; public class SerializableGraphTest {