diff --git a/build.gradle b/build.gradle index 784d0cbc941..f1a66ba36c5 100644 --- a/build.gradle +++ b/build.gradle @@ -79,9 +79,6 @@ subprojects { repositories { mavenCentral() - maven { - url 'https://git.key-project.org/api/v4/projects/35/packages/maven' - } } dependencies { diff --git a/key.core.symbolic_execution.example/src/main/java/org/key_project/example/Main.java b/key.core.symbolic_execution.example/src/main/java/org/key_project/example/Main.java index ef1e4702531..e5d0e8f569f 100644 --- a/key.core.symbolic_execution.example/src/main/java/org/key_project/example/Main.java +++ b/key.core.symbolic_execution.example/src/main/java/org/key_project/example/Main.java @@ -17,18 +17,18 @@ import de.uka.ilkd.key.proof.init.AbstractOperationPO; import de.uka.ilkd.key.settings.ChoiceSettings; import de.uka.ilkd.key.settings.ProofSettings; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPO; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.ExceptionBreakpoint; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.po.ProgramMethodPO; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.ExceptionBreakpoint; +import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.MiscTools; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java index e04c2be2a75..e6a4bf970af 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.*; import java.util.Map.Entry; @@ -20,10 +20,10 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionAllArrayIndicesVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.impl.ExecutionAllArrayIndicesVariable; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java index e519e28039f..7da456092fd 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.Map; import java.util.Map.Entry; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java index ded295278ea..006c9e63c3b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java @@ -1,9 +1,9 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionNode; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java index 3d062b171a8..c7311929b73 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.io.File; import java.io.FileInputStream; @@ -29,10 +29,10 @@ import de.uka.ilkd.key.speclang.BlockContract; import de.uka.ilkd.key.speclang.Contract; import de.uka.ilkd.key.speclang.LoopSpecification; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination.TerminationKind; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.model.IExecutionTermination.TerminationKind; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; import org.key_project.logic.sort.Sort; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeSymbolicLayoutExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeSymbolicLayoutExtractor.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeSymbolicLayoutExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeSymbolicLayoutExtractor.java index 4b6cb070107..1755574e0b1 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeSymbolicLayoutExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeSymbolicLayoutExtractor.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Special {@link SymbolicLayoutExtractor} for {@link IExecutionNode}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java index 33c282a19eb..7053fcbf298 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.io.File; import java.io.FileOutputStream; @@ -12,29 +12,29 @@ import java.util.Map; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionAuxiliaryContract; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBaseMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBlockStartNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBranchCondition; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBranchStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionElement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionExceptionalMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionJoin; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLink; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopCondition; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopInvariant; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodCall; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturnValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionOperationContract; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStart; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.IExecutionAuxiliaryContract; +import de.uka.ilkd.key.symbex.model.IExecutionBaseMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionBlockStartNode; +import de.uka.ilkd.key.symbex.model.IExecutionBranchCondition; +import de.uka.ilkd.key.symbex.model.IExecutionBranchStatement; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionElement; +import de.uka.ilkd.key.symbex.model.IExecutionExceptionalMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionJoin; +import de.uka.ilkd.key.symbex.model.IExecutionLink; +import de.uka.ilkd.key.symbex.model.IExecutionLoopCondition; +import de.uka.ilkd.key.symbex.model.IExecutionLoopInvariant; +import de.uka.ilkd.key.symbex.model.IExecutionLoopStatement; +import de.uka.ilkd.key.symbex.model.IExecutionMethodCall; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturnValue; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionOperationContract; +import de.uka.ilkd.key.symbex.model.IExecutionStart; +import de.uka.ilkd.key.symbex.model.IExecutionStatement; +import de.uka.ilkd.key.symbex.model.IExecutionTermination; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; import de.uka.ilkd.key.util.LinkedHashMap; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionVariableExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionVariableExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java index c5ca0385f7f..7a3bd01151c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionVariableExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.*; @@ -12,13 +12,13 @@ import de.uka.ilkd.key.logic.op.ProgramVariable; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.model.impl.AbstractExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.impl.AbstractExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.impl.AbstractExecutionValue; +import de.uka.ilkd.key.symbex.model.impl.AbstractExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicExecutionTreeBuilder.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicExecutionTreeBuilder.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicExecutionTreeBuilder.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicExecutionTreeBuilder.java index 35e6ea1b81d..574b80cf20b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicExecutionTreeBuilder.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicExecutionTreeBuilder.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.*; import java.util.Map.Entry; @@ -27,13 +27,13 @@ import de.uka.ilkd.key.rule.WhileInvariantRule; import de.uka.ilkd.key.rule.merge.MergePartner; import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination.TerminationKind; -import de.uka.ilkd.key.symbolic_execution.model.impl.*; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; -import de.uka.ilkd.key.symbolic_execution.util.DefaultEntry; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.model.IExecutionTermination.TerminationKind; +import de.uka.ilkd.key.symbex.model.impl.*; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.util.DefaultEntry; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.MiscTools; import de.uka.ilkd.key.util.NodePreorderIterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java index 7d849a0530f..4ade9ef4c9c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.*; @@ -19,10 +19,10 @@ import de.uka.ilkd.key.rule.NoPosTacletApp; import de.uka.ilkd.key.rule.TacletApp; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.object_model.*; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.object_model.*; +import de.uka.ilkd.key.symbex.object_model.impl.*; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.ProofStarter; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutReader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutReader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java index eacd8958e66..4d0248bdd82 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutReader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.io.File; import java.io.FileInputStream; @@ -18,15 +18,15 @@ import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociation; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociationValueContainer; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicElement; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicState; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicValue; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociation; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociationValueContainer; +import de.uka.ilkd.key.symbex.object_model.ISymbolicElement; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.object_model.ISymbolicState; +import de.uka.ilkd.key.symbex.object_model.ISymbolicValue; import org.key_project.logic.sort.Sort; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutWriter.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutWriter.java index 954b1dbc0dc..2ee73c71dca 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutWriter.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.io.File; import java.io.FileOutputStream; @@ -11,12 +11,12 @@ import java.util.Iterator; import java.util.Map; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociation; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicState; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicValue; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociation; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.object_model.ISymbolicState; +import de.uka.ilkd.key.symbex.object_model.ISymbolicValue; import de.uka.ilkd.key.util.LinkedHashMap; /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java index 3f4390f528b..4965f5a87a4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution; +package de.uka.ilkd.key.symbex; import java.util.Collections; import java.util.Deque; @@ -38,7 +38,7 @@ import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.rule.TacletApp; import de.uka.ilkd.key.rule.tacletbuilder.TacletGoalTemplate; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.NodePreorderIterator; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/BlockContractValidityTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/BlockContractValidityTermLabelUpdate.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/BlockContractValidityTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/BlockContractValidityTermLabelUpdate.java index 313d77c0f91..6f5bc6448e6 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/BlockContractValidityTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/BlockContractValidityTermLabelUpdate.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Set; @@ -15,7 +15,8 @@ import de.uka.ilkd.key.rule.LoopContractInternalRule; import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.rule.label.TermLabelUpdate; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelMerger.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelMerger.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelMerger.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelMerger.java index da7e85f8a9e..b460de3eb49 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelMerger.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelMerger.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.ArrayList; import java.util.Arrays; @@ -11,6 +11,7 @@ import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.label.FormulaTermLabel; import de.uka.ilkd.key.logic.label.TermLabel; +import de.uka.ilkd.key.rule.label.TermLabelMerger; /** * The {@link TermLabelMerger} used to merge {@link FormulaTermLabel}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelRefactoring.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelRefactoring.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java index f55f6111dcc..5551a3e5b7e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelRefactoring.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.*; @@ -15,8 +15,10 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.SyntacticalReplaceVisitor; +import de.uka.ilkd.key.rule.label.StayOnOperatorTermLabelPolicy; +import de.uka.ilkd.key.rule.label.TermLabelRefactoring; import de.uka.ilkd.key.rule.merge.CloseAfterMerge; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelUpdate.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelUpdate.java index 2ae4dbc912d..2e77e38336e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelUpdate.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Collections; import java.util.LinkedHashMap; @@ -21,7 +21,8 @@ import de.uka.ilkd.key.rule.Taclet.TacletLabelHint; import de.uka.ilkd.key.rule.Taclet.TacletLabelHint.TacletOperation; import de.uka.ilkd.key.rule.TacletApp; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; +import de.uka.ilkd.key.rule.label.TermLabelUpdate; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopBodyTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopBodyTermLabelUpdate.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopBodyTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopBodyTermLabelUpdate.java index c53d6be78c0..759584efda2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopBodyTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopBodyTermLabelUpdate.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Set; @@ -13,7 +13,8 @@ import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.rule.WhileInvariantRule; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.rule.label.TermLabelUpdate; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopInvariantNormalBehaviorTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopInvariantNormalBehaviorTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java index 1ad966ad364..6ef18467baf 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/LoopInvariantNormalBehaviorTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Set; @@ -13,7 +13,8 @@ import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.rule.WhileInvariantRule; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.rule.label.TermLabelUpdate; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/RemoveInCheckBranchesTermLabelRefactoring.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/RemoveInCheckBranchesTermLabelRefactoring.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java index 065bde102a4..64b033c28a9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/RemoveInCheckBranchesTermLabelRefactoring.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; @@ -18,6 +18,7 @@ import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.UseOperationContractRule; import de.uka.ilkd.key.rule.WhileInvariantRule; +import de.uka.ilkd.key.rule.label.TermLabelRefactoring; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/StayOnFormulaTermLabelPolicy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/StayOnFormulaTermLabelPolicy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java index 7d2ea52c692..50ad87796fc 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/StayOnFormulaTermLabelPolicy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Deque; import java.util.LinkedHashSet; @@ -18,7 +18,8 @@ import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.Taclet.TacletLabelHint; import de.uka.ilkd.key.rule.Taclet.TacletLabelHint.TacletOperation; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; +import de.uka.ilkd.key.rule.label.TermLabelPolicy; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil; import org.key_project.util.collection.ImmutableArray; import org.key_project.util.java.CollectionUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/SymbolicExecutionTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/SymbolicExecutionTermLabelUpdate.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/SymbolicExecutionTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/SymbolicExecutionTermLabelUpdate.java index 49c0ba3a0a9..a356be2df4f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/SymbolicExecutionTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/SymbolicExecutionTermLabelUpdate.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.rule.label; +package de.uka.ilkd.key.symbex.label; import java.util.Set; @@ -12,6 +12,7 @@ import de.uka.ilkd.key.logic.label.TermLabel; import de.uka.ilkd.key.logic.label.TermLabelState; import de.uka.ilkd.key.rule.*; +import de.uka.ilkd.key.rule.label.TermLabelUpdate; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionAuxiliaryContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java similarity index 87% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionAuxiliaryContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java index 7b2e2f27990..819fb5b3a6c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionAuxiliaryContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java @@ -1,14 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.java.StatementBlock; import de.uka.ilkd.key.speclang.AuxiliaryContract; import de.uka.ilkd.key.speclang.BlockContract; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionAuxiliaryContract; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionAuxiliaryContract; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBaseMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBaseMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java index 9c3ba6bd461..3766c0621c5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBaseMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.Term; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBlockStartNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBlockStartNode.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBlockStartNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBlockStartNode.java index 1a322fe8eb9..b4655b5306f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBlockStartNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBlockStartNode.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java index caf9646d8fe..6d9608aaa0f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java @@ -1,14 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionBranchCondition; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionBranchCondition; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java similarity index 79% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java index 9300cc0f011..a7d9e9fdf07 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.statement.BranchStatement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionBranchStatement; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionBranchStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionConstraint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionConstraint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java index 6d33f9bc5da..800c620c096 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionConstraint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java @@ -1,10 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionConstraint; +import de.uka.ilkd.key.symbex.model.impl.ExecutionConstraint; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java index 1528fc2e0e0..3eb5f572797 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionExceptionalMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionExceptionalMethodReturn.java similarity index 76% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionExceptionalMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionExceptionalMethodReturn.java index a18b61ada74..ad196be0f3f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionExceptionalMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionExceptionalMethodReturn.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.statement.Throw; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionExceptionalMethodReturn; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionExceptionalMethodReturn; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionJoin.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionJoin.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java index c1c51724e69..9a7e090e1c6 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionJoin.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionJoin; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionJoin; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLink.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLink.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java index 7b6e7b85f58..7e43886c4cd 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLink.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; /** * A link between two {@link IExecutionNode}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java index 8d3a9447827..81dc8cd0919 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.Expression; import de.uka.ilkd.key.java.PositionInfo; import de.uka.ilkd.key.java.statement.JavaStatement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopCondition; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopCondition; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopInvariant.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopInvariant.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java index f3229003192..7aaf23f6c42 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopInvariant.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.java.statement.While; import de.uka.ilkd.key.speclang.LoopSpecification; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopInvariant; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopInvariant; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java similarity index 79% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java index df72534b7f7..ac370d061ee 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.statement.LoopStatement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopStatement; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodCall.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodCall.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java index d36b33bb802..24999b73a20 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodCall.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.reference.MethodReference; import de.uka.ilkd.key.java.statement.MethodBodyStatement; import de.uka.ilkd.key.logic.op.IProgramMethod; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodCall; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodCall; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java index 44e9f58cec2..a51f963c068 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturn; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturn; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturnValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturnValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java index b424ad82821..c3660c8510f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturnValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturnValue; +import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturn; +import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturnValue; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java index aa8bf8a966d..7f09c949361 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.PositionInfo; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionOperationContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionOperationContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java index 87d1ea97634..a85f75f07a5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionOperationContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.speclang.Contract; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionOperationContract; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionOperationContract; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStart.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStart.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java index df963e16b32..7d4dbdd4268 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStart.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionStart; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionStart; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java similarity index 77% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java index 112e1675403..c9eb0cfbd28 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionStatement; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.impl.ExecutionStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java index 5b07fb2f76b..3cf0f8f7831 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java @@ -1,14 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.Sequent; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.proof.Proof; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionTermination; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; import org.key_project.logic.sort.Sort; @@ -19,7 +18,9 @@ * in case of exceptional termination. *

*

- * The default implementation is {@link ExecutionTermination} which is instantiated via a + * The default implementation is + * {@link de.uka.ilkd.key.symbex.model.impl.ExecutionTermination} + * which is instantiated via a * {@link SymbolicExecutionTreeBuilder} instance. *

* diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionValue.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionValue.java index 194cd2907c2..d68c1e6afb8 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionValue.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionValue; +import de.uka.ilkd.key.symbex.model.impl.ExecutionValue; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java index 1411426459e..3db3b20effc 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionVariable; +import de.uka.ilkd.key.symbex.model.impl.ExecutionVariable; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/ITreeSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/ITreeSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java index 957d8a5e984..4e588955eb9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/ITreeSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model; +package de.uka.ilkd.key.symbex.model; /** * Provides the settings used to construct the symbolic execution tree. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionBlockStartNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionBlockStartNode.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionBlockStartNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionBlockStartNode.java index 759f5a3e3a2..c7340a90bd7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionBlockStartNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionBlockStartNode.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBlockStartNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; +import de.uka.ilkd.key.symbex.model.IExecutionBlockStartNode; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionElement.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionElement.java index 74a43bd66d2..b523a76130a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionElement.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; @@ -11,10 +11,10 @@ import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionElement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionElement; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Provides a basic implementation of {@link IExecutionElement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java index d74bfb41cd4..7c91eef35e4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.LinkedList; import java.util.List; @@ -15,13 +15,13 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBaseMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBranchCondition; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodCall; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionBaseMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionBranchCondition; +import de.uka.ilkd.key.symbex.model.IExecutionMethodCall; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionBaseMethodReturn}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java index 56517808564..79ac096c5ae 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.HashMap; import java.util.LinkedList; @@ -17,11 +17,11 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeSymbolicLayoutExtractor; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.ExecutionNodeSymbolicLayoutExtractor; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionValue.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionValue.java index ac350ca0ea8..321f7a3e233 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionValue.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.HashSet; import java.util.LinkedList; @@ -15,8 +15,8 @@ import de.uka.ilkd.key.logic.op.ProgramVariable; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Provides a basic implementation of {@link IExecutionValue}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java index b0106b6af44..c1e6104ff94 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java @@ -1,18 +1,18 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Provides a basic implementation of {@link IExecutionVariable}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAllArrayIndicesVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAllArrayIndicesVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java index f7a1b5b9592..197a1be822d 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAllArrayIndicesVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.ldt.JavaDLTheory; @@ -17,11 +17,11 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAuxiliaryContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAuxiliaryContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java index 293a231f50f..3533f816ccb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAuxiliaryContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.LinkedHashMap; import java.util.Map; @@ -25,11 +25,11 @@ import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.rule.AbstractAuxiliaryContractBuiltInRuleApp; import de.uka.ilkd.key.speclang.AuxiliaryContract; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionAuxiliaryContract; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionAuxiliaryContract; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Named; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java index 0ae1dc7806e..54682ae647c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.Iterator; import java.util.LinkedList; @@ -15,11 +15,11 @@ import de.uka.ilkd.key.proof.NodeInfo; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBranchCondition; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionBranchCondition; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionBranchCondition}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java similarity index 82% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java index dc97d520667..c6e86b19c35 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java @@ -1,18 +1,18 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.statement.BranchStatement; import de.uka.ilkd.key.java.statement.If; import de.uka.ilkd.key.java.statement.Switch; import de.uka.ilkd.key.pp.PrettyPrinter; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBranchStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionBranchStatement; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionBranchStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionConstraint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java similarity index 88% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionConstraint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java index db85bdc3d39..04a3823ddb0 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionConstraint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; /** * The default implementation of {@link IExecutionConstraint}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionExceptionalMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionExceptionalMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java index ae9dbaa77f5..a8e0b06e4cb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionExceptionalMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.Expression; import de.uka.ilkd.key.java.abstraction.KeYJavaType; @@ -9,12 +9,12 @@ import de.uka.ilkd.key.logic.op.ProgramVariable; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionExceptionalMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodCall; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionExceptionalMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionMethodCall; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionJoin.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java similarity index 81% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionJoin.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java index fa81adcf2ca..8276cba3989 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionJoin.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionJoin; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionJoin; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionJoin}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLink.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLink.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java index 8eff5671ca8..350e6ceeb8e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLink.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java @@ -1,10 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLink; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionLink; +import de.uka.ilkd.key.symbex.model.IExecutionNode; /** * The default implementation of {@link IExecutionLink}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java index b0eb7159950..74bc8811251 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.Expression; import de.uka.ilkd.key.java.PositionInfo; @@ -9,11 +9,11 @@ import de.uka.ilkd.key.java.statement.JavaStatement; import de.uka.ilkd.key.java.statement.LoopStatement; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopCondition; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionLoopCondition; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionLoopCondition}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopInvariant.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopInvariant.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java index 3a10756d56e..ec4815dd055 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopInvariant.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java @@ -1,18 +1,18 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.java.statement.While; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.rule.LoopInvariantBuiltInRuleApp; import de.uka.ilkd.key.speclang.LoopSpecification; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopInvariant; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionLoopInvariant; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionLoopInvariant}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java index ba6acfee777..4724a8c732b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java @@ -1,16 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.statement.*; import de.uka.ilkd.key.pp.PrettyPrinter; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionLoopStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionLoopStatement; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionLoopStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodCall.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodCall.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java index a5f0add941e..9c0f0776623 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodCall.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java @@ -1,18 +1,18 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.reference.MethodReference; import de.uka.ilkd.key.java.statement.MethodBodyStatement; import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBaseMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodCall; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionBaseMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionMethodCall; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.KeYTypeUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java index f2c8c34144e..1f6ff4a0e43 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.LinkedHashMap; import java.util.LinkedList; @@ -26,15 +26,15 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodCall; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturnValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil.SiteProofVariableValueInput; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionMethodCall; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturnValue; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil.SiteProofVariableValueInput; import de.uka.ilkd.key.util.MiscTools; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturnValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturnValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java index 19ea5bc0e96..d83a928740f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturnValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturnValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturnValue; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.ITreeSettings; /** * The default implementation of {@link IExecutionMethodReturnValue}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionOperationContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionOperationContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java index 71c67bd74e5..d9251207a8c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionOperationContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.List; import java.util.Map; @@ -32,12 +32,12 @@ import de.uka.ilkd.key.speclang.FunctionalOperationContractImpl; import de.uka.ilkd.key.speclang.HeapContext; import de.uka.ilkd.key.speclang.OperationContract; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionOperationContract; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil.ContractPostOrExcPostExceptionVariableResult; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionOperationContract; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil.ContractPostOrExcPostExceptionVariableResult; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStart.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStart.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java index 3795c1b603e..4a5370c277e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStart.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java @@ -1,19 +1,19 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.NodeInfo; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStart; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionStart; +import de.uka.ilkd.key.symbex.model.IExecutionTermination; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStatement.java similarity index 76% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStatement.java index af498913591..b9ec2d7d036 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStatement.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStatement; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionStatement; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * The default implementation of {@link IExecutionStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionTermination.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionTermination.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java index 92114afa8a2..da3ff1d8ffd 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionTermination.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java @@ -1,17 +1,17 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.logic.sort.NullSort; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionTermination; +import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java index 0a7dcc4b78a..cd17b8ff1b3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.LinkedList; import java.util.List; @@ -18,11 +18,11 @@ import de.uka.ilkd.key.logic.op.ProgramVariable; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.sort.Sort; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionVariable.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionVariable.java index f16fe3fee68..8122e276d14 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionVariable.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -24,12 +24,12 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionValue; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil.SiteProofVariableValueInput; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionValue; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil.SiteProofVariableValueInput; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/TreeSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/TreeSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java index 1822533ff4f..4abf769c6e3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/TreeSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java @@ -1,10 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.model.impl; +package de.uka.ilkd.key.symbex.model.impl; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.ITreeSettings; /** * The default implementation of {@link ITreeSettings}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/IModelSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/IModelSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java index fcd85bcc43b..e856a48add0 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/IModelSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; /** * Provides the settings used to construct a symbolic object model. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociation.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociation.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociation.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociation.java index 0de22f3fc1d..3b9972ec030 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociation.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociation.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicAssociation; +import de.uka.ilkd.key.symbex.object_model.impl.SymbolicAssociation; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociationValueContainer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociationValueContainer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java index c11cdf622f3..b0e8c47a4ff 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociationValueContainer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.AbstractSymbolicAssociationValueContainer; +import de.uka.ilkd.key.symbex.object_model.impl.AbstractSymbolicAssociationValueContainer; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicElement.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicElement.java index d81761b15f3..1fbde9851d3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicElement.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; /** * Defines the basic methods and properties each element in an symbolic object model has to have. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicEquivalenceClass.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicEquivalenceClass.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicEquivalenceClass.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicEquivalenceClass.java index f2d94bc108b..946cef16909 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicEquivalenceClass.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicEquivalenceClass.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; import de.uka.ilkd.key.logic.Term; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicLayout.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java similarity index 80% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicLayout.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java index 215ec54385e..03c0acf5f42 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicLayout.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutExtractor; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutReader; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutWriter; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicLayout; +import de.uka.ilkd.key.symbex.SymbolicLayoutExtractor; +import de.uka.ilkd.key.symbex.SymbolicLayoutReader; +import de.uka.ilkd.key.symbex.SymbolicLayoutWriter; +import de.uka.ilkd.key.symbex.object_model.impl.SymbolicLayout; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicObject.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicObject.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java index 4ca7e06fcd7..06f559035f4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicObject.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java @@ -1,10 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicObject; +import de.uka.ilkd.key.symbex.object_model.impl.SymbolicObject; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicState.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicState.java similarity index 81% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicState.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicState.java index 3ba45b8edc7..45ae2188937 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicState.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicState.java @@ -1,9 +1,9 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicState; +import de.uka.ilkd.key.symbex.object_model.impl.SymbolicState; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java index 01a6318059c..21934dda890 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model; +package de.uka.ilkd.key.symbex.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicValue; +import de.uka.ilkd.key.symbex.object_model.impl.SymbolicValue; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractElement.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractElement.java index 7bf88024779..4ef52ce7ceb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractElement.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicElement; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicElement; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Default implementation of {@link ISymbolicElement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractSymbolicAssociationValueContainer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractSymbolicAssociationValueContainer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java index 943bb95af2e..cde82de41c5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractSymbolicAssociationValueContainer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java @@ -1,16 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import java.util.Objects; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociation; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociationValueContainer; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicValue; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociation; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociationValueContainer; +import de.uka.ilkd.key.symbex.object_model.ISymbolicValue; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/ModelSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/ModelSettings.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/ModelSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/ModelSettings.java index aa4e65891f9..372258dda19 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/ModelSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/ModelSettings.java @@ -1,9 +1,9 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; /** * Default implementation of {@link IModelSettings}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicAssociation.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicAssociation.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java index d05704edc0e..d888f1d5eae 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicAssociation.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java @@ -1,16 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.logic.op.Junctor; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicAssociation; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicAssociation; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Default implementation of {@link ISymbolicAssociation}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicEquivalenceClass.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicEquivalenceClass.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java index 3761a10d655..cc1a4af8576 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicEquivalenceClass.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java @@ -1,16 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.ldt.HeapLDT; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.label.OriginTermLabel; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicLayout.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicLayout.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicLayout.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicLayout.java index fb2181fb47d..28dde3a5b90 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicLayout.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicLayout.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicState; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.object_model.ISymbolicState; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicObject.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicObject.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicObject.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicObject.java index cbb4537a61f..e403b4d5b7b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicObject.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicObject.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicState.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java similarity index 80% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicState.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java index 133b59590d3..22aa55baffa 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicState.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java @@ -1,10 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicState; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicState; /** * Default implementation of {@link ISymbolicState}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java index 13290731263..4fb4c051d5b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java @@ -1,15 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.object_model.impl; +package de.uka.ilkd.key.symbex.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.logic.op.Junctor; -import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicValue; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbex.object_model.ISymbolicValue; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPO.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPO.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java index 726d64d25fa..d156e34a345 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPO.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.po; +package de.uka.ilkd.key.symbex.po; import java.io.IOException; import java.util.List; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPOLoader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPOLoader.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPOLoader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPOLoader.java index 78f56ccec67..a05c1f1de33 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPOLoader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPOLoader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.po; +package de.uka.ilkd.key.symbex.po; import java.io.IOException; @@ -13,7 +13,7 @@ import org.jspecify.annotations.NullMarked; import static de.uka.ilkd.key.proof.init.AbstractPO.getName; -import static de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPO.*; +import static de.uka.ilkd.key.symbex.po.ProgramMethodPO.*; @NullMarked public class ProgramMethodPOLoader implements ProofObligationLoader { diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPO.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPO.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java index 46547b4935b..f8cdcbe9e3b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPO.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.po; +package de.uka.ilkd.key.symbex.po; import java.io.IOException; import java.util.*; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPOLoader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPOLoader.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPOLoader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPOLoader.java index 0ce8cb402c8..a9033520629 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPOLoader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPOLoader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.po; +package de.uka.ilkd.key.symbex.po; import java.io.IOException; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/TruthValuePOExtension.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/TruthValuePOExtension.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java index 8e9b75dd5bd..427b79dbd98 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/TruthValuePOExtension.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.po; +package de.uka.ilkd.key.symbex.po; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; @@ -13,8 +13,8 @@ import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.POExtension; import de.uka.ilkd.key.proof.init.ProofOblInput; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; import org.key_project.util.collection.ImmutableArray; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SimplifyTermProfile.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SimplifyTermProfile.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java index 293e3526990..ad6dc507e3c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SimplifyTermProfile.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.profile; +package de.uka.ilkd.key.symbex.profile; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.label.SingletonLabelFactory; @@ -10,9 +10,9 @@ import de.uka.ilkd.key.proof.init.Profile; import de.uka.ilkd.key.rule.label.TermLabelPolicy; import de.uka.ilkd.key.strategy.StrategyFactory; -import de.uka.ilkd.key.symbolic_execution.strategy.SimplifyTermStrategy; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.strategy.SimplifyTermStrategy; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.DefaultImmutableSet; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfile.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfile.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfile.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfile.java index 9b477da0217..b77cc369c70 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfile.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfile.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.profile; +package de.uka.ilkd.key.symbex.profile; import de.uka.ilkd.key.logic.label.BlockContractValidityTermLabel; import de.uka.ilkd.key.logic.label.BlockContractValidityTermLabelFactory; @@ -18,25 +18,25 @@ import de.uka.ilkd.key.proof.init.Profile; import de.uka.ilkd.key.prover.GoalChooserBuilder; import de.uka.ilkd.key.rule.BuiltInRule; -import de.uka.ilkd.key.rule.label.BlockContractValidityTermLabelUpdate; -import de.uka.ilkd.key.rule.label.FormulaTermLabelMerger; -import de.uka.ilkd.key.rule.label.FormulaTermLabelRefactoring; -import de.uka.ilkd.key.rule.label.FormulaTermLabelUpdate; -import de.uka.ilkd.key.rule.label.LoopBodyTermLabelUpdate; -import de.uka.ilkd.key.rule.label.LoopInvariantNormalBehaviorTermLabelUpdate; -import de.uka.ilkd.key.rule.label.RemoveInCheckBranchesTermLabelRefactoring; -import de.uka.ilkd.key.rule.label.StayOnFormulaTermLabelPolicy; import de.uka.ilkd.key.rule.label.StayOnOperatorTermLabelPolicy; -import de.uka.ilkd.key.rule.label.SymbolicExecutionTermLabelUpdate; import de.uka.ilkd.key.rule.label.TermLabelPolicy; import de.uka.ilkd.key.rule.label.TermLabelRefactoring; import de.uka.ilkd.key.rule.label.TermLabelUpdate; import de.uka.ilkd.key.strategy.StrategyFactory; -import de.uka.ilkd.key.symbolic_execution.rule.ModalitySideProofRule; -import de.uka.ilkd.key.symbolic_execution.rule.QuerySideProofRule; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionGoalChooserBuilder; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.label.BlockContractValidityTermLabelUpdate; +import de.uka.ilkd.key.symbex.label.FormulaTermLabelMerger; +import de.uka.ilkd.key.symbex.label.FormulaTermLabelRefactoring; +import de.uka.ilkd.key.symbex.label.FormulaTermLabelUpdate; +import de.uka.ilkd.key.symbex.label.LoopBodyTermLabelUpdate; +import de.uka.ilkd.key.symbex.label.LoopInvariantNormalBehaviorTermLabelUpdate; +import de.uka.ilkd.key.symbex.label.RemoveInCheckBranchesTermLabelRefactoring; +import de.uka.ilkd.key.symbex.label.StayOnFormulaTermLabelPolicy; +import de.uka.ilkd.key.symbex.label.SymbolicExecutionTermLabelUpdate; +import de.uka.ilkd.key.symbex.rule.ModalitySideProofRule; +import de.uka.ilkd.key.symbex.rule.QuerySideProofRule; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionGoalChooserBuilder; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java index 0540ea16ab5..5ee47b85554 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.profile; +package de.uka.ilkd.key.symbex.profile; import de.uka.ilkd.key.proof.init.DefaultProfileResolver; import de.uka.ilkd.key.proof.init.Profile; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java index 5dc88746613..6123a13b0e0 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java @@ -1,15 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof; +package de.uka.ilkd.key.symbex.proof; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.LocationVariable; import de.uka.ilkd.key.logic.op.Modality; -import de.uka.ilkd.key.strategy.IBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.AbstractConditionalBreakpoint; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.proof.TermProgramVariableCollector; +import de.uka.ilkd.key.symbex.strategy.IBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.AbstractConditionalBreakpoint; +import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; public class TermProgramVariableCollectorKeepUpdatesForBreakpointconditions extends TermProgramVariableCollector { diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/AbstractSideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/AbstractSideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java index e9178d692a2..7dc0631b615 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/AbstractSideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.rule; +package de.uka.ilkd.key.symbex.rule; import java.util.Deque; import java.util.LinkedList; @@ -22,7 +22,7 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.rule.BuiltInRule; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; import org.key_project.logic.Name; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ModalitySideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ModalitySideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java index 18f87c546f0..2ac1daa2422 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ModalitySideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.rule; +package de.uka.ilkd.key.symbex.rule; import java.util.LinkedHashSet; import java.util.List; @@ -13,8 +13,8 @@ import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.rule.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableArray; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/QuerySideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/QuerySideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java index a4bfda8eab7..2d676066cf1 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/QuerySideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.rule; +package de.uka.ilkd.key.symbex.rule; import java.util.List; @@ -22,7 +22,7 @@ import de.uka.ilkd.key.rule.QueryExpand; import de.uka.ilkd.key.rule.RuleAbortException; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; import org.key_project.logic.Name; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ResultsAndCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ResultsAndCondition.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ResultsAndCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ResultsAndCondition.java index aad73735f8c..853e437efce 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ResultsAndCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ResultsAndCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.rule; +package de.uka.ilkd.key.symbex.rule; import java.util.Set; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractBackwardSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractBackwardSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java index bfb10ac3e91..b74e8941c43 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractBackwardSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.slicing; +package de.uka.ilkd.key.symbex.slicing; import java.util.HashSet; import java.util.LinkedList; @@ -21,7 +21,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.NodeInfo; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; import org.key_project.util.collection.ImmutableArray; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractSlicer.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractSlicer.java index 56ead50dddb..5061dbe5e12 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractSlicer.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.slicing; +package de.uka.ilkd.key.symbex.slicing; import java.util.*; @@ -23,9 +23,9 @@ import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Access.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Access.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java index b9f0b4690f4..c2f35aeba10 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Access.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.slicing; +package de.uka.ilkd.key.symbex.slicing; import java.util.Objects; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Location.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Location.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java index 3091bad94d2..49ac152b729 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Location.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.slicing; +package de.uka.ilkd.key.symbex.slicing; import java.util.Objects; @@ -9,7 +9,7 @@ import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.JFunction; import de.uka.ilkd.key.logic.op.LocationVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/ThinBackwardSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/ThinBackwardSlicer.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/ThinBackwardSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/ThinBackwardSlicer.java index bbfd01ef2ae..44e554da786 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/ThinBackwardSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/ThinBackwardSlicer.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.slicing; +package de.uka.ilkd.key.symbex.slicing; import java.util.LinkedList; import java.util.List; @@ -19,7 +19,7 @@ import de.uka.ilkd.key.logic.op.UpdateApplication; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableArray; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/AbstractCallStackBasedStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/AbstractCallStackBasedStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java index bf67bbd65fc..a390f098747 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/AbstractCallStackBasedStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Iterator; import java.util.LinkedHashMap; @@ -13,7 +13,7 @@ import de.uka.ilkd.key.prover.StopCondition; import de.uka.ilkd.key.prover.impl.SingleRuleApplicationInfo; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** * Provides the basic functionality for {@link StopCondition}s which stops the auto mode when the diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/BreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/BreakpointStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/BreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/BreakpointStopCondition.java index a6adc3159d0..94e3e0bb44a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/BreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/BreakpointStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Collections; import java.util.HashSet; @@ -15,8 +15,7 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.prover.impl.SingleRuleApplicationInfo; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.strategy.IBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; /** * An {@link IBreakpointStopCondition} which can be used during proof. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CompoundStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CompoundStopCondition.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CompoundStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CompoundStopCondition.java index 1e85ccdb33f..0fffe8b95eb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CompoundStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CompoundStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Collections; import java.util.Iterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsFeature.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsFeature.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java index b82c837cd0c..f77f1fc68f0 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsFeature.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Iterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsTermGenerator.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsTermGenerator.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java index db00d1469bf..d3a64d34684 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsTermGenerator.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java index 119b7478a40..a8139fd241b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Iterator; import java.util.LinkedHashMap; @@ -15,7 +15,7 @@ import de.uka.ilkd.key.prover.impl.SingleRuleApplicationInfo; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.settings.StrategySettings; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/strategy/IBreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/strategy/IBreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java index 59d9346631d..0c8077e368f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/strategy/IBreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Set; import de.uka.ilkd.key.prover.StopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; /** * Defines the basic functionality of an {@link StopCondition} which stops applying rules when at diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SimplifyTermStrategy.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SimplifyTermStrategy.java index a6594e4e05b..b20fe6c3bbb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SimplifyTermStrategy.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Proof; @@ -11,7 +11,7 @@ import de.uka.ilkd.key.strategy.*; import de.uka.ilkd.key.strategy.definition.StrategySettingsDefinition; import de.uka.ilkd.key.strategy.feature.Feature; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java index dd1ef9e6088..661c7329e42 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java index dc3d06162e6..89054f1fc96 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionBreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionBreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java index aac43f10d51..e6e43173fbf 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionBreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.Collections; import java.util.HashSet; @@ -14,8 +14,7 @@ import de.uka.ilkd.key.proof.NodeInfo; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.strategy.IBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; /** * An {@link IBreakpointStopCondition} which can be used during symbolic execution. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooser.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooser.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooser.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooser.java index 0d236e76049..7f9b272d2fd 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooser.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooser.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.LinkedHashSet; import java.util.Set; @@ -13,7 +13,7 @@ import de.uka.ilkd.key.prover.StopCondition; import de.uka.ilkd.key.prover.impl.DepthFirstGoalChooser; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooserBuilder.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooserBuilder.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java index bd766f2bda2..2f902706918 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooserBuilder.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import de.uka.ilkd.key.prover.GoalChooser; import de.uka.ilkd.key.prover.GoalChooserBuilder; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionStrategy.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionStrategy.java index 58082c12603..9cc544ae0da 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionStrategy.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy; +package de.uka.ilkd.key.symbex.strategy; import java.util.ArrayList; @@ -22,9 +22,9 @@ import de.uka.ilkd.key.strategy.feature.instantiator.OneOfCP; import de.uka.ilkd.key.strategy.termProjection.TermBuffer; import de.uka.ilkd.key.strategy.termfeature.ContainsLabelFeature; -import de.uka.ilkd.key.symbolic_execution.rule.ModalitySideProofRule; -import de.uka.ilkd.key.symbolic_execution.rule.QuerySideProofRule; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.rule.ModalitySideProofRule; +import de.uka.ilkd.key.symbex.rule.QuerySideProofRule; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java index febfffe47cb..1422da59824 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractConditionalBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractConditionalBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java index d997436ad8e..9ff32ce0664 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractConditionalBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.util.*; import java.util.Map.Entry; @@ -29,8 +29,8 @@ import de.uka.ilkd.key.speclang.njml.JmlIO; import de.uka.ilkd.key.speclang.translation.SLTranslationException; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.SyntaxElement; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractHitCountBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractHitCountBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java index 9dbccd8c745..8a7a5d7a054 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractHitCountBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.util.HashMap; import java.util.Map; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/ExceptionBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/ExceptionBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java index bb81a7f3e64..f9349a438fe 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/ExceptionBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.util.HashSet; import java.util.Set; @@ -14,7 +14,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/FieldWatchpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/FieldWatchpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java index d1082bca4c9..b2c376eeff1 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/FieldWatchpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import de.uka.ilkd.key.java.NonTerminalProgramElement; import de.uka.ilkd.key.java.SourceElement; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/IBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/IBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/IBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/IBreakpoint.java index 3c1c27d359f..667d41c359b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/IBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/IBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Goal; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/KeYWatchpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/KeYWatchpoint.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/KeYWatchpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/KeYWatchpoint.java index 1a9e2afa618..07033f95d5a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/KeYWatchpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/KeYWatchpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import de.uka.ilkd.key.java.JavaTools; import de.uka.ilkd.key.java.Position; @@ -23,8 +23,8 @@ import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.speclang.translation.SLTranslationException; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/LineBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/LineBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java index 2006e2c34b8..94789726195 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/LineBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.nio.file.Paths; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/MethodBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/MethodBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java index d49545137a3..671d4bd5dad 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/MethodBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.util.Objects; @@ -20,7 +20,7 @@ import de.uka.ilkd.key.speclang.Contract; import de.uka.ilkd.key.speclang.FunctionalOperationContract; import de.uka.ilkd.key.speclang.translation.SLTranslationException; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; public class MethodBreakpoint extends AbstractConditionalBreakpoint { /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java index 18787225830..a953a0da4b6 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; +package de.uka.ilkd.key.symbex.strategy.breakpoint; import java.util.HashSet; import java.util.Set; @@ -16,7 +16,7 @@ import de.uka.ilkd.key.proof.NodeInfo; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/DefaultEntry.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/DefaultEntry.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java index 4824f61d591..2e8c8419a2e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/DefaultEntry.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import java.util.Map.Entry; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/EqualsHashCodeResetter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/EqualsHashCodeResetter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java index 2cf2b632cd3..a667e56735c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/EqualsHashCodeResetter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import java.util.Collection; import java.util.Map; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SideProofStore.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SideProofStore.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java index 5e068334a5c..18c263bb693 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SideProofStore.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -12,8 +12,8 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; import de.uka.ilkd.key.proof.Proof; -import de.uka.ilkd.key.symbolic_execution.util.event.ISideProofStoreListener; -import de.uka.ilkd.key.symbolic_execution.util.event.SideProofStoreEvent; +import de.uka.ilkd.key.symbex.util.event.ISideProofStoreListener; +import de.uka.ilkd.key.symbex.util.event.SideProofStoreEvent; import de.uka.ilkd.key.util.ProofUserManager; import org.key_project.util.java.CollectionUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionEnvironment.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionEnvironment.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java index 3111f1628df..ccbec883861 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionEnvironment.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import de.uka.ilkd.key.control.KeYEnvironment; import de.uka.ilkd.key.control.UserInterfaceControl; @@ -9,10 +9,10 @@ import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.settings.ProofSettings; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionGoalChooser; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionGoalChooser; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; /** * Instances of this class are used to collect and access all relevant information for symbolic diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionSideProofUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionSideProofUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionSideProofUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionSideProofUtil.java index 079bf2aed6b..bb44f7aed22 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionSideProofUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionSideProofUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import java.util.*; @@ -30,9 +30,9 @@ import de.uka.ilkd.key.rule.tacletbuilder.TacletBuilder; import de.uka.ilkd.key.settings.ProofSettings; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.profile.SimplifyTermProfile; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; -import de.uka.ilkd.key.symbolic_execution.rule.ResultsAndCondition; +import de.uka.ilkd.key.symbex.profile.SimplifyTermProfile; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.rule.ResultsAndCondition; import de.uka.ilkd.key.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java index b61f4959c11..10b96d999d7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util; +package de.uka.ilkd.key.symbex.util; import java.util.*; @@ -50,15 +50,15 @@ import de.uka.ilkd.key.strategy.JavaCardDLStrategyFactory; import de.uka.ilkd.key.strategy.Strategy; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.ExecutionVariableExtractor; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionElement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.ExecutionVariableExtractor; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionElement; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.model.impl.ExecutionConstraint; +import de.uka.ilkd.key.symbex.model.impl.ExecutionVariable; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; import de.uka.ilkd.key.util.KeYTypeUtil; import de.uka.ilkd.key.util.MiscTools; @@ -4184,7 +4184,7 @@ public static boolean lazyComputeIsExceptionalTermination(Node node, /** * Computes the exception {@link Sort} lazily when - * {@link de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionTermination#getExceptionSort()} + * {@link de.uka.ilkd.key.symbex.model.impl.ExecutionTermination#getExceptionSort()} * is called the * first time. * diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/ISideProofStoreListener.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java similarity index 78% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/ISideProofStoreListener.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java index e49771dfb22..b8c3ac038a5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/ISideProofStoreListener.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util.event; +package de.uka.ilkd.key.symbex.util.event; import java.util.EventListener; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore.Entry; +import de.uka.ilkd.key.symbex.util.SideProofStore; +import de.uka.ilkd.key.symbex.util.SideProofStore.Entry; /** * Observes changes on a {@link SideProofStore}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/SideProofStoreEvent.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/SideProofStoreEvent.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java index d235c5f6fa7..bf5a43d7919 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/SideProofStoreEvent.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.util.event; +package de.uka.ilkd.key.symbex.util.event; import java.util.EventObject; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore.Entry; +import de.uka.ilkd.key.symbex.util.SideProofStore; +import de.uka.ilkd.key.symbex.util.SideProofStore.Entry; /** * An event thrown by a {@link SideProofStore} and observed via an {@link ISideProofStoreListener}. diff --git a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver index c124229b12d..720aef44e5f 100644 --- a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver +++ b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver @@ -1 +1 @@ -de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfileDefaultProfileResolver \ No newline at end of file +de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfileDefaultProfileResolver \ No newline at end of file diff --git a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.POExtension b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.POExtension index 1a920fad6fa..94d466013b1 100644 --- a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.POExtension +++ b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.POExtension @@ -2,4 +2,4 @@ # Available POExtensions # -de.uka.ilkd.key.symbolic_execution.po.TruthValuePOExtension \ No newline at end of file +de.uka.ilkd.key.symbex.po.TruthValuePOExtension \ No newline at end of file diff --git a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.loader.ProofObligationLoader b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.loader.ProofObligationLoader index 3abacee7b1f..8ab9367653b 100644 --- a/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.loader.ProofObligationLoader +++ b/key.core.symbolic_execution/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.loader.ProofObligationLoader @@ -1,2 +1,2 @@ -de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPOLoader -de.uka.ilkd.key.symbolic_execution.po.ProgramMethodSubsetPOLoader \ No newline at end of file +de.uka.ilkd.key.symbex.po.ProgramMethodPOLoader +de.uka.ilkd.key.symbex.po.ProgramMethodSubsetPOLoader \ No newline at end of file diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/AbstractSymbolicExecutionTestCase.java similarity index 99% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/AbstractSymbolicExecutionTestCase.java index 95c6da8fe33..a8c1edb2347 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/AbstractSymbolicExecutionTestCase.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.File; import java.io.IOException; @@ -20,7 +20,6 @@ import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; -import de.uka.ilkd.key.proof.TermProgramVariableCollectorKeepUpdatesForBreakpointconditions; import de.uka.ilkd.key.proof.init.FunctionalOperationContractPO; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.init.ProofOblInput; @@ -30,18 +29,19 @@ import de.uka.ilkd.key.settings.ProofSettings; import de.uka.ilkd.key.speclang.Contract; import de.uka.ilkd.key.speclang.FunctionalOperationContract; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeWriter; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder.SymbolicExecutionCompletions; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPO; -import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodSubsetPO; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; -import de.uka.ilkd.key.symbolic_execution.strategy.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator; +import de.uka.ilkd.key.symbex.ExecutionNodeReader; +import de.uka.ilkd.key.symbex.ExecutionNodeWriter; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder.SymbolicExecutionCompletions; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.po.ProgramMethodPO; +import de.uka.ilkd.key.symbex.po.ProgramMethodSubsetPO; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.proof.TermProgramVariableCollectorKeepUpdatesForBreakpointconditions; +import de.uka.ilkd.key.symbex.strategy.*; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.HelperClassForTests; import de.uka.ilkd.key.util.KeYConstants; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestConditionalVariables.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestConditionalVariables.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestConditionalVariables.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestConditionalVariables.java index 1d7f7eeea4c..a8a740c1115 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestConditionalVariables.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestConditionalVariables.java @@ -1,17 +1,17 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionBaseMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStart; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.ExecutionNodeReader; +import de.uka.ilkd.key.symbex.model.IExecutionBaseMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionStart; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodePreorderIterator.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodePreorderIterator.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodePreorderIterator.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodePreorderIterator.java index a7747f1494c..97f9e4c950b 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodePreorderIterator.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodePreorderIterator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.util.LinkedList; import java.util.List; @@ -12,13 +12,13 @@ import de.uka.ilkd.key.proof.init.AbstractProfile; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader.AbstractKeYlessExecutionNode; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader.KeYlessStart; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader.KeYlessStatement; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionStart; -import de.uka.ilkd.key.symbolic_execution.model.impl.TreeSettings; +import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator; +import de.uka.ilkd.key.symbex.ExecutionNodeReader.AbstractKeYlessExecutionNode; +import de.uka.ilkd.key.symbex.ExecutionNodeReader.KeYlessStart; +import de.uka.ilkd.key.symbex.ExecutionNodeReader.KeYlessStatement; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.impl.ExecutionStart; +import de.uka.ilkd.key.symbex.model.impl.TreeSettings; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodeWriterAndReader.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodeWriterAndReader.java similarity index 96% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodeWriterAndReader.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodeWriterAndReader.java index 088d626404d..0bd36a42682 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionNodeWriterAndReader.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionNodeWriterAndReader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -11,12 +11,12 @@ import javax.xml.parsers.ParserConfigurationException; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeReader.*; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeWriter; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionConstraint; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionTermination.TerminationKind; +import de.uka.ilkd.key.symbex.ExecutionNodeReader; +import de.uka.ilkd.key.symbex.ExecutionNodeReader.*; +import de.uka.ilkd.key.symbex.ExecutionNodeWriter; +import de.uka.ilkd.key.symbex.model.IExecutionConstraint; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionTermination.TerminationKind; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionVariableExtractor.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionVariableExtractor.java similarity index 98% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionVariableExtractor.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionVariableExtractor.java index e1f18b37049..61ac29ff4c0 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestExecutionVariableExtractor.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestExecutionVariableExtractor.java @@ -1,9 +1,9 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; -import de.uka.ilkd.key.symbolic_execution.ExecutionVariableExtractor; +import de.uka.ilkd.key.symbex.ExecutionVariableExtractor; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestParallelSiteProofs.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestParallelSiteProofs.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestParallelSiteProofs.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestParallelSiteProofs.java index da4d5ca3677..6e8f5aaefb1 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestParallelSiteProofs.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestParallelSiteProofs.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.IOException; import java.util.LinkedList; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionVariable; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicExecutionTreeBuilder.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicExecutionTreeBuilder.java similarity index 99% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicExecutionTreeBuilder.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicExecutionTreeBuilder.java index ef4d66447d4..2f3a7a6a59c 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicExecutionTreeBuilder.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicExecutionTreeBuilder.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.File; import java.util.Iterator; @@ -12,12 +12,12 @@ import de.uka.ilkd.key.java.PositionInfo; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.init.JavaProfile; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder.SymbolicExecutionCompletions; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionGoalChooser; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder.SymbolicExecutionCompletions; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.strategy.ExecutedSymbolicExecutionTreeNodesStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionGoalChooser; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.*; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutExtractor.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutExtractor.java similarity index 98% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutExtractor.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutExtractor.java index 992296eb0f4..60fea76e356 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutExtractor.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutExtractor.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.File; import java.io.IOException; @@ -11,14 +11,14 @@ import java.util.Map; import de.uka.ilkd.key.control.DefaultUserInterfaceControl; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutExtractor; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutReader; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutWriter; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionMethodReturn; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionStatement; -import de.uka.ilkd.key.symbolic_execution.object_model.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.SymbolicLayoutExtractor; +import de.uka.ilkd.key.symbex.SymbolicLayoutReader; +import de.uka.ilkd.key.symbex.SymbolicLayoutWriter; +import de.uka.ilkd.key.symbex.model.IExecutionMethodReturn; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.IExecutionStatement; +import de.uka.ilkd.key.symbex.object_model.*; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.key_project.util.collection.ImmutableList; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutWriterAndReader.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutWriterAndReader.java similarity index 91% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutWriterAndReader.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutWriterAndReader.java index a499a16f153..80d0bd9ce94 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestSymbolicLayoutWriterAndReader.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestSymbolicLayoutWriterAndReader.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,11 +10,11 @@ import java.nio.charset.Charset; import javax.xml.parsers.ParserConfigurationException; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeWriter; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutReader; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutReader.*; -import de.uka.ilkd.key.symbolic_execution.SymbolicLayoutWriter; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicLayout; +import de.uka.ilkd.key.symbex.ExecutionNodeWriter; +import de.uka.ilkd.key.symbex.SymbolicLayoutReader; +import de.uka.ilkd.key.symbex.SymbolicLayoutReader.*; +import de.uka.ilkd.key.symbex.SymbolicLayoutWriter; +import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueEvaluationUtil.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueEvaluationUtil.java similarity index 99% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueEvaluationUtil.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueEvaluationUtil.java index e02a1979ce7..88f20eb71e3 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueEvaluationUtil.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueEvaluationUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; import java.util.*; import java.util.Map.Entry; @@ -9,14 +9,14 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.logic.label.FormulaTermLabel; import de.uka.ilkd.key.proof.Node; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodePreorderIterator; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil.BranchResult; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil.MultiEvaluationResult; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil.TruthValue; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil.TruthValueTracingResult; -import de.uka.ilkd.key.symbolic_execution.model.*; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.ExecutionNodePreorderIterator; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil.BranchResult; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil.MultiEvaluationResult; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil.TruthValue; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil.TruthValueTracingResult; +import de.uka.ilkd.key.symbex.model.*; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.*; import org.slf4j.Logger; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueValue.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueValue.java similarity index 99% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueValue.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueValue.java index 3c1f5472d6d..7dbd4fe93da 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/TestTruthValueValue.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/TestTruthValueValue.java @@ -1,9 +1,9 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase; +package de.uka.ilkd.key.symbex.testcase; -import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil.TruthValue; +import de.uka.ilkd.key.symbex.TruthValueTracingUtil.TruthValue; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestFunctionalOperationContractPO.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestFunctionalOperationContractPO.java similarity index 93% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestFunctionalOperationContractPO.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestFunctionalOperationContractPO.java index ef89d9686cb..cea795763b6 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestFunctionalOperationContractPO.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestFunctionalOperationContractPO.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.po; +package de.uka.ilkd.key.symbex.testcase.po; import java.io.IOException; import java.util.Map; @@ -11,8 +11,8 @@ import de.uka.ilkd.key.proof.init.FunctionalOperationContractPO; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodPO.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodPO.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodPO.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodPO.java index a8e1fb29255..5364d89be0c 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodPO.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodPO.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.po; +package de.uka.ilkd.key.symbex.testcase.po; import java.io.IOException; import java.util.Map; @@ -10,9 +10,9 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodPO; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.po.ProgramMethodPO; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodSubsetPO.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodSubsetPO.java similarity index 97% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodSubsetPO.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodSubsetPO.java index 09560f1a7a5..9acf337c11c 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/po/TestProgramMethodSubsetPO.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/po/TestProgramMethodSubsetPO.java @@ -1,13 +1,13 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.po; +package de.uka.ilkd.key.symbex.testcase.po; import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.java.Position; -import de.uka.ilkd.key.symbolic_execution.po.ProgramMethodSubsetPO; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.po.ProgramMethodSubsetPO; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/slicing/TestThinBackwardSlicer.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/slicing/TestThinBackwardSlicer.java similarity index 97% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/slicing/TestThinBackwardSlicer.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/slicing/TestThinBackwardSlicer.java index 2180b40ca21..f01c4a584bf 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/slicing/TestThinBackwardSlicer.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/slicing/TestThinBackwardSlicer.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.slicing; +package de.uka.ilkd.key.symbex.testcase.slicing; import java.io.File; @@ -15,15 +15,15 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofVisitor; -import de.uka.ilkd.key.symbolic_execution.ExecutionNodeSymbolicLayoutExtractor; -import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; -import de.uka.ilkd.key.symbolic_execution.model.impl.AbstractExecutionNode; -import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; -import de.uka.ilkd.key.symbolic_execution.slicing.ThinBackwardSlicer; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.ExecutionNodeSymbolicLayoutExtractor; +import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbex.model.impl.AbstractExecutionNode; +import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbex.slicing.ThinBackwardSlicer; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableArray; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java similarity index 90% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java index a69baf8e1d1..c942473ed2e 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionCaughtOrUncaught.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java similarity index 89% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java index 04ba37021b6..1c930e60f8f 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithHitCount.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java similarity index 91% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java index 33b1d899f54..3459b6271b0 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestExceptionBreakpointStopConditionWithSubclasses.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; import de.uka.ilkd.key.strategy.StrategyProperties; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.SymbolicExecutionExceptionBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java similarity index 92% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java index 07fbb61c337..dc44faf436d 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestJavaWatchpointStopConditionWithHitCount.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.java.abstraction.KeYJavaType; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.FieldWatchpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.FieldWatchpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java similarity index 90% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java index a2432e07840..0c4c32835b2 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnSatisfiable.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.java.abstraction.KeYJavaType; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.KeYWatchpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.KeYWatchpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java similarity index 89% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java index f2f7ce598ae..d39a4a888d9 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointGlobalVariablesOnTrueWithHitCount.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.java.abstraction.KeYJavaType; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.KeYWatchpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.KeYWatchpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java similarity index 90% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java index b3dc6b3c003..2516aa02a6d 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestKeYWatchpointMethodsOnSatisfiable.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -12,11 +12,11 @@ import de.uka.ilkd.key.java.abstraction.KeYJavaType; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.KeYWatchpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.KeYWatchpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java index bfc72c9575a..386671068da 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithConditions.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.LineBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.LineBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java similarity index 92% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java index 1093ba6d0e4..038927abea8 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithHitCount.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.LineBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.LineBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java similarity index 90% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java index 5a2a21a1354..bb4d792e8ca 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestLineBreakpointStopConditionSimpleWithLoopInvariant.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.LineBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.LineBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithConditions.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithConditions.java similarity index 95% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithConditions.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithConditions.java index 30e77e394ac..9f2959af8f9 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithConditions.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithConditions.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.MethodBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.MethodBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithHitCount.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithHitCount.java similarity index 92% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithHitCount.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithHitCount.java index cd36f2a059d..c1606d31d84 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestMethodBreakpointWithHitCount.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestMethodBreakpointWithHitCount.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -11,11 +11,11 @@ import de.uka.ilkd.key.logic.op.IProgramMethod; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionBreakpointStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.MethodBreakpoint; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionBreakpointStopCondition; +import de.uka.ilkd.key.symbex.strategy.breakpoint.MethodBreakpoint; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java similarity index 91% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java index d0b195d6483..379cade91b8 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepOverSymbolicExecutionTreeNodesStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -10,11 +10,11 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.StepOverSymbolicExecutionTreeNodesStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionGoalChooser; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.StepOverSymbolicExecutionTreeNodesStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionGoalChooser; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java similarity index 91% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java index e9423b32227..0ae268f10d6 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestStepReturnSymbolicExecutionTreeNodesStopCondition.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; import java.io.IOException; import java.util.Map; @@ -10,11 +10,11 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.io.ProblemLoaderException; -import de.uka.ilkd.key.symbolic_execution.strategy.CompoundStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.StepReturnSymbolicExecutionTreeNodesStopCondition; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionGoalChooser; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionEnvironment; +import de.uka.ilkd.key.symbex.strategy.CompoundStopCondition; +import de.uka.ilkd.key.symbex.strategy.StepReturnSymbolicExecutionTreeNodesStopCondition; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionGoalChooser; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionEnvironment; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestSymbolicExecutionStrategy.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestSymbolicExecutionStrategy.java similarity index 98% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestSymbolicExecutionStrategy.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestSymbolicExecutionStrategy.java index a664b69c943..76ea00ed5c9 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/strategy/TestSymbolicExecutionStrategy.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/strategy/TestSymbolicExecutionStrategy.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.strategy; +package de.uka.ilkd.key.symbex.testcase.strategy; -import de.uka.ilkd.key.symbolic_execution.strategy.SymbolicExecutionStrategy; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestDefaultEntry.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestDefaultEntry.java similarity index 87% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestDefaultEntry.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestDefaultEntry.java index 7f58003e0de..0a9245ba191 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestDefaultEntry.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestDefaultEntry.java @@ -1,11 +1,11 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.util; +package de.uka.ilkd.key.symbex.testcase.util; import java.util.Map.Entry; -import de.uka.ilkd.key.symbolic_execution.util.DefaultEntry; +import de.uka.ilkd.key.symbex.util.DefaultEntry; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestEqualsHashCodeResetter.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestEqualsHashCodeResetter.java similarity index 98% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestEqualsHashCodeResetter.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestEqualsHashCodeResetter.java index 8c541df56df..ea30015bd62 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestEqualsHashCodeResetter.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestEqualsHashCodeResetter.java @@ -1,14 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.util; +package de.uka.ilkd.key.symbex.testcase.util; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import de.uka.ilkd.key.symbolic_execution.util.EqualsHashCodeResetter; +import de.uka.ilkd.key.symbex.util.EqualsHashCodeResetter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSideProofStore.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSideProofStore.java similarity index 97% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSideProofStore.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSideProofStore.java index 7aff4b80205..e5502c8bf29 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSideProofStore.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSideProofStore.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.util; +package de.uka.ilkd.key.symbex.testcase.util; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -16,10 +16,10 @@ import de.uka.ilkd.key.proof.init.AbstractProfile; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.mgt.ProofEnvironment; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore; -import de.uka.ilkd.key.symbolic_execution.util.SideProofStore.Entry; -import de.uka.ilkd.key.symbolic_execution.util.event.ISideProofStoreListener; -import de.uka.ilkd.key.symbolic_execution.util.event.SideProofStoreEvent; +import de.uka.ilkd.key.symbex.util.SideProofStore; +import de.uka.ilkd.key.symbex.util.SideProofStore.Entry; +import de.uka.ilkd.key.symbex.util.event.ISideProofStoreListener; +import de.uka.ilkd.key.symbex.util.event.SideProofStoreEvent; import de.uka.ilkd.key.util.ProofUserManager; import org.key_project.util.collection.Pair; diff --git a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSymbolicExecutionUtil.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSymbolicExecutionUtil.java similarity index 97% rename from key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSymbolicExecutionUtil.java rename to key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSymbolicExecutionUtil.java index c445ff7b364..cb8ad610161 100644 --- a/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/util/TestSymbolicExecutionUtil.java +++ b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbex/testcase/util/TestSymbolicExecutionUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.symbolic_execution.testcase.util; +package de.uka.ilkd.key.symbex.testcase.util; import java.io.File; import java.util.HashMap; @@ -16,8 +16,8 @@ import de.uka.ilkd.key.logic.op.LogicVariable; import de.uka.ilkd.key.proof.io.ProblemLoaderException; import de.uka.ilkd.key.settings.ProofSettings; -import de.uka.ilkd.key.symbolic_execution.testcase.AbstractSymbolicExecutionTestCase; -import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.testcase.AbstractSymbolicExecutionTestCase; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import org.key_project.logic.Name; import org.key_project.logic.sort.Sort; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/ModelGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/ModelGenerator.java index 0b66418b71b..83f710ef535 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/ModelGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/ModelGenerator.java @@ -21,12 +21,12 @@ import de.uka.ilkd.key.settings.ProofDependentSMTSettings; import de.uka.ilkd.key.settings.ProofIndependentSMTSettings; import de.uka.ilkd.key.settings.ProofIndependentSettings; -import de.uka.ilkd.key.settings.TestGenerationSettings; import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.lang.SMTSort; import de.uka.ilkd.key.smt.model.Model; import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; +import de.uka.ilkd.key.testgen.settings.TestGenerationSettings; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/TestCaseGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/TestCaseGenerator.java index 3b0112a4f05..38a18a6fe24 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/TestCaseGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/TestCaseGenerator.java @@ -20,15 +20,15 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.settings.ProofIndependentSettings; -import de.uka.ilkd.key.settings.TestGenerationSettings; import de.uka.ilkd.key.smt.SMTSolver; import de.uka.ilkd.key.smt.model.Heap; import de.uka.ilkd.key.smt.model.Model; import de.uka.ilkd.key.smt.model.ObjectVal; -import de.uka.ilkd.key.smt.testgen.TestGenerationLog; import de.uka.ilkd.key.testgen.oracle.OracleGenerator; import de.uka.ilkd.key.testgen.oracle.OracleMethod; import de.uka.ilkd.key.testgen.oracle.OracleMethodCall; +import de.uka.ilkd.key.testgen.settings.TestGenerationSettings; +import de.uka.ilkd.key.testgen.smt.testgen.TestGenerationLog; import de.uka.ilkd.key.util.KeYConstants; import org.key_project.logic.op.Function; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/macros/SemanticsBlastingMacro.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/SemanticsBlastingMacro.java similarity index 98% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/macros/SemanticsBlastingMacro.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/SemanticsBlastingMacro.java index 30e2db9dc14..47e751e406a 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/macros/SemanticsBlastingMacro.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/SemanticsBlastingMacro.java @@ -1,11 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.macros; +package de.uka.ilkd.key.testgen.macros; import java.util.HashSet; import java.util.Set; +import de.uka.ilkd.key.macros.AbstractBlastingMacro; import de.uka.ilkd.key.proof.rulefilter.RuleFilter; import de.uka.ilkd.key.rule.Rule; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/macros/TestGenMacro.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java similarity index 94% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/macros/TestGenMacro.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java index 8a5da4014c5..866454c1782 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/macros/TestGenMacro.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java @@ -1,22 +1,25 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.macros; +package de.uka.ilkd.key.testgen.macros; import java.util.HashSet; import java.util.Set; import de.uka.ilkd.key.logic.PosInOccurrence; +import de.uka.ilkd.key.macros.FilterStrategy; +import de.uka.ilkd.key.macros.ModalityCache; +import de.uka.ilkd.key.macros.StrategyProofMacro; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.settings.TestGenerationSettings; import de.uka.ilkd.key.strategy.NumberRuleAppCost; import de.uka.ilkd.key.strategy.RuleAppCost; import de.uka.ilkd.key.strategy.Strategy; import de.uka.ilkd.key.strategy.feature.MutableState; +import de.uka.ilkd.key.testgen.settings.TestGenerationSettings; import org.key_project.logic.Name; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/settings/TestGenerationSettings.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java similarity index 97% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/settings/TestGenerationSettings.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java index 00f24ad3c1f..5c7d1c86788 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/settings/TestGenerationSettings.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java @@ -1,11 +1,16 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.settings; +package de.uka.ilkd.key.testgen.settings; import java.io.File; import java.util.Properties; +import de.uka.ilkd.key.settings.AbstractSettings; +import de.uka.ilkd.key.settings.Configuration; +import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.settings.SettingsConverter; + import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractCounterExampleGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java similarity index 98% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractCounterExampleGenerator.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java index 61546a95392..bb4d41100dd 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractCounterExampleGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.counterexample; +package de.uka.ilkd.key.testgen.smt.counterexample; import java.util.LinkedList; import java.util.List; @@ -9,7 +9,6 @@ import de.uka.ilkd.key.control.UserInterfaceControl; import de.uka.ilkd.key.logic.Sequent; import de.uka.ilkd.key.macros.ProofMacroFinishedInfo; -import de.uka.ilkd.key.macros.SemanticsBlastingMacro; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.prover.ProverTaskListener; @@ -21,6 +20,7 @@ import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; +import de.uka.ilkd.key.testgen.macros.SemanticsBlastingMacro; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractSideProofCounterExampleGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractSideProofCounterExampleGenerator.java similarity index 96% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractSideProofCounterExampleGenerator.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractSideProofCounterExampleGenerator.java index 4345c938cb4..1b824ad3067 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/counterexample/AbstractSideProofCounterExampleGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractSideProofCounterExampleGenerator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.counterexample; +package de.uka.ilkd.key.testgen.smt.counterexample; import de.uka.ilkd.key.control.UserInterfaceControl; import de.uka.ilkd.key.logic.Choice; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/AbstractTestGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java similarity index 98% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/AbstractTestGenerator.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java index 2fbfc7b1ce4..42feebac6e8 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/AbstractTestGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.testgen; +package de.uka.ilkd.key.testgen.smt.testgen; import java.io.IOException; import java.util.*; @@ -15,8 +15,6 @@ import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.UpdateApplication; import de.uka.ilkd.key.macros.ProofMacroFinishedInfo; -import de.uka.ilkd.key.macros.SemanticsBlastingMacro; -import de.uka.ilkd.key.macros.TestGenMacro; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; @@ -33,12 +31,14 @@ import de.uka.ilkd.key.settings.ProofDependentSMTSettings; import de.uka.ilkd.key.settings.ProofIndependentSMTSettings; import de.uka.ilkd.key.settings.ProofIndependentSettings; -import de.uka.ilkd.key.settings.TestGenerationSettings; import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.model.Model; import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; import de.uka.ilkd.key.testgen.TestCaseGenerator; +import de.uka.ilkd.key.testgen.macros.SemanticsBlastingMacro; +import de.uka.ilkd.key.testgen.macros.TestGenMacro; +import de.uka.ilkd.key.testgen.settings.TestGenerationSettings; import de.uka.ilkd.key.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/MemoryTestGenerationLog.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/MemoryTestGenerationLog.java similarity index 96% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/MemoryTestGenerationLog.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/MemoryTestGenerationLog.java index 9edcd12b5da..26ec40fb318 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/MemoryTestGenerationLog.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/MemoryTestGenerationLog.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.testgen; +package de.uka.ilkd.key.testgen.smt.testgen; import de.uka.ilkd.key.testgen.TestCaseGenerator; diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/StopRequest.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/StopRequest.java similarity index 83% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/StopRequest.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/StopRequest.java index 1907bae9a00..cafa74721ee 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/StopRequest.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/StopRequest.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.testgen; +package de.uka.ilkd.key.testgen.smt.testgen; public interface StopRequest { boolean shouldStop(); diff --git a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/TestGenerationLog.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/TestGenerationLog.java similarity index 88% rename from key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/TestGenerationLog.java rename to key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/TestGenerationLog.java index 76a3881c74d..589c38e881e 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/smt/testgen/TestGenerationLog.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/TestGenerationLog.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.smt.testgen; +package de.uka.ilkd.key.testgen.smt.testgen; public interface TestGenerationLog { void writeln(String string); diff --git a/key.core.testgen/src/main/resources/services/de.uka.ilkd.key.macros.ProofMacro b/key.core.testgen/src/main/resources/services/de.uka.ilkd.key.macros.ProofMacro index 4480e78c800..0eb775fb6b3 100644 --- a/key.core.testgen/src/main/resources/services/de.uka.ilkd.key.macros.ProofMacro +++ b/key.core.testgen/src/main/resources/services/de.uka.ilkd.key.macros.ProofMacro @@ -2,4 +2,4 @@ # Macros to appear in the context menu # -de.uka.ilkd.key.macros.TestGenMacro +de.uka.ilkd.key.testgen.macros.TestGenMacro diff --git a/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/ce/TestCE.java b/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/ce/TestCE.java index 4c6b368f59f..3290c5385d3 100644 --- a/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/ce/TestCE.java +++ b/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/ce/TestCE.java @@ -8,7 +8,6 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; import de.uka.ilkd.key.macros.FinishSymbolicExecutionMacro; -import de.uka.ilkd.key.macros.SemanticsBlastingMacro; import de.uka.ilkd.key.macros.TryCloseMacro; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; @@ -16,6 +15,7 @@ import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; import de.uka.ilkd.key.suite.util.HelperClassForTestgenTests; +import de.uka.ilkd.key.testgen.macros.SemanticsBlastingMacro; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/testgen/TestTestgen.java b/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/testgen/TestTestgen.java index 210a8b84db9..9e6ec93974c 100644 --- a/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/testgen/TestTestgen.java +++ b/key.core.testgen/src/test/java/de/uka/ilkd/key/testcase/smt/testgen/TestTestgen.java @@ -7,12 +7,12 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; -import de.uka.ilkd.key.macros.TestGenMacro; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; import de.uka.ilkd.key.suite.util.HelperClassForTestgenTests; import de.uka.ilkd.key.testcase.smt.ce.TestCommons; +import de.uka.ilkd.key.testgen.macros.TestGenMacro; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/key.core/src/main/java/de/uka/ilkd/key/axiom_abstraction/predicateabstraction/AbstractionPredicate.java b/key.core/src/main/java/de/uka/ilkd/key/axiom_abstraction/predicateabstraction/AbstractionPredicate.java index 1ad934571b8..12a05465eeb 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/axiom_abstraction/predicateabstraction/AbstractionPredicate.java +++ b/key.core/src/main/java/de/uka/ilkd/key/axiom_abstraction/predicateabstraction/AbstractionPredicate.java @@ -8,7 +8,6 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.naming.NameAlreadyBoundException; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.*; diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/ConvertException.java b/key.core/src/main/java/de/uka/ilkd/key/java/ConvertException.java index 9410674d641..10637c1f206 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/ConvertException.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/ConvertException.java @@ -31,19 +31,4 @@ public ConvertException(String errmsg, Throwable cause) { super(errmsg, cause); } - public recoder.parser.ParseException parseException() { - if (getCause() instanceof recoder.parser.ParseException) { - return (recoder.parser.ParseException) getCause(); - } else { - return null; - } - } - - public de.uka.ilkd.key.parser.proofjava.ParseException proofJavaException() { - if (getCause() instanceof de.uka.ilkd.key.parser.proofjava.ParseException) { - return (de.uka.ilkd.key.parser.proofjava.ParseException) getCause(); - } else { - return null; - } - } } diff --git a/key.core/src/main/java/recoder/service/KeYCrossReferenceSourceInfo.java b/key.core/src/main/java/de/uka/ilkd/key/java/KeYCrossReferenceSourceInfo.java similarity index 99% rename from key.core/src/main/java/recoder/service/KeYCrossReferenceSourceInfo.java rename to key.core/src/main/java/de/uka/ilkd/key/java/KeYCrossReferenceSourceInfo.java index fa16983f5ea..bbe2ae5ac56 100644 --- a/key.core/src/main/java/recoder/service/KeYCrossReferenceSourceInfo.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/KeYCrossReferenceSourceInfo.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package recoder.service; +package de.uka.ilkd.key.java; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -64,6 +64,7 @@ import recoder.java.reference.VariableReference; import recoder.java.statement.Case; import recoder.list.generic.ASTList; +import recoder.service.*; public class KeYCrossReferenceSourceInfo extends DefaultCrossReferenceSourceInfo { @@ -224,7 +225,7 @@ public void modelChanged(ChangeHistoryEvent event) { } } - void registerSubtype(ClassType c1, ClassType c2) { + protected void registerSubtype(ClassType c1, ClassType c2) { try { super.registerSubtype(c1, c2); diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/Recoder2KeY.java b/key.core/src/main/java/de/uka/ilkd/key/java/Recoder2KeY.java index 3f0335fa237..12c5e917607 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/Recoder2KeY.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/Recoder2KeY.java @@ -51,7 +51,6 @@ import recoder.list.generic.ASTList; import recoder.service.ChangeHistory; import recoder.service.CrossReferenceSourceInfo; -import recoder.service.KeYCrossReferenceSourceInfo; import recoder.service.UnresolvedReferenceException; /** diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/ClassFileDeclarationManager.java b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/ClassFileDeclarationManager.java index a583b6631ce..e3a95976293 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/ClassFileDeclarationManager.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/ClassFileDeclarationManager.java @@ -15,6 +15,7 @@ import java.util.Map; import de.uka.ilkd.key.java.ConvertException; +import de.uka.ilkd.key.java.KeYCrossReferenceSourceInfo; import de.uka.ilkd.key.util.DirectoryFileCollection; import de.uka.ilkd.key.util.FileCollection; import de.uka.ilkd.key.util.FileCollection.Walker; @@ -29,7 +30,6 @@ import recoder.io.DataLocation; import recoder.java.CompilationUnit; import recoder.java.JavaProgramFactory; -import recoder.service.KeYCrossReferenceSourceInfo; /** * This class provides an infrastructure to read in multiple class files and to manufacture diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/KeYCrossReferenceServiceConfiguration.java b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/KeYCrossReferenceServiceConfiguration.java index 372a2ae8edd..06be748e251 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/KeYCrossReferenceServiceConfiguration.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/KeYCrossReferenceServiceConfiguration.java @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.java.recoderext; +import de.uka.ilkd.key.java.KeYCrossReferenceSourceInfo; import de.uka.ilkd.key.java.KeYProgModelInfo; import de.uka.ilkd.key.util.KeYRecoderExcHandler; import recoder.CrossReferenceServiceConfiguration; import recoder.ProgramFactory; import recoder.io.SourceFileRepository; -import recoder.service.KeYCrossReferenceSourceInfo; import recoder.service.NameInfo; import recoder.service.SourceInfo; diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/SchemaCrossReferenceSourceInfo.java b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/SchemaCrossReferenceSourceInfo.java index 896fa816974..8451a02f844 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/SchemaCrossReferenceSourceInfo.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/SchemaCrossReferenceSourceInfo.java @@ -3,6 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.java.recoderext; +import de.uka.ilkd.key.java.KeYCrossReferenceSourceInfo; + import recoder.ServiceConfiguration; import recoder.abstraction.PrimitiveType; import recoder.abstraction.Type; @@ -10,7 +12,6 @@ import recoder.java.declaration.VariableSpecification; import recoder.java.reference.TypeReference; import recoder.java.reference.UncollatedReferenceQualifier; -import recoder.service.KeYCrossReferenceSourceInfo; public class SchemaCrossReferenceSourceInfo extends KeYCrossReferenceSourceInfo { diff --git a/key.core/src/main/java/de/uka/ilkd/key/java/visitor/ProgramContextAdder.java b/key.core/src/main/java/de/uka/ilkd/key/java/visitor/ProgramContextAdder.java index 589b1cb9d4d..c7eddcbfef2 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/java/visitor/ProgramContextAdder.java +++ b/key.core/src/main/java/de/uka/ilkd/key/java/visitor/ProgramContextAdder.java @@ -3,8 +3,6 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.java.visitor; -import java.rmi.UnexpectedException; - import de.uka.ilkd.key.java.JavaNonTerminalProgramElement; import de.uka.ilkd.key.java.ProgramElement; import de.uka.ilkd.key.java.Statement; @@ -85,7 +83,7 @@ protected JavaNonTerminalProgramElement wrap(JavaNonTerminalProgramElement conte return createExecStatementWrapper((StatementBlock) body, (Exec) context); } else { throw new RuntimeException( - new UnexpectedException("Unexpected block type: " + context.getClass())); + new RuntimeException("Unexpected block type: " + context.getClass())); } } } diff --git a/key.core/src/main/java/de/uka/ilkd/key/nparser/builder/TacletPBuilder.java b/key.core/src/main/java/de/uka/ilkd/key/nparser/builder/TacletPBuilder.java index 62cb9be803a..d90fa284bc1 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/nparser/builder/TacletPBuilder.java +++ b/key.core/src/main/java/de/uka/ilkd/key/nparser/builder/TacletPBuilder.java @@ -29,7 +29,6 @@ import org.key_project.logic.sort.Sort; import org.key_project.util.collection.*; -import antlr.RecognitionException; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RuleContext; import org.antlr.v4.runtime.Token; @@ -802,7 +801,7 @@ private void addGoalTemplate(String id, Object rwObj, Sequent addSeq, } else { if (b instanceof NoFindTacletBuilder) { // there is a replacewith without a find. - throwEx(new RecognitionException("")); + throwEx(new RuntimeException("there is a replacewith without a find")); } else if (b instanceof SuccTacletBuilder || b instanceof AntecTacletBuilder) { if (rwObj instanceof Sequent) { gt = new AntecSuccTacletGoalTemplate(addSeq, addRList, (Sequent) rwObj, pvs); diff --git a/key.core/src/main/java/de/uka/ilkd/key/parser/WarningException.java b/key.core/src/main/java/de/uka/ilkd/key/parser/WarningException.java deleted file mode 100644 index 820755ec2fc..00000000000 --- a/key.core/src/main/java/de/uka/ilkd/key/parser/WarningException.java +++ /dev/null @@ -1,27 +0,0 @@ -/* This file is part of KeY - https://key-project.org - * KeY is licensed under the GNU General Public License Version 2 - * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.parser; - -public class WarningException extends antlr.ANTLRException { - - /** - * - */ - private static final long serialVersionUID = 3421160418830554998L; - private String errorStr = ""; - - public WarningException(String errorStr) { - this.errorStr = errorStr; - } - - public String getMessage() { - return errorStr; - } - - - public String toString() { - return errorStr; - } - -} diff --git a/key.core/src/main/java/de/uka/ilkd/key/speclang/njml/JmlTermFactory.java b/key.core/src/main/java/de/uka/ilkd/key/speclang/njml/JmlTermFactory.java index 60a6293409e..553e722ceb8 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/speclang/njml/JmlTermFactory.java +++ b/key.core/src/main/java/de/uka/ilkd/key/speclang/njml/JmlTermFactory.java @@ -36,7 +36,7 @@ import org.key_project.util.collection.ImmutableSLList; import org.key_project.util.collection.Pair; -import org.antlr.runtime.Token; +import org.antlr.v4.runtime.Token; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; import org.slf4j.Logger; diff --git a/key.core/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver b/key.core/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver index 24b975ab0ea..3270b9b1557 100644 --- a/key.core/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver +++ b/key.core/src/main/resources/META-INF/services/de.uka.ilkd.key.proof.init.DefaultProfileResolver @@ -4,4 +4,4 @@ de.uka.ilkd.key.proof.init.JavaProfileDefaultProfileResolver de.uka.ilkd.key.proof.init.JavaProfileWithPermissionsDefaultProfileResolver -de.tud.cs.se.ds.specstr.profile.StrengthAnalysisSEProfileDefaultProfileResolver + diff --git a/key.ui/build.gradle b/key.ui/build.gradle index 76a2b5849b6..93f23235bed 100644 --- a/key.ui/build.gradle +++ b/key.ui/build.gradle @@ -10,6 +10,7 @@ plugins { id 'com.github.johnrengelman.shadow' version "8.1.1" } + description "User interface for the deductive verification of Java programs" dependencies { diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ApplyTacletDialog.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ApplyTacletDialog.java index 24dbf6c9f7e..db41dcf7d26 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ApplyTacletDialog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ApplyTacletDialog.java @@ -13,7 +13,6 @@ import javax.swing.border.TitledBorder; import de.uka.ilkd.key.control.instantiation_model.TacletInstantiationModel; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.utilities.GuiUtilities; import de.uka.ilkd.key.logic.op.IProgramVariable; import de.uka.ilkd.key.pp.NotationInfo; @@ -21,6 +20,7 @@ import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.rule.inst.SVInstantiations; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/GoalList.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/GoalList.java index 4dc5f4adc46..342e204f853 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/GoalList.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/GoalList.java @@ -20,9 +20,6 @@ import javax.swing.event.ListSelectionListener; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.configuration.Config; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.extension.api.TabPanel; @@ -37,6 +34,9 @@ import de.uka.ilkd.key.pp.SequentViewLogicPrinter; import de.uka.ilkd.key.pp.VisibleTermLabels; import de.uka.ilkd.key.proof.*; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoTreeModel.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoTreeModel.java index e5c2656b37e..27a39578207 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoTreeModel.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoTreeModel.java @@ -12,8 +12,8 @@ import de.uka.ilkd.key.rule.NoPosTacletApp; import de.uka.ilkd.key.rule.OneStepSimplifier; import de.uka.ilkd.key.rule.Taclet; +import de.uka.ilkd.key.ui.util.XMLResources; import de.uka.ilkd.key.util.MiscTools; -import de.uka.ilkd.key.util.XMLResources; import org.key_project.logic.Name; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoView.java index f1ea7dac7b5..68acabf166c 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/InfoView.java @@ -11,10 +11,6 @@ import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; -import de.uka.ilkd.key.core.KeYSelectionModel; import de.uka.ilkd.key.gui.extension.api.DefaultContextMenuKind; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.extension.api.TabPanel; @@ -25,8 +21,12 @@ import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; import de.uka.ilkd.key.rule.Rule; -import de.uka.ilkd.key.util.ThreadUtilities; -import de.uka.ilkd.key.util.XMLResources; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.core.KeYSelectionModel; +import de.uka.ilkd.key.ui.util.ThreadUtilities; +import de.uka.ilkd.key.ui.util.XMLResources; /** * Class for info contents displayed in {@link MainWindow}. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/IssueDialog.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/IssueDialog.java index a49fcdb69e3..4321ff76eed 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/IssueDialog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/IssueDialog.java @@ -36,12 +36,12 @@ import de.uka.ilkd.key.pp.LogicPrinter; import de.uka.ilkd.key.speclang.PositionedString; import de.uka.ilkd.key.speclang.SLEnvInput; +import de.uka.ilkd.key.ui.util.SwingUtil; import de.uka.ilkd.key.util.ExceptionTools; import org.key_project.util.collection.ImmutableSet; import org.key_project.util.java.IOUtil; import org.key_project.util.java.StringUtil; -import org.key_project.util.java.SwingUtil; import org.antlr.v4.runtime.InputMismatchException; import org.antlr.v4.runtime.NoViableAltException; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/KeYFileChooser.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/KeYFileChooser.java index 97c247a1bb6..2bd76afcf53 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/KeYFileChooser.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/KeYFileChooser.java @@ -11,7 +11,7 @@ import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileNameExtensionFilter; -import de.uka.ilkd.key.core.Main; +import de.uka.ilkd.key.ui.core.Main; import org.key_project.util.java.IOUtil; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/KeyboardTacletExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/KeyboardTacletExtension.java index 476a7fc7060..c98b837011b 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/KeyboardTacletExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/KeyboardTacletExtension.java @@ -14,9 +14,6 @@ import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.docking.DockingHelper; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; @@ -33,6 +30,9 @@ import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.rule.TacletApp; import de.uka.ilkd.key.ui.MediatorProofControl; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSet; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/LogView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/LogView.java index c9a4685bbb1..0cb8d967462 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/LogView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/LogView.java @@ -18,11 +18,11 @@ import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; -import de.uka.ilkd.key.core.Log; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.fonticons.FontAwesomeSolid; import de.uka.ilkd.key.gui.fonticons.IconFontProvider; +import de.uka.ilkd.key.ui.core.Log; import net.miginfocom.layout.CC; import net.miginfocom.swing.MigLayout; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindow.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindow.java index 870acc2b682..1550465e644 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindow.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindow.java @@ -28,9 +28,6 @@ import de.uka.ilkd.key.control.AutoModeListener; import de.uka.ilkd.key.control.TermLabelVisibilityManager; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.actions.*; import de.uka.ilkd.key.gui.actions.useractions.ProofLoadUserAction; import de.uka.ilkd.key.gui.configuration.Config; @@ -66,6 +63,11 @@ import de.uka.ilkd.key.smt.SolverTypeCollection; import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.ui.AbstractMediatorUserInterfaceControl; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.util.PreferenceSaver; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import de.uka.ilkd.key.util.*; import org.key_project.logic.Name; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindowTabbedPane.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindowTabbedPane.java index cb991480cf9..390edffe002 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindowTabbedPane.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/MainWindowTabbedPane.java @@ -8,11 +8,11 @@ import java.util.stream.Stream; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.actions.AutoModeAction; import de.uka.ilkd.key.gui.extension.api.TabPanel; import de.uka.ilkd.key.gui.extension.impl.KeYGuiExtensionFacade; import de.uka.ilkd.key.gui.prooftree.ProofTreeView; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * {@link JTabbedPane} displayed in {@link MainWindow}, to the left of diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/MaxRuleAppSlider.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/MaxRuleAppSlider.java index 3ca46aab2f7..cd9bff5c8b6 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/MaxRuleAppSlider.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/MaxRuleAppSlider.java @@ -7,7 +7,7 @@ import java.util.LinkedList; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; public class MaxRuleAppSlider extends JSlider { /** diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java index 9a41bca4fd1..7d69c668957 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java @@ -6,7 +6,6 @@ import java.util.*; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.actions.ProofScriptFromFileAction; import de.uka.ilkd.key.gui.actions.ProofScriptInputAction; import de.uka.ilkd.key.gui.actions.useractions.ProofMacroUserAction; @@ -15,6 +14,7 @@ import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.settings.FeatureSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.reflection.ClassLoaderUtil; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java index 6f634c192f1..8a9f7d62e81 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroWorker.java @@ -8,8 +8,6 @@ import javax.swing.*; import de.uka.ilkd.key.control.InteractionListener; -import de.uka.ilkd.key.core.InterruptListener; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.macros.ProofMacroFinishedInfo; @@ -20,6 +18,8 @@ import de.uka.ilkd.key.prover.ProverTaskListener; import de.uka.ilkd.key.prover.TaskStartedInfo; import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo; +import de.uka.ilkd.key.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofManagementDialog.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofManagementDialog.java index f1769a410d5..ca28df909d7 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofManagementDialog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofManagementDialog.java @@ -17,7 +17,6 @@ import javax.swing.*; import javax.swing.border.TitledBorder; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.gui.utilities.GuiUtilities; import de.uka.ilkd.key.java.Services; @@ -38,6 +37,7 @@ import de.uka.ilkd.key.proof.mgt.SpecificationRepository; import de.uka.ilkd.key.speclang.Contract; import de.uka.ilkd.key.ui.AbstractMediatorUserInterfaceControl; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.logic.Name; import org.key_project.util.collection.DefaultImmutableSet; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java index ccb6b52727a..0d8d8f3a067 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofScriptWorker.java @@ -13,14 +13,14 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; -import de.uka.ilkd.key.core.InterruptListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionModel; import de.uka.ilkd.key.nparser.KeyAst; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.scripts.ProofScriptEngine; import de.uka.ilkd.key.scripts.ScriptException; +import de.uka.ilkd.key.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionModel; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/RecentFileMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/RecentFileMenu.java index 98d47b13694..629ddb6b2a6 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/RecentFileMenu.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/RecentFileMenu.java @@ -12,10 +12,10 @@ import java.util.stream.Collectors; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.settings.Configuration; import de.uka.ilkd.key.settings.PathConfig; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/SelectionHistory.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/SelectionHistory.java index f95e50d94d5..9351b4f88ea 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/SelectionHistory.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/SelectionHistory.java @@ -11,13 +11,13 @@ import java.util.HashSet; import java.util.Set; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Traces the proof nodes selected by the user. Allows navigating forwards and backwards to diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/StrategySelectionView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/StrategySelectionView.java index 9a833bd94eb..53265b3cca3 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/StrategySelectionView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/StrategySelectionView.java @@ -9,9 +9,6 @@ import java.util.Map.Entry; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.extension.api.TabPanel; import de.uka.ilkd.key.gui.extension.impl.KeYGuiExtensionFacade; @@ -25,6 +22,9 @@ import de.uka.ilkd.key.strategy.StrategyFactory; import de.uka.ilkd.key.strategy.StrategyProperties; import de.uka.ilkd.key.strategy.definition.*; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/TacletMatchCompletionDialog.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/TacletMatchCompletionDialog.java index abc51d2775a..f1093abcdfc 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/TacletMatchCompletionDialog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/TacletMatchCompletionDialog.java @@ -21,7 +21,6 @@ import de.uka.ilkd.key.control.InstantiationFileHandler; import de.uka.ilkd.key.control.instantiation_model.TacletInstantiationModel; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.nodeviews.PosInSequentTransferable; import de.uka.ilkd.key.gui.utilities.BracketMatchingTextArea; import de.uka.ilkd.key.java.Services; @@ -39,6 +38,7 @@ import de.uka.ilkd.key.proof.ModelEvent; import de.uka.ilkd.key.proof.SVInstantiationExceptionWithPosition; import de.uka.ilkd.key.rule.TacletApp; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/TaskTree.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/TaskTree.java index bc7f539dfe3..45d31bce3b8 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/TaskTree.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/TaskTree.java @@ -18,21 +18,21 @@ import javax.swing.tree.TreePath; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.configuration.Config; import de.uka.ilkd.key.gui.extension.api.DefaultContextMenuKind; import de.uka.ilkd.key.gui.extension.impl.KeYGuiExtensionFacade; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.gui.notification.events.AbandonTaskEvent; import de.uka.ilkd.key.proof.*; -import de.uka.ilkd.key.proof.mgt.BasicTask; -import de.uka.ilkd.key.proof.mgt.EnvNode; import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.proof.mgt.ProofStatus; -import de.uka.ilkd.key.proof.mgt.TaskTreeModel; -import de.uka.ilkd.key.proof.mgt.TaskTreeNode; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.proof.mgt.BasicTask; +import de.uka.ilkd.key.ui.proof.mgt.EnvNode; +import de.uka.ilkd.key.ui.proof.mgt.TaskTreeModel; +import de.uka.ilkd.key.ui.proof.mgt.TaskTreeNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/WindowUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/WindowUserInterfaceControl.java index fabdbf0724a..6687057905c 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/WindowUserInterfaceControl.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/WindowUserInterfaceControl.java @@ -17,13 +17,12 @@ import de.uka.ilkd.key.control.TermLabelVisibilityManager; import de.uka.ilkd.key.control.UserInterfaceControl; import de.uka.ilkd.key.control.instantiation_model.TacletInstantiationModel; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.mergerule.MergeRuleCompletion; import de.uka.ilkd.key.gui.notification.events.GeneralFailureEvent; import de.uka.ilkd.key.gui.notification.events.NotificationEvent; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.macros.ProofMacroFinishedInfo; -import de.uka.ilkd.key.nparser.KeyAst; +import de.uka.ilkd.key.nparser.KeyAst.ProofScript; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; @@ -43,17 +42,20 @@ import de.uka.ilkd.key.strategy.StrategyProperties; import de.uka.ilkd.key.ui.AbstractMediatorUserInterfaceControl; import de.uka.ilkd.key.ui.MediatorProofControl; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; +import de.uka.ilkd.key.ui.util.SwingUtil; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import de.uka.ilkd.key.util.KeYConstants; import de.uka.ilkd.key.util.MiscTools; -import de.uka.ilkd.key.util.ThreadUtilities; import org.key_project.util.collection.ImmutableSet; import org.key_project.util.collection.Pair; -import org.key_project.util.java.SwingUtil; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +// import sun.misc.Signal; /** * Implementation of {@link UserInterfaceControl} which controls the {@link MainWindow} with the @@ -77,6 +79,22 @@ public WindowUserInterfaceControl(MainWindow mainWindow) { completions.add(new BlockContractInternalCompletion(mainWindow)); completions.add(new BlockContractExternalCompletion(mainWindow)); completions.add(MergeRuleCompletion.INSTANCE); + try { + /* + * requires module dep to jdk.unsupported. + * Signal.handle(new Signal("INT"), sig -> { + * if (getMediator().isInAutoMode()) { + * LOGGER.warn("Caught SIGINT, stopping automode..."); + * getMediator().getUI().getProofControl().stopAutoMode(); + * } else { + * LOGGER.warn("Caught SIGINT, exiting..."); + * new ExitMainAction(mainWindow).exitMainWithoutInteraction(); + * } + * }); + */ + } catch (Exception e) { + // the above is optional functionality and may not work on every OS + } } @Override @@ -134,7 +152,7 @@ public void progressStopped(Object sender) { @Override public void reportException(Object sender, ProofOblInput input, Exception e) { - IssueDialog.showExceptionDialog(mainWindow, e); + reportStatus(sender, input.name() + " failed"); } @Override @@ -222,7 +240,7 @@ private void taskFinishedInternal(TaskFinishedInfo info) { KeYMediator mediator = mainWindow.getMediator(); mediator.getNotationInfo().refresh(mediator.getServices()); if (problemLoader.hasProofScript()) { - KeyAst.ProofScript scriptAndLoc = problemLoader.getProofScript(); + ProofScript scriptAndLoc = problemLoader.getProofScript(); if (scriptAndLoc != null) { ProofScriptWorker psw = new ProofScriptWorker(mainWindow.getMediator(), scriptAndLoc); diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java index 5da01cc8080..93a4a96515f 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/AutoModeAction.java @@ -11,9 +11,6 @@ import javax.swing.KeyStroke; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.useractions.AutoModeUserAction; import de.uka.ilkd.key.gui.fonticons.IconFactory; @@ -23,6 +20,9 @@ import de.uka.ilkd.key.proof.ProofTreeAdapter; import de.uka.ilkd.key.proof.ProofTreeEvent; import de.uka.ilkd.key.proof.ProofTreeListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/EditMostRecentFileAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/EditMostRecentFileAction.java index 42c4d2672b2..cf998f2f1bf 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/EditMostRecentFileAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/EditMostRecentFileAction.java @@ -8,10 +8,10 @@ import java.io.File; import java.io.IOException; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/GoalBackAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/GoalBackAction.java index 1988b642008..456ef87fd09 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/GoalBackAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/GoalBackAction.java @@ -6,8 +6,6 @@ import java.awt.event.ActionEvent; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Goal; @@ -16,6 +14,8 @@ import de.uka.ilkd.key.proof.ProofEvent; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.settings.GeneralSettings; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapSettingsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapSettingsAction.java index dd7bd3e788a..16b6594be64 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapSettingsAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapSettingsAction.java @@ -5,12 +5,12 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.HeatmapOptionsDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Action for invoking the heatmap options dialog. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapToggleAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapToggleAction.java index 762d119aa04..fefe6a41756 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapToggleAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/HeatmapToggleAction.java @@ -8,14 +8,14 @@ import java.beans.PropertyChangeListener; import javax.swing.*; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.gui.nodeviews.SequentView; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.settings.ProofIndependentSettings; import de.uka.ilkd.key.settings.ViewSettings; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; public class HeatmapToggleAction extends MainWindowAction { private static final long serialVersionUID = 1L; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/KeYProjectHomepageAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/KeYProjectHomepageAction.java index 92d4186181e..8f4734d54f0 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/KeYProjectHomepageAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/KeYProjectHomepageAction.java @@ -3,7 +3,6 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions; -import java.awt.*; import java.awt.event.ActionEvent; import java.io.IOException; import java.net.MalformedURLException; @@ -13,8 +12,7 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; - -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.util.SwingUtil; /** * Open the KeY project homepage in the system default browser. May be inactive if Java 6 Desktop diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MacroKeyBinding.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MacroKeyBinding.java index bc7b0b19c1a..76302a90e05 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MacroKeyBinding.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MacroKeyBinding.java @@ -8,7 +8,6 @@ import javax.swing.JComponent; import javax.swing.KeyStroke; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.ProofMacroMenu; import de.uka.ilkd.key.gui.actions.useractions.ProofMacroUserAction; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; @@ -16,6 +15,7 @@ import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.pp.PosInSequent; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * This class provides means to run macros with key bindings such that these can be bound to the diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MainWindowAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MainWindowAction.java index be4a31013d0..4d0cd1f241a 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MainWindowAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/MainWindowAction.java @@ -7,11 +7,11 @@ import java.util.Collection; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import static de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager.SHORTCUT_KEY_MASK; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java index 111b4f32bc1..a6cca557ed8 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenExampleAction.java @@ -6,11 +6,11 @@ import java.awt.event.ActionEvent; import java.io.File; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.gui.ExampleChooser; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; +import de.uka.ilkd.key.ui.core.Main; /** * Opens a file dialog allowing to select the example to be loaded diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenMostRecentFileAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenMostRecentFileAction.java index 32f08a0f2cd..879d87f969d 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenMostRecentFileAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenMostRecentFileAction.java @@ -7,12 +7,12 @@ import java.io.File; import java.nio.file.Path; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofSelectionDialog; import de.uka.ilkd.key.gui.fonticons.IconFactory; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Loads the last opened file diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenSingleJavaFileAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenSingleJavaFileAction.java index d11d99b4c73..81f4c89dafc 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenSingleJavaFileAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/OpenSingleJavaFileAction.java @@ -11,7 +11,7 @@ import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.WindowUserInterfaceControl; -import de.uka.ilkd.key.proof.io.ProblemLoader; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; /** * Offers a loading of a single Java file, without considering the folder as part of a classpath. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofManagementAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofManagementAction.java index 01a1bb5f9a3..3a85db12458 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofManagementAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofManagementAction.java @@ -5,12 +5,12 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofManagementDialog; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.gui.notification.events.GeneralFailureEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Shows the proof management dialog diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptFromFileAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptFromFileAction.java index bbd2fe1705d..a49cfc42f41 100755 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptFromFileAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptFromFileAction.java @@ -7,13 +7,13 @@ import java.io.File; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofScriptWorker; import de.uka.ilkd.key.nparser.ParsingFacade; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptInputAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptInputAction.java index d8833a767fc..5fef335f708 100755 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptInputAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofScriptInputAction.java @@ -3,20 +3,18 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions; -import java.awt.*; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.event.ActionEvent; -import javax.swing.*; import javax.swing.AbstractAction; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JTextArea; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofScriptWorker; import de.uka.ilkd.key.nparser.ParsingFacade; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * The Class ProofScriptInputAction. @@ -27,9 +25,7 @@ public class ProofScriptInputAction extends AbstractAction { private static final long serialVersionUID = -1193756128644859298L; - /** - * The mediator. - */ + /** The mediator. */ private final KeYMediator mediator; /** diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/PruneProofAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/PruneProofAction.java index 753211abcf4..ea007c1c3d5 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/PruneProofAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/PruneProofAction.java @@ -6,14 +6,14 @@ import java.awt.event.ActionEvent; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofEvent; import de.uka.ilkd.key.settings.GeneralSettings; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * This action is one part of the previous UndoLastStepAction: It prunes the proof tree below the diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java index b95e443df85..589aa25ed39 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/RunAllProofsAction.java @@ -11,13 +11,13 @@ import java.util.List; import java.util.stream.Collectors; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.WindowUserInterfaceControl; import de.uka.ilkd.key.proof.Proof; -import de.uka.ilkd.key.proof.io.ProblemLoader; import de.uka.ilkd.key.ui.MediatorProofControl; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SMTInvokeAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SMTInvokeAction.java index cdd94c9a3b0..2e645f48035 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SMTInvokeAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SMTInvokeAction.java @@ -5,7 +5,6 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.smt.SolverListener; import de.uka.ilkd.key.proof.Proof; @@ -14,6 +13,7 @@ import de.uka.ilkd.key.smt.SMTProblem; import de.uka.ilkd.key.smt.SolverLauncher; import de.uka.ilkd.key.smt.SolverTypeCollection; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * This action is responsible for the invocation of an SMT solver For example the toolbar button is diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SaveBundleAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SaveBundleAction.java index 871225b47fa..9ef87e02d2e 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SaveBundleAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SaveBundleAction.java @@ -5,13 +5,13 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.settings.GeneralSettings; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Saves the currently selected proof as a zip archive with file extension "zproof". The bundle diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SendFeedbackAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SendFeedbackAction.java index 8ddaa942b20..b15dfc088c7 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SendFeedbackAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SendFeedbackAction.java @@ -20,7 +20,6 @@ import javax.swing.filechooser.FileFilter; import javax.swing.text.html.HTMLEditorKit; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.parser.Location; @@ -28,6 +27,7 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.io.OutputStreamProofSaver; import de.uka.ilkd.key.settings.ProofSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.util.ExceptionTools; import de.uka.ilkd.key.util.KeYConstants; import de.uka.ilkd.key.util.KeYResourceManager; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SystemInfoAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SystemInfoAction.java deleted file mode 100644 index c6ce7b6646a..00000000000 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SystemInfoAction.java +++ /dev/null @@ -1,130 +0,0 @@ -/* This file is part of KeY - https://key-project.org - * KeY is licensed under the GNU General Public License Version 2 - * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.gui.actions; - -import java.awt.event.ActionEvent; -import java.util.List; -import java.util.Map; -import javax.swing.JDialog; -import javax.swing.JOptionPane; -import javax.swing.JScrollPane; -import javax.swing.JTextArea; - -import de.uka.ilkd.key.gui.MainWindow; -import de.uka.ilkd.key.util.KeYConstants; - -public class SystemInfoAction extends MainWindowAction { - - private static final long serialVersionUID = -4197309658998177157L; - private static final int TEXT_ROWS = 20; - private static final int TEXT_COLS = 60; - - public SystemInfoAction(MainWindow mainWindow) { - super(mainWindow); - setName("System Info"); - // setIcon(IconFactory.help(16)); - } - - @Override - public void actionPerformed(ActionEvent e) { - Object[] contents = new Object[6]; - contents[0] = "KeY info:\n"; - String params = System.getProperty("sun.java.command"); - if (params == null) { - params = "(unknown)"; - } - int i = params.indexOf("Main"); - if (i > 0) { - params = params.substring(i + 4); - } - java.lang.management.RuntimeMXBean rmb = - java.lang.management.ManagementFactory.getRuntimeMXBean(); - final String keyInfoText = "Version: " + KeYConstants.VERSION + "\nKeY parameters: " - + params + "\nVM parameters: " + formatList(rmb.getInputArguments()); - JTextArea keyInfo = new JTextArea(keyInfoText, 3, TEXT_COLS); - keyInfo.setEditable(false); - contents[1] = keyInfo; - - contents[2] = getMemoryInfo() + "\n\nEnvironment variables:\n"; - JScrollPane scroll = new JScrollPane(); - JTextArea text = new JTextArea(getEnv(), TEXT_ROWS / 3, 40); - text.setEditable(false); - text.setCaretPosition(0); - scroll.setViewportView(text); - contents[3] = scroll; - - contents[4] = "\nJava properties:\n"; - JScrollPane scroll2 = new JScrollPane(); - JTextArea text2 = new JTextArea(getProperties(), TEXT_ROWS, 40); - text2.setEditable(false); - text2.setCaretPosition(0); - scroll2.setViewportView(text2); - contents[5] = scroll2; - - JOptionPane pane = - new JOptionPane(contents, JOptionPane.INFORMATION_MESSAGE, JOptionPane.DEFAULT_OPTION); - JDialog dialog = pane.createDialog(mainWindow, "System information"); - dialog.setVisible(true); - } - - @SuppressWarnings("finally") - private String getProperties() { - StringBuffer sb = new StringBuffer(); - java.util.Properties props; - try { - props = System.getProperties(); - formatMap(sb, props); - } finally { - return sb.toString(); - } - } - - - @SuppressWarnings("finally") - private String getEnv() { - StringBuffer sb = new StringBuffer(); - try { - formatMap(sb, System.getenv()); - } finally { - return sb.toString(); - } - } - - private void formatMap(StringBuffer sb, Map props) { - for (Object o : props.keySet()) { - sb.append(o); - sb.append("=\""); - sb.append(props.get(o)); - sb.append("\"\n"); - } - } - - private String formatList(List l) { - StringBuilder sb = new StringBuilder(); - for (Object o : l) { - sb.append(o); - sb.append(" "); - } - sb.deleteCharAt(sb.length() - 1); - return sb.toString(); - } - - private String getMemoryInfo() { - Runtime rt = Runtime.getRuntime(); - rt.gc(); // call garbage collection to normalize stats - - StringBuilder sb = new StringBuilder(); - long maxMemory = rt.maxMemory(); - long allocatedMemory = rt.totalMemory(); - long freeMemory = rt.freeMemory(); - - sb.append("\nAvailable processors: ").append(rt.availableProcessors()); - sb.append("\nFree VM memory: ").append(freeMemory / 1024 / 1024).append(" MB"); - sb.append("\nAllocated VM memory: ").append(allocatedMemory / 1024 / 1024).append(" MB"); - sb.append("\nMax VM memory: ").append(maxMemory / 1024 / 1024).append(" MB"); - sb.append("\nTotal free VM memory: ") - .append((freeMemory + (maxMemory - allocatedMemory)) / 1024 / 1024).append(" MB"); - return sb.toString(); - } -} diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/TermLabelMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/TermLabelMenu.java index 1cca9da9dd1..a6af73022e6 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/TermLabelMenu.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/TermLabelMenu.java @@ -12,9 +12,9 @@ import de.uka.ilkd.key.control.TermLabelVisibilityManager; import de.uka.ilkd.key.control.event.TermLabelVisibilityManagerEvent; import de.uka.ilkd.key.control.event.TermLabelVisibilityManagerListener; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.logic.Name; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/AutoModeUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/AutoModeUserAction.java index aff954c6d91..2bba6a63a59 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/AutoModeUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/AutoModeUserAction.java @@ -3,8 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * User action to start auto mode (automatic proof search). diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/FocussedAutoModeUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/FocussedAutoModeUserAction.java index db205ac39b9..e5688808e91 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/FocussedAutoModeUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/FocussedAutoModeUserAction.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * User action for "Apply rules automatically here" (i.e. focussed auto mode). diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofLoadUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofLoadUserAction.java index ab1d28e0cda..ca3b3e319b3 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofLoadUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofLoadUserAction.java @@ -3,8 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Virtual user action to undo loading a proof. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofMacroUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofMacroUserAction.java index 30ec29f1bbc..12b9efdb319 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofMacroUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofMacroUserAction.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * User action to apply a proof macro. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofModifyingUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofModifyingUserAction.java index dd80e6e79e5..922567a6885 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofModifyingUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofModifyingUserAction.java @@ -7,10 +7,10 @@ import java.util.List; import java.util.stream.Collectors; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * User action that modifies the proof in some way. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofRuleUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofRuleUserAction.java index 354f1466a39..1553fb19495 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofRuleUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofRuleUserAction.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * User action that represents the manual application of a rule. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofSMTApplyUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofSMTApplyUserAction.java index 94f0d15e065..05dd78d8ab3 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofSMTApplyUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/ProofSMTApplyUserAction.java @@ -7,7 +7,6 @@ import java.util.HashSet; import java.util.Iterator; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.smt.SolverListener; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.proof.Goal; @@ -16,6 +15,7 @@ import de.uka.ilkd.key.rule.IBuiltInRuleApp; import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.SMTRuleApp; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/RunStrategyOnNodeUserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/RunStrategyOnNodeUserAction.java index 9e7eeea57b2..555ba8d5faf 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/RunStrategyOnNodeUserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/RunStrategyOnNodeUserAction.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.actions.useractions; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/UserAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/UserAction.java index db364620b11..cd78fd203e7 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/UserAction.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/useractions/UserAction.java @@ -6,8 +6,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Abstract concept of an action performed by the user. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingLayout.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingLayout.java index 31d72c542fc..b603f40f62a 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingLayout.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingLayout.java @@ -13,7 +13,6 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.MainWindowAction; @@ -24,6 +23,7 @@ import de.uka.ilkd.key.gui.fonticons.IconFontSwing; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; import de.uka.ilkd.key.settings.PathConfig; +import de.uka.ilkd.key.ui.core.KeYMediator; import bibliothek.gui.dock.common.CControl; import bibliothek.gui.dock.util.IconManager; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/ContextMenuAdapter.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/ContextMenuAdapter.java index a8004749df8..107163d4ed9 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/ContextMenuAdapter.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/ContextMenuAdapter.java @@ -7,11 +7,11 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.Rule; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.jspecify.annotations.NonNull; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeYGuiExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeYGuiExtension.java index ef94d9dc7df..ffba6e2b9f2 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeYGuiExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeYGuiExtension.java @@ -12,7 +12,6 @@ import javax.swing.JMenu; import javax.swing.JToolBar; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.GoalList; import de.uka.ilkd.key.gui.InfoView; import de.uka.ilkd.key.gui.MainWindow; @@ -23,6 +22,7 @@ import de.uka.ilkd.key.gui.settings.SettingsProvider; import de.uka.ilkd.key.gui.sourceview.SourceView; import de.uka.ilkd.key.pp.PosInSequent; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.jspecify.annotations.NonNull; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeyboardShortcutAdapter.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeyboardShortcutAdapter.java index 2f1f344a039..73ea5c0fa26 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeyboardShortcutAdapter.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/KeyboardShortcutAdapter.java @@ -8,13 +8,13 @@ import java.util.Objects; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.GoalList; import de.uka.ilkd.key.gui.InfoView; import de.uka.ilkd.key.gui.StrategySelectionView; import de.uka.ilkd.key.gui.nodeviews.SequentView; import de.uka.ilkd.key.gui.prooftree.ProofTreeView; import de.uka.ilkd.key.gui.sourceview.SourceView; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Adapter for {@link KeYGuiExtension.KeyboardShortcuts} interface. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/KeYGuiExtensionFacade.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/KeYGuiExtensionFacade.java index 1b2e01c96af..84123289f03 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/KeYGuiExtensionFacade.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/KeYGuiExtensionFacade.java @@ -12,7 +12,6 @@ import java.util.stream.Stream; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.extension.api.ContextMenuKind; @@ -20,6 +19,7 @@ import de.uka.ilkd.key.gui.extension.api.TabPanel; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Facade for retrieving the GUI extensions. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/TestExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/TestExtension.java index 8df816cba26..b6e36789dc5 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/TestExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/impl/TestExtension.java @@ -11,7 +11,6 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.extension.api.ContextMenuAdapter; @@ -26,6 +25,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.Rule; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/help/HelpFacade.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/help/HelpFacade.java index 3c753d3a3ed..35d99f28661 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/help/HelpFacade.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/help/HelpFacade.java @@ -13,8 +13,7 @@ import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.fonticons.IconFactory; - -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.util.SwingUtil; import bibliothek.gui.dock.common.action.CAction; import bibliothek.gui.dock.common.action.CButton; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/join/JoinMenuItem.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/join/JoinMenuItem.java index 2b55d03b369..200a49902d7 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/join/JoinMenuItem.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/join/JoinMenuItem.java @@ -7,7 +7,6 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.notification.events.ExceptionFailureEvent; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; @@ -15,6 +14,7 @@ import de.uka.ilkd.key.proof.join.JoinProcessor.Listener; import de.uka.ilkd.key.proof.join.PredicateEstimator; import de.uka.ilkd.key.proof.join.ProspectivePartner; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/lemmatagenerator/LemmataAutoModeOptions.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/lemmatagenerator/LemmataAutoModeOptions.java index b8f3a450684..3b5d655ca91 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/lemmatagenerator/LemmataAutoModeOptions.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/lemmatagenerator/LemmataAutoModeOptions.java @@ -7,10 +7,10 @@ import java.util.Collection; import java.util.LinkedList; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.proof.Proof; -import de.uka.ilkd.key.util.CommandLine; -import de.uka.ilkd.key.util.CommandLineException; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.ui.util.CommandLine; +import de.uka.ilkd.key.ui.util.CommandLineException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/mergerule/MergeRuleMenuItem.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/mergerule/MergeRuleMenuItem.java index b62d5323d79..2ae4bdd3720 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/mergerule/MergeRuleMenuItem.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/mergerule/MergeRuleMenuItem.java @@ -6,7 +6,6 @@ import java.awt.event.ActionEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.notification.events.ExceptionFailureEvent; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; @@ -16,6 +15,7 @@ import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo; import de.uka.ilkd.key.rule.merge.MergeRule; import de.uka.ilkd.key.rule.merge.MergeRuleBuiltInRuleApp; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * The menu item for the state merging rule. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalView.java index 379d45a13e6..243223767f7 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalView.java @@ -12,7 +12,6 @@ import java.util.LinkedList; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.ApplyTacletDialog; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.MainWindow; @@ -22,6 +21,7 @@ import de.uka.ilkd.key.pp.SequentViewLogicPrinter; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.rule.TacletApp; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.util.Debug; import org.slf4j.Logger; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewListener.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewListener.java index 746b874c031..750fc9cbea4 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewListener.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewListener.java @@ -8,11 +8,11 @@ import java.awt.event.MouseEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.ProofMacroMenu; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.rule.BuiltInRule; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewMenu.java index 3fc648efbee..a78adf54d88 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewMenu.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/CurrentGoalViewMenu.java @@ -17,7 +17,6 @@ import java.util.Set; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofMacroMenu; import de.uka.ilkd.key.gui.actions.useractions.FocussedAutoModeUserAction; @@ -50,6 +49,7 @@ import de.uka.ilkd.key.smt.SMTProblem; import de.uka.ilkd.key.smt.SolverLauncher; import de.uka.ilkd.key.smt.SolverTypeCollection; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/DragNDropInstantiator.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/DragNDropInstantiator.java index ad048dbd1b3..00d9468a367 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/DragNDropInstantiator.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/DragNDropInstantiator.java @@ -17,7 +17,6 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; @@ -29,6 +28,7 @@ import de.uka.ilkd.key.rule.inst.IllegalInstantiationException; import de.uka.ilkd.key.rule.tacletbuilder.TacletGoalTemplate; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentView.java index c617b595e6a..91e8087ce28 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentView.java @@ -26,7 +26,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.settings.ProofIndependentSettings; import de.uka.ilkd.key.settings.ViewSettings; -import de.uka.ilkd.key.util.DoNothingCaret; +import de.uka.ilkd.key.ui.util.DoNothingCaret; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentViewDock.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentViewDock.java index 626bbb9e309..bd2e24cd8cd 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentViewDock.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentViewDock.java @@ -7,7 +7,6 @@ import java.awt.event.ActionEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYSelectionModel; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.actions.MainWindowAction; @@ -15,11 +14,13 @@ import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYSelectionModel; import bibliothek.gui.dock.common.CLocation; import bibliothek.gui.dock.common.DefaultMultipleCDockable; import bibliothek.gui.dock.common.NullMultipleCDockableFactory; + /** * @author Alexander Weigl * @version 1 (24.05.19) diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/TacletDescriber.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/TacletDescriber.java index 17b4c8984d2..538c651ca18 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/TacletDescriber.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/TacletDescriber.java @@ -5,13 +5,13 @@ import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.logic.op.*; import de.uka.ilkd.key.pp.SequentViewLogicPrinter; import de.uka.ilkd.key.pp.VisibleTermLabels; import de.uka.ilkd.key.rule.*; import de.uka.ilkd.key.rule.inst.GenericSortInstantiations; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableSet; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/notification/NotificationManager.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/notification/NotificationManager.java index 17ab2ea9f83..91c87248b10 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/notification/NotificationManager.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/notification/NotificationManager.java @@ -8,9 +8,9 @@ import javax.swing.JFrame; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.notification.events.NotificationEvent; import de.uka.ilkd.key.proof.ProofEvent; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * The notificatin manager controls the list of active notification tasks. It receives KeY System diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelVisualizer.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelVisualizer.java index e08bdb030a5..90ee8e1570a 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelVisualizer.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelVisualizer.java @@ -17,7 +17,6 @@ import javax.swing.tree.TreePath; import de.uka.ilkd.key.control.TermLabelVisibilityManager; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.nodeviews.SequentView; @@ -29,6 +28,7 @@ import de.uka.ilkd.key.proof.*; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.util.pp.UnbalancedBlocksException; import org.key_project.util.collection.ImmutableArray; @@ -37,6 +37,7 @@ import bibliothek.gui.dock.common.DefaultSingleCDockable; + /** * This UI component visualizes the {@link OriginTermLabel}s of a term and its sub-terms. * diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelsExt.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelsExt.java index fdfafb05674..674c59848ac 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelsExt.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/originlabels/OriginTermLabelsExt.java @@ -10,7 +10,6 @@ import java.util.stream.Collectors; import javax.swing.Action; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.actions.KeyAction; @@ -23,6 +22,7 @@ import de.uka.ilkd.key.logic.label.OriginTermLabel.Origin; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.proof.Node; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Extension adapter for {@link OriginTermLabel}s and {@link OriginTermLabelVisualizer}s. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/ActionHistoryExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/ActionHistoryExtension.java index 18fc71d4473..adb284e7bcd 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/ActionHistoryExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/ActionHistoryExtension.java @@ -11,9 +11,6 @@ import java.util.WeakHashMap; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.UserActionListener; import de.uka.ilkd.key.gui.actions.useractions.UserAction; @@ -22,6 +19,9 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/StateChangeListener.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/StateChangeListener.java index 8ec550848af..99a21927fa3 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/StateChangeListener.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/action_history/StateChangeListener.java @@ -6,7 +6,6 @@ import java.util.List; import de.uka.ilkd.key.control.InteractionListener; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.actions.useractions.ProofRuleUserAction; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; @@ -18,6 +17,7 @@ import de.uka.ilkd.key.rule.IBuiltInRuleApp; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.settings.Settings; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Listener object to record various user actions (currently only rule applications) diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java index c8d62a2e080..9c365e85f70 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/plugins/javac/JavacExtension.java @@ -12,9 +12,6 @@ import java.util.concurrent.ExecutionException; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.PositionedIssueString; @@ -24,6 +21,9 @@ import de.uka.ilkd.key.gui.fonticons.MaterialDesignRegular; import de.uka.ilkd.key.proof.JavaModel; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreePopupFactory.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreePopupFactory.java index 3866cf218af..0c62f731a4e 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreePopupFactory.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreePopupFactory.java @@ -12,7 +12,6 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.InspectorForDecisionPredicates; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofMacroMenu; @@ -37,6 +36,7 @@ import de.uka.ilkd.key.rule.OneStepSimplifierRuleApp; import de.uka.ilkd.key.settings.FeatureSettings; import de.uka.ilkd.key.settings.GeneralSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import static de.uka.ilkd.key.settings.FeatureSettings.createFeature; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeView.java index 8b5c4718711..0cde993538d 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeView.java @@ -16,9 +16,6 @@ import javax.swing.tree.*; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.NodeInfoVisualizerListener; @@ -38,7 +35,10 @@ import de.uka.ilkd.key.proof.reference.ClosedBy; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.settings.ProofIndependentSettings; -import de.uka.ilkd.key.util.ThreadUtilities; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/InformationWindow.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/InformationWindow.java index 0e984f23dbc..c74a1f6c66f 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/InformationWindow.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/InformationWindow.java @@ -10,6 +10,7 @@ import de.uka.ilkd.key.gui.configuration.Config; import de.uka.ilkd.key.gui.sourceview.TextLineNumber; import de.uka.ilkd.key.smt.SMTSolver; +import de.uka.ilkd.key.smt.communication.AbstractSolverSocket; import de.uka.ilkd.key.smt.model.Model; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; @@ -88,11 +89,12 @@ private void initModel(SMTSolver solver) { if (solver.getType() != SolverTypes.Z3_CE_SOLVER) { return; } - if (solver.getSocket().getQuery() == null) { + AbstractSolverSocket socket = solver.getSocket(); + if (socket.getQuery() == null) { return; } - Model m = solver.getSocket().getQuery().getModel(); + Model m = socket.getQuery().getModel(); this.model = m; this.setTitle("Counterexample " + this.getTitle()); getTabbedPane().addTab("Counterexample", createModelTab()); diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/ProgressDialog.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/ProgressDialog.java index 338eb227509..0462a732cdc 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/ProgressDialog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/ProgressDialog.java @@ -17,8 +17,7 @@ import de.uka.ilkd.key.gui.smt.ProgressModel.ProcessColumn.ProcessData; import de.uka.ilkd.key.gui.smt.ProgressTable.ProgressTableListener; import de.uka.ilkd.key.smt.SMTFocusResults; - -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.util.SwingUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/SolverListener.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/SolverListener.java index 272fbf6abbb..64eba87bb18 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/SolverListener.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/smt/SolverListener.java @@ -15,7 +15,6 @@ import java.util.Timer; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.useractions.ProofSMTApplyUserAction; import de.uka.ilkd.key.gui.colors.ColorSettings; @@ -42,6 +41,7 @@ import de.uka.ilkd.key.smt.solvertypes.SolverType; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; import de.uka.ilkd.key.taclettranslation.assumptions.TacletSetTranslation; +import de.uka.ilkd.key.ui.core.KeYMediator; public class SolverListener implements SolverLauncherListener { private ProgressDialog progressDialog; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java index ea5c5e16bce..94391c97d11 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/sourceview/SourceView.java @@ -26,8 +26,6 @@ import javax.swing.text.Highlighter.HighlightPainter; import javax.swing.text.SimpleAttributeSet; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.colors.ColorSettings; import de.uka.ilkd.key.gui.configuration.Config; @@ -49,6 +47,8 @@ import de.uka.ilkd.key.proof.ProofJavaSourceCollection; import de.uka.ilkd.key.proof.io.consistency.FileRepo; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.logic.Visitor; import org.key_project.util.collection.ImmutableSet; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/AbstractMediatorUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/AbstractMediatorUserInterfaceControl.java index 5b547b0ca16..9c0b5618e97 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/AbstractMediatorUserInterfaceControl.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/AbstractMediatorUserInterfaceControl.java @@ -10,8 +10,6 @@ import de.uka.ilkd.key.control.AbstractUserInterfaceControl; import de.uka.ilkd.key.control.RuleCompletionHandler; import de.uka.ilkd.key.control.UserInterfaceControl; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.gui.notification.events.NotificationEvent; import de.uka.ilkd.key.informationflow.macros.StartSideProofMacro; import de.uka.ilkd.key.macros.ProofMacro; @@ -24,7 +22,6 @@ import de.uka.ilkd.key.proof.init.AbstractProfile; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofOblInput; -import de.uka.ilkd.key.proof.io.ProblemLoader; import de.uka.ilkd.key.proof.io.ProofSaver; import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.proof.mgt.ProofEnvironmentEvent; @@ -32,9 +29,12 @@ import de.uka.ilkd.key.prover.ProverTaskListener; import de.uka.ilkd.key.prover.TaskStartedInfo; import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import de.uka.ilkd.key.util.KeYResourceManager; import de.uka.ilkd.key.util.MiscTools; -import de.uka.ilkd.key.util.ThreadUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleProofObligationSelector.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleProofObligationSelector.java index b86deb6382c..a7ac216ba6e 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleProofObligationSelector.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleProofObligationSelector.java @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; import de.uka.ilkd.key.proof.init.InitConfig; @@ -18,6 +17,7 @@ import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.init.ProofOblInput; import de.uka.ilkd.key.speclang.Contract; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.util.KeYTypeUtil; import org.key_project.util.collection.ImmutableSet; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java index 16788e2a83b..fbbb63ccc80 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleUserInterfaceControl.java @@ -12,8 +12,6 @@ import de.uka.ilkd.key.control.TermLabelVisibilityManager; import de.uka.ilkd.key.control.UserInterfaceControl; import de.uka.ilkd.key.control.instantiation_model.TacletInstantiationModel; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.gui.actions.ShowProofStatistics; import de.uka.ilkd.key.gui.notification.events.NotificationEvent; import de.uka.ilkd.key.java.Services; @@ -29,7 +27,6 @@ import de.uka.ilkd.key.proof.init.ProblemInitializer; import de.uka.ilkd.key.proof.init.Profile; import de.uka.ilkd.key.proof.init.ProofOblInput; -import de.uka.ilkd.key.proof.io.ProblemLoader; import de.uka.ilkd.key.proof.io.ProofSaver; import de.uka.ilkd.key.prover.ProverCore; import de.uka.ilkd.key.prover.TaskFinishedInfo; @@ -39,6 +36,9 @@ import de.uka.ilkd.key.rule.IBuiltInRuleApp; import de.uka.ilkd.key.scripts.ProofScriptEngine; import de.uka.ilkd.key.speclang.PositionedString; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; import de.uka.ilkd.key.util.MiscTools; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java index 54009075944..0266dc58b3b 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/MediatorProofControl.java @@ -11,7 +11,6 @@ import de.uka.ilkd.key.control.AbstractProofControl; import de.uka.ilkd.key.control.ProofControl; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofMacroWorker; @@ -25,6 +24,7 @@ import de.uka.ilkd.key.prover.impl.ApplyStrategyInfo; import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.strategy.StrategyProperties; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/InterruptListener.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/InterruptListener.java similarity index 92% rename from key.ui/src/main/java/de/uka/ilkd/key/core/InterruptListener.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/InterruptListener.java index 2a4b1853b9f..ca9f95ef6f0 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/InterruptListener.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/InterruptListener.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.util.EventListener; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYMediator.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYMediator.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/core/KeYMediator.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYMediator.java index 930e5542c0f..fcaab708871 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYMediator.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYMediator.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,7 @@ import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.settings.ProofSettings; import de.uka.ilkd.key.ui.AbstractMediatorUserInterfaceControl; -import de.uka.ilkd.key.util.ThreadUtilities; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import org.key_project.proof.LocationVariableTracker; import org.key_project.util.collection.ImmutableList; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionEvent.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionEvent.java similarity index 97% rename from key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionEvent.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionEvent.java index 6577733f38f..58de0050cef 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionEvent.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionEvent.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; /** diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionListener.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionListener.java similarity index 96% rename from key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionListener.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionListener.java index cc7514823a8..25ae73300ae 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionListener.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionListener.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import de.uka.ilkd.key.proof.Node; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionModel.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionModel.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionModel.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionModel.java index 1273de9c666..fa0348547cc 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/KeYSelectionModel.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/KeYSelectionModel.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.util.*; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/Log.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Log.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/core/Log.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/Log.java index 4d8d25cd644..e19e1e18e3d 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/Log.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Log.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.io.IOException; import java.nio.file.Files; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Main.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/core/Main.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/Main.java index f8563c3c62a..614524bc93c 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/Main.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Main.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.io.File; import java.io.IOException; @@ -31,8 +31,8 @@ import de.uka.ilkd.key.ui.AbstractMediatorUserInterfaceControl; import de.uka.ilkd.key.ui.ConsoleUserInterfaceControl; import de.uka.ilkd.key.ui.Verbosity; -import de.uka.ilkd.key.util.CommandLine; -import de.uka.ilkd.key.util.CommandLineException; +import de.uka.ilkd.key.ui.util.CommandLine; +import de.uka.ilkd.key.ui.util.CommandLineException; import de.uka.ilkd.key.util.Debug; import de.uka.ilkd.key.util.KeYConstants; import de.uka.ilkd.key.util.rifl.RIFLTransformer; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/core/Watchdog.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Watchdog.java similarity index 98% rename from key.ui/src/main/java/de/uka/ilkd/key/core/Watchdog.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/core/Watchdog.java index 0439c08fd52..0fdb5ac97d8 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/core/Watchdog.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/core/Watchdog.java @@ -1,12 +1,12 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.core; +package de.uka.ilkd.key.ui.core; import java.awt.*; import java.util.Set; -import de.uka.ilkd.key.util.ThreadUtilities; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/io/ProblemLoader.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java similarity index 96% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/io/ProblemLoader.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java index 1f4e9b91330..1a3a890f4cb 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/io/ProblemLoader.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java @@ -1,23 +1,25 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.io; +package de.uka.ilkd.key.ui.proof.io; import java.io.File; import java.util.List; import java.util.Properties; import javax.swing.SwingWorker; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.notification.events.ExceptionFailureEvent; import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.Profile; +import de.uka.ilkd.key.proof.io.AbstractProblemLoader; +import de.uka.ilkd.key.proof.io.ProblemLoaderControl; import de.uka.ilkd.key.prover.ProverTaskListener; import de.uka.ilkd.key.prover.TaskFinishedInfo; import de.uka.ilkd.key.prover.TaskStartedInfo; import de.uka.ilkd.key.prover.TaskStartedInfo.TaskKind; import de.uka.ilkd.key.prover.impl.DefaultTaskFinishedInfo; import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * This class extends the functionality of the {@link AbstractProblemLoader}. It allows to do the diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/BasicTask.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/BasicTask.java similarity index 94% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/BasicTask.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/BasicTask.java index ba2680a9cf4..4e58f657fd9 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/BasicTask.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/BasicTask.java @@ -1,13 +1,15 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.mgt; +package de.uka.ilkd.key.ui.proof.mgt; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.MutableTreeNode; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; +import de.uka.ilkd.key.proof.mgt.ProofEnvironment; +import de.uka.ilkd.key.proof.mgt.ProofStatus; /** diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/EnvNode.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/EnvNode.java similarity index 91% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/EnvNode.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/EnvNode.java index bbfde9855fd..135a89f32a4 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/EnvNode.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/EnvNode.java @@ -1,12 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.mgt; +package de.uka.ilkd.key.ui.proof.mgt; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.MutableTreeNode; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.proof.mgt.ProofEnvironment; +import de.uka.ilkd.key.proof.mgt.ProofStatus; public class EnvNode extends DefaultMutableTreeNode implements TaskTreeNode { diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/ProofAggregateTask.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/ProofAggregateTask.java similarity index 94% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/ProofAggregateTask.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/ProofAggregateTask.java index 6f336253747..280eaa923bc 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/ProofAggregateTask.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/ProofAggregateTask.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.mgt; +package de.uka.ilkd.key.ui.proof.mgt; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.MutableTreeNode; @@ -9,6 +9,8 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; import de.uka.ilkd.key.proof.SingleProof; +import de.uka.ilkd.key.proof.mgt.ProofEnvironment; +import de.uka.ilkd.key.proof.mgt.ProofStatus; public class ProofAggregateTask extends DefaultMutableTreeNode implements TaskTreeNode { diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeModel.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeModel.java similarity index 97% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeModel.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeModel.java index 355768da45c..342c5b0311c 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeModel.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeModel.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.mgt; +package de.uka.ilkd.key.ui.proof.mgt; import java.util.LinkedHashMap; import java.util.Map; @@ -11,6 +11,7 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; +import de.uka.ilkd.key.proof.mgt.ProofEnvironment; public class TaskTreeModel extends DefaultTreeModel { diff --git a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeNode.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeNode.java similarity index 83% rename from key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeNode.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeNode.java index 6508357dac6..0c06c6cb08b 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/proof/mgt/TaskTreeNode.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/mgt/TaskTreeNode.java @@ -1,12 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.mgt; +package de.uka.ilkd.key.ui.proof.mgt; import javax.swing.tree.MutableTreeNode; import javax.swing.tree.TreeNode; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.proof.mgt.ProofEnvironment; +import de.uka.ilkd.key.proof.mgt.ProofStatus; public interface TaskTreeNode extends MutableTreeNode { diff --git a/key.ui/src/main/java/org/key_project/util/java/CheckedProcessBuilder.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CheckedProcessBuilder.java similarity index 98% rename from key.ui/src/main/java/org/key_project/util/java/CheckedProcessBuilder.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/CheckedProcessBuilder.java index 08b37eec378..b7676be260d 100644 --- a/key.ui/src/main/java/org/key_project/util/java/CheckedProcessBuilder.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CheckedProcessBuilder.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package org.key_project.util.java; +package de.uka.ilkd.key.ui.util; import java.io.IOException; import java.util.Arrays; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/CommandLine.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLine.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/util/CommandLine.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLine.java index a51a710d2d0..07c1f6f36f9 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/CommandLine.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLine.java @@ -1,13 +1,14 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; import java.io.File; import java.io.PrintStream; import java.util.*; -import de.uka.ilkd.key.core.Main; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.util.LinkedHashMap; /** * A small framework to handle command lines. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/CommandLineException.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLineException.java similarity index 97% rename from key.ui/src/main/java/de/uka/ilkd/key/util/CommandLineException.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLineException.java index 3607fee1684..720c1a4ec04 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/CommandLineException.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/CommandLineException.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; /** * Exception used by {@link CommandLine}. diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/DoNothingCaret.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/DoNothingCaret.java similarity index 98% rename from key.ui/src/main/java/de/uka/ilkd/key/util/DoNothingCaret.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/DoNothingCaret.java index 426019a923d..b08380acc1b 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/DoNothingCaret.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/DoNothingCaret.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; import java.awt.*; import javax.swing.event.ChangeListener; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/PreferenceSaver.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/PreferenceSaver.java similarity index 99% rename from key.ui/src/main/java/de/uka/ilkd/key/util/PreferenceSaver.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/PreferenceSaver.java index 6a56b8bf20c..e0dd060c4c1 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/PreferenceSaver.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/PreferenceSaver.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; import java.awt.*; import java.util.prefs.BackingStoreException; diff --git a/key.ui/src/main/java/org/key_project/util/java/SwingUtil.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java similarity index 99% rename from key.ui/src/main/java/org/key_project/util/java/SwingUtil.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java index 8285a9b99da..75af2256f81 100644 --- a/key.ui/src/main/java/org/key_project/util/java/SwingUtil.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package org.key_project.util.java; +package de.uka.ilkd.key.ui.util; import java.awt.*; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/ThreadUtilities.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/ThreadUtilities.java similarity index 98% rename from key.ui/src/main/java/de/uka/ilkd/key/util/ThreadUtilities.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/ThreadUtilities.java index 2588529aefd..631c1f7ab30 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/ThreadUtilities.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/ThreadUtilities.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; import java.awt.EventQueue; import java.lang.reflect.InvocationTargetException; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/util/XMLResources.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/XMLResources.java similarity index 98% rename from key.ui/src/main/java/de/uka/ilkd/key/util/XMLResources.java rename to key.ui/src/main/java/de/uka/ilkd/key/ui/util/XMLResources.java index 3c50b745530..9ad1a7981fd 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/util/XMLResources.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/XMLResources.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.util; +package de.uka.ilkd.key.ui.util; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/key.ui/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension b/key.ui/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension index 99b38233d0c..8cb35eaba56 100644 --- a/key.ui/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension +++ b/key.ui/src/main/resources/META-INF/services/de.uka.ilkd.key.gui.extension.api.KeYGuiExtension @@ -6,6 +6,5 @@ de.uka.ilkd.key.gui.KeyboardTacletExtension de.uka.ilkd.key.gui.nodeviews.ShowHashcodesExtension de.uka.ilkd.key.gui.LogView de.uka.ilkd.key.gui.plugins.javac.JavacExtension -de.uka.ilkd.key.gui.plugins.caching.CachingExtension de.uka.ilkd.key.gui.utilities.HeapStatusExt de.uka.ilkd.key.gui.JmlEnabledKeysIndicator \ No newline at end of file diff --git a/key.ui/src/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java b/key.ui/src/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java index fad4e66973a..8c74c3ea013 100644 --- a/key.ui/src/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java +++ b/key.ui/src/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java @@ -13,15 +13,14 @@ import java.util.stream.Collectors; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.Main; import de.uka.ilkd.key.gui.actions.EditMostRecentFileAction; import de.uka.ilkd.key.gui.actions.KeYProjectHomepageAction; import de.uka.ilkd.key.gui.actions.LemmaGenerationAction; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; import de.uka.ilkd.key.settings.ProofIndependentSettings; - -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.Main; +import de.uka.ilkd.key.ui.util.SwingUtil; import bibliothek.gui.dock.dockable.AbstractDockable; import org.junit.jupiter.api.*; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingExtension.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingExtension.java index 51fc0986e86..f7c31b7dda7 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingExtension.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingExtension.java @@ -9,9 +9,6 @@ import java.util.Set; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.extension.api.ContextMenuKind; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; @@ -36,12 +33,14 @@ import de.uka.ilkd.key.proof.event.ProofDisposedListener; import de.uka.ilkd.key.proof.reference.ClosedBy; import de.uka.ilkd.key.proof.reference.CopyReferenceResolver; -import de.uka.ilkd.key.proof.reference.ReferenceSearcher; import de.uka.ilkd.key.proof.replay.CopyingProofReplayer; import de.uka.ilkd.key.prover.ProverTaskListener; import de.uka.ilkd.key.prover.TaskFinishedInfo; import de.uka.ilkd.key.prover.TaskStartedInfo; import de.uka.ilkd.key.prover.impl.ApplyStrategy; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.util.collection.ImmutableList; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingPruneHandler.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingPruneHandler.java index ef4cc2c269e..c5ba97d8abc 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingPruneHandler.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/CachingPruneHandler.java @@ -3,7 +3,6 @@ * SPDX-License-Identifier: GPL-2.0-only */ package de.uka.ilkd.key.gui.plugins.caching; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.plugins.caching.settings.CachingSettingsProvider; @@ -15,6 +14,7 @@ import de.uka.ilkd.key.proof.io.IntermediateProofReplayer; import de.uka.ilkd.key.proof.reference.ClosedBy; import de.uka.ilkd.key.proof.replay.CopyingProofReplayer; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/DefaultReferenceSearchDialogListener.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/DefaultReferenceSearchDialogListener.java index 60324f307f3..827b6f3f325 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/DefaultReferenceSearchDialogListener.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/DefaultReferenceSearchDialogListener.java @@ -6,12 +6,12 @@ import java.util.function.Consumer; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.ShowProofStatistics; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.CopyReferenceResolver; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ProgramMethodFinder.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ProgramMethodFinder.java similarity index 96% rename from keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ProgramMethodFinder.java rename to keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ProgramMethodFinder.java index 44ad71b7bf4..9796db4711d 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ProgramMethodFinder.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ProgramMethodFinder.java @@ -1,7 +1,7 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.reference; +package de.uka.ilkd.key.gui.plugins.caching; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.ProgramMethod; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchButton.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchButton.java index dec2bab3847..afa2d74d512 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchButton.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchButton.java @@ -8,14 +8,13 @@ import java.awt.event.ActionListener; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.colors.ColorSettings; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; -import de.uka.ilkd.key.proof.reference.ReferenceSearcher; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** * Status line button to indicate whether cached goals are present. diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchDialog.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchDialog.java index 591367ebced..d805e28bf8f 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchDialog.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchDialog.java @@ -10,8 +10,7 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; - -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.util.SwingUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchTable.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchTable.java index 645a539f746..721458c72b0 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchTable.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearchTable.java @@ -12,10 +12,10 @@ import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Table showing the results of searching for proof references. diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ReferenceSearcher.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearcher.java similarity index 98% rename from keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ReferenceSearcher.java rename to keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearcher.java index 14b5265c330..37f67abc126 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/proof/reference/ReferenceSearcher.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/ReferenceSearcher.java @@ -1,11 +1,10 @@ /* This file is part of KeY - https://key-project.org * KeY is licensed under the GNU General Public License Version 2 * SPDX-License-Identifier: GPL-2.0-only */ -package de.uka.ilkd.key.proof.reference; +package de.uka.ilkd.key.gui.plugins.caching; import java.util.*; import java.util.stream.Collectors; -import javax.swing.*; import de.uka.ilkd.key.logic.Semisequent; import de.uka.ilkd.key.logic.Sequent; @@ -13,6 +12,7 @@ import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.proof.reference.ClosedBy; import de.uka.ilkd.key.rule.NoPosTacletApp; import de.uka.ilkd.key.rule.merge.CloseAfterMerge; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseAllByReference.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseAllByReference.java index b2232ecaafe..23c97cf2e2e 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseAllByReference.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseAllByReference.java @@ -8,14 +8,14 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.plugins.caching.CachingExtension; +import de.uka.ilkd.key.gui.plugins.caching.ReferenceSearcher; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; -import de.uka.ilkd.key.proof.reference.ReferenceSearcher; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Proof context menu action to perform proof caching for all open goals on that proof. diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseByReference.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseByReference.java index 7dcafc483f2..6e523373061 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseByReference.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CloseByReference.java @@ -9,13 +9,13 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.plugins.caching.CachingExtension; +import de.uka.ilkd.key.gui.plugins.caching.ReferenceSearcher; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.reference.ClosedBy; -import de.uka.ilkd.key.proof.reference.ReferenceSearcher; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Action to search for suitable references on a single node. diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CopyReferencedProof.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CopyReferencedProof.java index cd818b55d8c..b7b13bdab21 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CopyReferencedProof.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/CopyReferencedProof.java @@ -5,7 +5,6 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; @@ -13,6 +12,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.reference.ClosedBy; import de.uka.ilkd.key.proof.replay.CopyingProofReplayer; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/GotoReferenceAction.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/GotoReferenceAction.java index 234749e63e6..2106c6a69af 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/GotoReferenceAction.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/GotoReferenceAction.java @@ -5,10 +5,10 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.reference.ClosedBy; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Action to go the referenced proof. diff --git a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/RemoveCachingInformationAction.java b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/RemoveCachingInformationAction.java index 7037248ea28..922442ad3ad 100644 --- a/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/RemoveCachingInformationAction.java +++ b/keyext.caching/src/main/java/de/uka/ilkd/key/gui/plugins/caching/actions/RemoveCachingInformationAction.java @@ -5,10 +5,10 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.reference.ClosedBy; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * Action to remove caching information on a goal closed by caching. diff --git a/keyext.caching/src/test/java/de/uka/ilkd/key/proof/reference/TestReferenceSearcher.java b/keyext.caching/src/test/java/de/uka/ilkd/key/proof/reference/TestReferenceSearcher.java index 047eb9b2e2f..9ff6b4b8806 100644 --- a/keyext.caching/src/test/java/de/uka/ilkd/key/proof/reference/TestReferenceSearcher.java +++ b/keyext.caching/src/test/java/de/uka/ilkd/key/proof/reference/TestReferenceSearcher.java @@ -9,6 +9,7 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; +import de.uka.ilkd.key.gui.plugins.caching.ReferenceSearcher; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; diff --git a/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationExtension.java b/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationExtension.java index 3e671516e44..5236a5fb3c2 100644 --- a/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationExtension.java +++ b/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationExtension.java @@ -10,9 +10,6 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.colors.ColorSettings; import de.uka.ilkd.key.gui.extension.api.ContextMenuAdapter; @@ -30,6 +27,9 @@ import de.uka.ilkd.key.proof.ProofTreeListener; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.exploration.actions.*; import org.key_project.exploration.ui.ExplorationStepsList; diff --git a/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationModeModel.java b/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationModeModel.java index 3ef79c2ff5c..10e9694646d 100644 --- a/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationModeModel.java +++ b/keyext.exploration/src/main/java/org/key_project/exploration/ExplorationModeModel.java @@ -14,6 +14,7 @@ import de.uka.ilkd.key.gui.prooftree.ProofTreeViewFilter; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.settings.ProofIndependentSettings; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.jspecify.annotations.NonNull; @@ -22,7 +23,7 @@ *

* This class holds the data and the state of proof exploration. *

- * For every {@link de.uka.ilkd.key.core.KeYMediator} or {@link MainWindow} should only exists one + * For every {@link KeYMediator} or {@link MainWindow} should only exists one * instance. * * @see ExplorationExtension diff --git a/keyext.exploration/src/main/java/org/key_project/exploration/ProofExplorationService.java b/keyext.exploration/src/main/java/org/key_project/exploration/ProofExplorationService.java index 310148a5efd..865cfe53157 100644 --- a/keyext.exploration/src/main/java/org/key_project/exploration/ProofExplorationService.java +++ b/keyext.exploration/src/main/java/org/key_project/exploration/ProofExplorationService.java @@ -5,7 +5,6 @@ import java.util.Objects; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.*; import de.uka.ilkd.key.logic.op.SchemaVariable; @@ -14,6 +13,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.rule.*; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.logic.Name; import org.key_project.util.collection.ImmutableList; diff --git a/keyext.exploration/src/main/java/org/key_project/exploration/actions/ToggleExplorationAction.java b/keyext.exploration/src/main/java/org/key_project/exploration/actions/ToggleExplorationAction.java index e46442f4f2e..3a8c6a86105 100644 --- a/keyext.exploration/src/main/java/org/key_project/exploration/actions/ToggleExplorationAction.java +++ b/keyext.exploration/src/main/java/org/key_project/exploration/actions/ToggleExplorationAction.java @@ -5,10 +5,10 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.exploration.ExplorationModeModel; import org.key_project.exploration.Icons; diff --git a/keyext.exploration/src/main/java/org/key_project/exploration/ui/ExplorationStepsList.java b/keyext.exploration/src/main/java/org/key_project/exploration/ui/ExplorationStepsList.java index 5e5565becd4..3baafa307d2 100644 --- a/keyext.exploration/src/main/java/org/key_project/exploration/ui/ExplorationStepsList.java +++ b/keyext.exploration/src/main/java/org/key_project/exploration/ui/ExplorationStepsList.java @@ -10,7 +10,6 @@ import javax.swing.*; import javax.swing.tree.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.extension.api.TabPanel; @@ -19,6 +18,7 @@ import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.RuleAppListener; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.key_project.exploration.ExplorationNodeData; import org.key_project.exploration.Icons; diff --git a/keyext.proofmanagement/src/main/java/org/key_project/proofmanagement/Main.java b/keyext.proofmanagement/src/main/java/org/key_project/proofmanagement/Main.java index 6745745cbc2..31ed6dbabeb 100644 --- a/keyext.proofmanagement/src/main/java/org/key_project/proofmanagement/Main.java +++ b/keyext.proofmanagement/src/main/java/org/key_project/proofmanagement/Main.java @@ -11,8 +11,8 @@ import java.util.List; import java.util.ResourceBundle; -import de.uka.ilkd.key.util.CommandLine; -import de.uka.ilkd.key.util.CommandLineException; +import de.uka.ilkd.key.ui.util.CommandLine; +import de.uka.ilkd.key.ui.util.CommandLineException; import org.key_project.proofmanagement.check.*; import org.key_project.proofmanagement.io.HTMLReport; diff --git a/keyext.slicing/src/main/java/org/key_project/slicing/Main.java b/keyext.slicing/src/main/java/org/key_project/slicing/Main.java index a7cc16eee48..925241a626c 100644 --- a/keyext.slicing/src/main/java/org/key_project/slicing/Main.java +++ b/keyext.slicing/src/main/java/org/key_project/slicing/Main.java @@ -12,13 +12,13 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; -import de.uka.ilkd.key.core.Log; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.init.JavaProfile; import de.uka.ilkd.key.proof.io.ProblemLoaderControl; import de.uka.ilkd.key.settings.GeneralSettings; -import de.uka.ilkd.key.util.CommandLine; -import de.uka.ilkd.key.util.CommandLineException; +import de.uka.ilkd.key.ui.core.Log; +import de.uka.ilkd.key.ui.util.CommandLine; +import de.uka.ilkd.key.ui.util.CommandLineException; import org.key_project.slicing.analysis.AnalysisResults; diff --git a/keyext.slicing/src/main/java/org/key_project/slicing/SlicingExtension.java b/keyext.slicing/src/main/java/org/key_project/slicing/SlicingExtension.java index 8d03e6a7303..47aeb19535a 100644 --- a/keyext.slicing/src/main/java/org/key_project/slicing/SlicingExtension.java +++ b/keyext.slicing/src/main/java/org/key_project/slicing/SlicingExtension.java @@ -11,9 +11,6 @@ import java.util.Map; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.extension.api.ContextMenuAdapter; import de.uka.ilkd.key.gui.extension.api.ContextMenuKind; @@ -27,6 +24,9 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; import de.uka.ilkd.key.proof.event.ProofDisposedListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.slicing.graph.GraphNode; import org.key_project.slicing.ui.ShowCreatedByAction; diff --git a/keyext.slicing/src/main/java/org/key_project/slicing/ui/SliceToFixedPointDialog.java b/keyext.slicing/src/main/java/org/key_project/slicing/ui/SliceToFixedPointDialog.java index 75b673c64a1..33174898a4b 100644 --- a/keyext.slicing/src/main/java/org/key_project/slicing/ui/SliceToFixedPointDialog.java +++ b/keyext.slicing/src/main/java/org/key_project/slicing/ui/SliceToFixedPointDialog.java @@ -18,13 +18,13 @@ import java.util.stream.Collectors; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.configuration.Config; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.key_project.slicing.analysis.AnalysisResults; diff --git a/keyext.slicing/src/main/java/org/key_project/slicing/ui/SlicingLeftPanel.java b/keyext.slicing/src/main/java/org/key_project/slicing/ui/SlicingLeftPanel.java index 78a3140fd38..e40ac014d7e 100644 --- a/keyext.slicing/src/main/java/org/key_project/slicing/ui/SlicingLeftPanel.java +++ b/keyext.slicing/src/main/java/org/key_project/slicing/ui/SlicingLeftPanel.java @@ -19,9 +19,6 @@ import javax.swing.border.TitledBorder; import de.uka.ilkd.key.control.DefaultUserInterfaceControl; -import de.uka.ilkd.key.core.KeYMediator; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; @@ -32,8 +29,11 @@ import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofTreeEvent; import de.uka.ilkd.key.proof.ProofTreeListener; -import de.uka.ilkd.key.proof.io.ProblemLoader; import de.uka.ilkd.key.proof.io.ProblemLoaderControl; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.proof.io.ProblemLoader; import org.key_project.slicing.DependencyTracker; import org.key_project.slicing.SlicingExtension; diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/CounterExampleAction.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/CounterExampleAction.java index a3b4c5deb74..c816e2f15a5 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/CounterExampleAction.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/CounterExampleAction.java @@ -9,23 +9,23 @@ import javax.swing.*; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.InterruptListener; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.MainWindowAction; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.gui.smt.SolverListener; import de.uka.ilkd.key.logic.Sequent; -import de.uka.ilkd.key.macros.SemanticsBlastingMacro; import de.uka.ilkd.key.proof.*; import de.uka.ilkd.key.settings.DefaultSMTSettings; import de.uka.ilkd.key.settings.ProofIndependentSettings; import de.uka.ilkd.key.smt.SolverLauncherListener; -import de.uka.ilkd.key.smt.counterexample.AbstractCounterExampleGenerator; -import de.uka.ilkd.key.smt.counterexample.AbstractSideProofCounterExampleGenerator; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; +import de.uka.ilkd.key.testgen.macros.SemanticsBlastingMacro; +import de.uka.ilkd.key.testgen.smt.counterexample.AbstractCounterExampleGenerator; +import de.uka.ilkd.key.testgen.smt.counterexample.AbstractSideProofCounterExampleGenerator; +import de.uka.ilkd.key.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java index 087e4c5d59f..50eeea8e800 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGInfoDialog.java @@ -10,8 +10,8 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; -import de.uka.ilkd.key.smt.testgen.TestGenerationLog; -import de.uka.ilkd.key.util.ThreadUtilities; +import de.uka.ilkd.key.testgen.smt.testgen.TestGenerationLog; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGWorker.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGWorker.java index e89942b18ac..3d879f3e400 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGWorker.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGWorker.java @@ -7,8 +7,6 @@ import javax.swing.*; import de.uka.ilkd.key.control.UserInterfaceControl; -import de.uka.ilkd.key.core.InterruptListener; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Sequent; @@ -18,8 +16,10 @@ import de.uka.ilkd.key.proof.init.InitConfig; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.proof.mgt.SpecificationRepository; -import de.uka.ilkd.key.smt.testgen.AbstractTestGenerator; -import de.uka.ilkd.key.smt.testgen.StopRequest; +import de.uka.ilkd.key.testgen.smt.testgen.AbstractTestGenerator; +import de.uka.ilkd.key.testgen.smt.testgen.StopRequest; +import de.uka.ilkd.key.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * The worker must be started using method {@link TGWorker#start()} and not diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestGenerationAction.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestGenerationAction.java index 88bba3bad03..07d6b2c78ed 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestGenerationAction.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestGenerationAction.java @@ -9,8 +9,6 @@ import javax.swing.*; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.MainWindowAction; import de.uka.ilkd.key.gui.fonticons.IconFactory; @@ -18,6 +16,8 @@ import de.uka.ilkd.key.proof.ProofEvent; import de.uka.ilkd.key.settings.ProofIndependentSettings; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; /** diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenExtension.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenExtension.java index a870a2441d4..2b50ca0e1f2 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenExtension.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenExtension.java @@ -10,13 +10,13 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeSettings; import de.uka.ilkd.key.gui.settings.SettingsProvider; -import de.uka.ilkd.key.macros.TestGenMacro; +import de.uka.ilkd.key.testgen.macros.TestGenMacro; +import de.uka.ilkd.key.ui.core.KeYMediator; import org.jspecify.annotations.NonNull; diff --git a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenOptionsPanel.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenOptionsPanel.java index 886cae40008..4e1cf214e2b 100644 --- a/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenOptionsPanel.java +++ b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TestgenOptionsPanel.java @@ -8,7 +8,7 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.settings.SettingsPanel; import de.uka.ilkd.key.gui.settings.SettingsProvider; -import de.uka.ilkd.key.settings.TestGenerationSettings; +import de.uka.ilkd.key.testgen.settings.TestGenerationSettings; public class TestgenOptionsPanel extends SettingsPanel implements SettingsProvider { private static final long serialVersionUID = -2170118134719823425L; diff --git a/recoder/src/main/java/recoder/service/DefaultProgramModelInfo.java b/recoder/src/main/java/recoder/service/DefaultProgramModelInfo.java index 1429ecb1b89..fa42d9b608a 100644 --- a/recoder/src/main/java/recoder/service/DefaultProgramModelInfo.java +++ b/recoder/src/main/java/recoder/service/DefaultProgramModelInfo.java @@ -63,7 +63,7 @@ protected final void updateModel() { /** * Internally used to register a subtype link. */ - void registerSubtype(ClassType subtype, ClassType supertype) { + protected void registerSubtype(ClassType subtype, ClassType supertype) { ProgramModelInfo pmi = supertype.getProgramModelInfo(); if (pmi != this) { ((DefaultProgramModelInfo) pmi).registerSubtype(subtype, supertype);