From b04a4c5c1251118f1926fc419ac86a6ae6d9f8b2 Mon Sep 17 00:00:00 2001 From: Alexander Weigl Date: Sun, 31 Mar 2024 22:59:56 +0200 Subject: [PATCH 1/4] wip module system --- .../java/org/key_project/example/Main.java | 24 ++-- .../AbstractUpdateExtractor.java | 10 +- .../AbstractWriter.java | 2 +- .../ExecutionNodePreorderIterator.java | 4 +- .../ExecutionNodeReader.java | 10 +- .../ExecutionNodeSymbolicLayoutExtractor.java | 6 +- .../ExecutionNodeWriter.java | 48 +++---- .../ExecutionVariableExtractor.java | 16 +-- .../SymbolicExecutionTreeBuilder.java | 16 +-- .../SymbolicLayoutExtractor.java | 10 +- .../SymbolicLayoutReader.java | 20 +-- .../SymbolicLayoutWriter.java | 14 +- .../TruthValueTracingUtil.java | 4 +- .../BlockContractValidityTermLabelUpdate.java | 5 +- .../label/FormulaTermLabelMerger.java | 3 +- .../label/FormulaTermLabelRefactoring.java | 6 +- .../label/FormulaTermLabelUpdate.java | 5 +- .../label/LoopBodyTermLabelUpdate.java | 5 +- ...nvariantNormalBehaviorTermLabelUpdate.java | 5 +- ...veInCheckBranchesTermLabelRefactoring.java | 3 +- .../label/StayOnFormulaTermLabelPolicy.java | 5 +- .../SymbolicExecutionTermLabelUpdate.java | 3 +- .../model/IExecutionAuxiliaryContract.java | 6 +- .../model/IExecutionBaseMethodReturn.java | 2 +- .../model/IExecutionBlockStartNode.java | 2 +- .../model/IExecutionBranchCondition.java | 6 +- .../model/IExecutionBranchStatement.java | 6 +- .../model/IExecutionConstraint.java | 4 +- .../model/IExecutionElement.java | 2 +- .../IExecutionExceptionalMethodReturn.java | 6 +- .../model/IExecutionJoin.java | 6 +- .../model/IExecutionLink.java | 2 +- .../model/IExecutionLoopCondition.java | 6 +- .../model/IExecutionLoopInvariant.java | 6 +- .../model/IExecutionLoopStatement.java | 6 +- .../model/IExecutionMethodCall.java | 6 +- .../model/IExecutionMethodReturn.java | 6 +- .../model/IExecutionMethodReturnValue.java | 6 +- .../model/IExecutionNode.java | 8 +- .../model/IExecutionOperationContract.java | 6 +- .../model/IExecutionStart.java | 6 +- .../model/IExecutionStatement.java | 6 +- .../model/IExecutionTermination.java | 7 +- .../model/IExecutionValue.java | 4 +- .../model/IExecutionVariable.java | 4 +- .../model/ITreeSettings.java | 2 +- .../impl/AbstractExecutionBlockStartNode.java | 8 +- .../model/impl/AbstractExecutionElement.java | 10 +- .../impl/AbstractExecutionMethodReturn.java | 16 +-- .../model/impl/AbstractExecutionNode.java | 12 +- .../model/impl/AbstractExecutionValue.java | 6 +- .../model/impl/AbstractExecutionVariable.java | 12 +- .../ExecutionAllArrayIndicesVariable.java | 12 +- .../impl/ExecutionAuxiliaryContract.java | 12 +- .../model/impl/ExecutionBranchCondition.java | 12 +- .../model/impl/ExecutionBranchStatement.java | 12 +- .../model/impl/ExecutionConstraint.java | 8 +- .../ExecutionExceptionalMethodReturn.java | 14 +- .../model/impl/ExecutionJoin.java | 12 +- .../model/impl/ExecutionLink.java | 6 +- .../model/impl/ExecutionLoopCondition.java | 12 +- .../model/impl/ExecutionLoopInvariant.java | 12 +- .../model/impl/ExecutionLoopStatement.java | 12 +- .../model/impl/ExecutionMethodCall.java | 14 +- .../model/impl/ExecutionMethodReturn.java | 20 +-- .../impl/ExecutionMethodReturnValue.java | 8 +- .../impl/ExecutionOperationContract.java | 14 +- .../model/impl/ExecutionStart.java | 14 +- .../model/impl/ExecutionStatement.java | 12 +- .../model/impl/ExecutionTermination.java | 12 +- .../model/impl/ExecutionValue.java | 12 +- .../model/impl/ExecutionVariable.java | 14 +- .../model/impl/TreeSettings.java | 6 +- .../object_model/IModelSettings.java | 2 +- .../object_model/ISymbolicAssociation.java | 4 +- .../ISymbolicAssociationValueContainer.java | 4 +- .../object_model/ISymbolicElement.java | 2 +- .../ISymbolicEquivalenceClass.java | 2 +- .../object_model/ISymbolicLayout.java | 10 +- .../object_model/ISymbolicObject.java | 4 +- .../object_model/ISymbolicState.java | 4 +- .../object_model/ISymbolicValue.java | 4 +- .../object_model/impl/AbstractElement.java | 8 +- ...ractSymbolicAssociationValueContainer.java | 10 +- .../object_model/impl/ModelSettings.java | 4 +- .../impl/SymbolicAssociation.java | 10 +- .../impl/SymbolicEquivalenceClass.java | 8 +- .../object_model/impl/SymbolicLayout.java | 12 +- .../object_model/impl/SymbolicObject.java | 6 +- .../object_model/impl/SymbolicState.java | 6 +- .../object_model/impl/SymbolicValue.java | 8 +- .../po/ProgramMethodPO.java | 2 +- .../po/ProgramMethodSubsetPO.java | 2 +- .../po/TruthValuePOExtension.java | 6 +- .../profile/SimplifyTermProfile.java | 8 +- .../profile/SymbolicExecutionJavaProfile.java | 30 ++-- ...tionJavaProfileDefaultProfileResolver.java | 2 +- ...torKeepUpdatesForBreakpointconditions.java | 9 +- .../rule/AbstractSideProofRule.java | 4 +- .../rule/ModalitySideProofRule.java | 6 +- .../rule/QuerySideProofRule.java | 4 +- .../slicing/AbstractBackwardSlicer.java | 4 +- .../slicing/AbstractSlicer.java | 8 +- .../slicing/Access.java | 2 +- .../slicing/Location.java | 4 +- .../slicing/ThinBackwardSlicer.java | 4 +- .../AbstractCallStackBasedStopCondition.java | 4 +- .../strategy/BreakpointStopCondition.java | 6 +- .../strategy/CompoundStopCondition.java | 2 +- .../strategy/CutHeapObjectsFeature.java | 2 +- .../strategy/CutHeapObjectsTermGenerator.java | 2 +- ...mbolicExecutionTreeNodesStopCondition.java | 4 +- .../strategy/IBreakpointStopCondition.java | 4 +- .../strategy/SimplifyTermStrategy.java | 4 +- ...mbolicExecutionTreeNodesStopCondition.java | 2 +- ...mbolicExecutionTreeNodesStopCondition.java | 2 +- ...bolicExecutionBreakpointStopCondition.java | 6 +- .../SymbolicExecutionGoalChooser.java | 4 +- .../SymbolicExecutionGoalChooserBuilder.java | 2 +- .../strategy/SymbolicExecutionStrategy.java | 8 +- .../breakpoint/AbstractBreakpoint.java | 2 +- .../AbstractConditionalBreakpoint.java | 6 +- .../AbstractHitCountBreakpoint.java | 2 +- .../breakpoint/ExceptionBreakpoint.java | 4 +- .../strategy/breakpoint/FieldWatchpoint.java | 2 +- .../strategy/breakpoint/IBreakpoint.java | 2 +- .../strategy/breakpoint/KeYWatchpoint.java | 6 +- .../strategy/breakpoint/LineBreakpoint.java | 2 +- .../strategy/breakpoint/MethodBreakpoint.java | 4 +- .../SymbolicExecutionExceptionBreakpoint.java | 4 +- .../util/DefaultEntry.java | 2 +- .../util/EqualsHashCodeResetter.java | 2 +- .../util/SideProofStore.java | 6 +- .../util/SymbolicExecutionEnvironment.java | 10 +- .../util/SymbolicExecutionSideProofUtil.java | 6 +- .../util/SymbolicExecutionUtil.java | 22 +-- .../util/event/ISideProofStoreListener.java | 6 +- .../util/event/SideProofStoreEvent.java | 6 +- .../AbstractSymbolicExecutionTestCase.java | 2 +- .../uka/ilkd/key/testgen/ModelGenerator.java | 2 +- .../ilkd/key/testgen/TestCaseGenerator.java | 4 +- .../macros/SemanticsBlastingMacro.java | 3 +- .../{ => testgen}/macros/TestGenMacro.java | 7 +- .../settings/TestGenerationSettings.java | 6 +- .../AbstractCounterExampleGenerator.java | 4 +- ...tractSideProofCounterExampleGenerator.java | 2 +- .../smt/testgen/AbstractTestGenerator.java | 8 +- .../smt/testgen/MemoryTestGenerationLog.java | 2 +- .../smt/testgen/StopRequest.java | 2 +- .../smt/testgen/TestGenerationLog.java | 2 +- .../uka/ilkd/key/testcase/smt/ce/TestCE.java | 2 +- .../key/testcase/smt/testgen/TestTestgen.java | 2 +- .../AbstractionPredicate.java | 1 - .../uka/ilkd/key/java/ConvertException.java | 15 -- .../java}/KeYCrossReferenceSourceInfo.java | 5 +- .../de/uka/ilkd/key/java/Recoder2KeY.java | 1 - .../ClassFileDeclarationManager.java | 2 +- ...KeYCrossReferenceServiceConfiguration.java | 2 +- .../SchemaCrossReferenceSourceInfo.java | 2 +- .../key/java/visitor/ProgramContextAdder.java | 4 +- .../key/nparser/builder/TacletPBuilder.java | 3 +- .../uka/ilkd/key/parser/WarningException.java | 27 ---- .../key/proof/io/AbstractProblemLoader.java | 7 +- .../key/speclang/njml/JmlTermFactory.java | 2 +- ...ilkd.key.proof.init.DefaultProfileResolver | 2 +- .../uka/ilkd/key/gui/ApplyTacletDialog.java | 2 +- .../java/de/uka/ilkd/key/gui/GoalList.java | 6 +- .../de/uka/ilkd/key/gui/InfoTreeModel.java | 2 +- .../java/de/uka/ilkd/key/gui/InfoView.java | 12 +- .../java/de/uka/ilkd/key/gui/IssueDialog.java | 2 +- .../de/uka/ilkd/key/gui/KeYFileChooser.java | 2 +- .../ilkd/key/gui/KeyboardTacletExtension.java | 6 +- .../java/de/uka/ilkd/key/gui/LogView.java | 2 +- .../java/de/uka/ilkd/key/gui/MainWindow.java | 8 +- .../ilkd/key/gui/MainWindowTabbedPane.java | 2 +- .../de/uka/ilkd/key/gui/MaxRuleAppSlider.java | 2 +- .../de/uka/ilkd/key/gui/ProofMacroMenu.java | 2 +- .../de/uka/ilkd/key/gui/ProofMacroWorker.java | 4 +- .../ilkd/key/gui/ProofManagementDialog.java | 2 +- .../uka/ilkd/key/gui/ProofScriptWorker.java | 6 +- .../de/uka/ilkd/key/gui/RecentFileMenu.java | 2 +- .../de/uka/ilkd/key/gui/SelectionHistory.java | 6 +- .../ilkd/key/gui/StrategySelectionView.java | 6 +- .../key/gui/TacletMatchCompletionDialog.java | 2 +- .../java/de/uka/ilkd/key/gui/TaskTree.java | 14 +- .../key/gui/WindowUserInterfaceControl.java | 15 +- .../ilkd/key/gui/actions/AutoModeAction.java | 6 +- .../gui/actions/EditMostRecentFileAction.java | 4 +- .../ilkd/key/gui/actions/GoalBackAction.java | 4 +- .../gui/actions/HeatmapSettingsAction.java | 4 +- .../key/gui/actions/HeatmapToggleAction.java | 4 +- .../gui/actions/KeYProjectHomepageAction.java | 3 +- .../ilkd/key/gui/actions/MacroKeyBinding.java | 2 +- .../key/gui/actions/MainWindowAction.java | 6 +- .../key/gui/actions/OpenExampleAction.java | 2 +- .../gui/actions/OpenMostRecentFileAction.java | 4 +- .../gui/actions/OpenSingleJavaFileAction.java | 2 +- .../gui/actions/ProofManagementAction.java | 4 +- .../actions/ProofScriptFromFileAction.java | 2 +- .../gui/actions/ProofScriptInputAction.java | 2 +- .../key/gui/actions/PruneProofAction.java | 4 +- .../key/gui/actions/RunAllProofsAction.java | 6 +- .../ilkd/key/gui/actions/SMTInvokeAction.java | 2 +- .../key/gui/actions/SaveBundleAction.java | 4 +- .../key/gui/actions/SendFeedbackAction.java | 2 +- .../key/gui/actions/SystemInfoAction.java | 130 ------------------ .../ilkd/key/gui/actions/TermLabelMenu.java | 4 +- .../useractions/AutoModeUserAction.java | 2 +- .../FocussedAutoModeUserAction.java | 2 +- .../useractions/ProofLoadUserAction.java | 2 +- .../useractions/ProofMacroUserAction.java | 2 +- .../useractions/ProofModifyingUserAction.java | 2 +- .../useractions/ProofRuleUserAction.java | 2 +- .../useractions/ProofSMTApplyUserAction.java | 2 +- .../RunStrategyOnNodeUserAction.java | 2 +- .../gui/actions/useractions/UserAction.java | 2 +- .../ilkd/key/gui/docking/DockingLayout.java | 2 +- .../gui/extension/api/ContextMenuAdapter.java | 2 +- .../gui/extension/api/KeYGuiExtension.java | 2 +- .../api/KeyboardShortcutAdapter.java | 2 +- .../extension/impl/KeYGuiExtensionFacade.java | 2 +- .../key/gui/extension/impl/TestExtension.java | 2 +- .../de/uka/ilkd/key/gui/help/HelpFacade.java | 2 +- .../uka/ilkd/key/gui/join/JoinMenuItem.java | 2 +- .../LemmataAutoModeOptions.java | 6 +- .../key/gui/mergerule/MergeRuleMenuItem.java | 2 +- .../key/gui/nodeviews/CurrentGoalView.java | 2 +- .../nodeviews/CurrentGoalViewListener.java | 2 +- .../gui/nodeviews/CurrentGoalViewMenu.java | 2 +- .../gui/nodeviews/DragNDropInstantiator.java | 2 +- .../key/gui/nodeviews/SequentViewDock.java | 2 +- .../key/gui/nodeviews/TacletDescriber.java | 2 +- .../gui/notification/NotificationManager.java | 2 +- .../OriginTermLabelVisualizer.java | 2 +- .../gui/originlabels/OriginTermLabelsExt.java | 2 +- .../ActionHistoryExtension.java | 6 +- .../action_history/StateChangeListener.java | 2 +- .../key/gui/plugins/javac/JavacExtension.java | 6 +- .../gui/prooftree/ProofTreePopupFactory.java | 2 +- .../ilkd/key/gui/prooftree/ProofTreeView.java | 8 +- .../uka/ilkd/key/gui/smt/ProgressDialog.java | 2 +- .../uka/ilkd/key/gui/smt/SolverListener.java | 2 +- .../ilkd/key/gui/sourceview/SourceView.java | 4 +- .../AbstractMediatorUserInterfaceControl.java | 8 +- .../ui/ConsoleProofObligationSelector.java | 2 +- .../key/ui/ConsoleUserInterfaceControl.java | 6 +- .../uka/ilkd/key/ui/MediatorProofControl.java | 2 +- .../key/{ => ui}/core/InterruptListener.java | 2 +- .../ilkd/key/{ => ui}/core/KeYMediator.java | 4 +- .../key/{ => ui}/core/KeYSelectionEvent.java | 2 +- .../{ => ui}/core/KeYSelectionListener.java | 2 +- .../key/{ => ui}/core/KeYSelectionModel.java | 2 +- .../de/uka/ilkd/key/{ => ui}/core/Log.java | 2 +- .../de/uka/ilkd/key/{ => ui}/core/Main.java | 6 +- .../uka/ilkd/key/{ => ui}/core/Watchdog.java | 4 +- .../key/{ => ui}/proof/io/ProblemLoader.java | 6 +- .../key/{ => ui}/proof/mgt/BasicTask.java | 4 +- .../ilkd/key/{ => ui}/proof/mgt/EnvNode.java | 4 +- .../proof/mgt/ProofAggregateTask.java | 4 +- .../key/{ => ui}/proof/mgt/TaskTreeModel.java | 3 +- .../key/{ => ui}/proof/mgt/TaskTreeNode.java | 4 +- .../key/ui/util}/CheckedProcessBuilder.java | 2 +- .../ilkd/key/{ => ui}/util/CommandLine.java | 5 +- .../{ => ui}/util/CommandLineException.java | 2 +- .../key/{ => ui}/util/PreferenceSaver.java | 2 +- .../uka/ilkd/key/ui/util}/SwingUtil.java | 2 +- .../key/{ => ui}/util/ThreadUtilities.java | 2 +- .../ilkd/key/{ => ui}/util/XMLResources.java | 2 +- .../java/de/uka/ilkd/key/gui/ChaosMonkey.java | 6 +- .../gui/plugins/caching/CachingExtension.java | 6 +- .../plugins/caching/CachingPruneHandler.java | 2 +- .../DefaultReferenceSearchDialogListener.java | 2 +- .../caching/ReferenceSearchButton.java | 6 +- .../caching/ReferenceSearchDialog.java | 2 +- .../plugins/caching/ReferenceSearchTable.java | 2 +- .../caching/actions/CloseAllByReference.java | 2 +- .../caching/actions/CloseByReference.java | 2 +- .../caching/actions/CopyReferencedProof.java | 2 +- .../caching/actions/GotoReferenceAction.java | 2 +- .../RemoveCachingInformationAction.java | 2 +- .../exploration/ExplorationExtension.java | 6 +- .../exploration/ExplorationModeModel.java | 3 +- .../exploration/ProofExplorationService.java | 2 +- .../actions/ToggleExplorationAction.java | 4 +- .../exploration/ui/ExplorationStepsList.java | 2 +- .../org/key_project/proofmanagement/Main.java | 4 +- .../java/org/key_project/slicing/Main.java | 6 +- .../key_project/slicing/SlicingExtension.java | 6 +- .../slicing/ui/SliceToFixedPointDialog.java | 6 +- .../slicing/ui/SlicingLeftPanel.java | 8 +- .../key/gui/testgen/CounterExampleAction.java | 12 +- .../ilkd/key/gui/testgen/TGInfoDialog.java | 4 +- .../de/uka/ilkd/key/gui/testgen/TGWorker.java | 8 +- .../key/gui/testgen/TestGenerationAction.java | 4 +- .../key/gui/testgen/TestgenExtension.java | 4 +- .../key/gui/testgen/TestgenOptionsPanel.java | 2 +- .../service/DefaultProgramModelInfo.java | 2 +- 297 files changed, 793 insertions(+), 937 deletions(-) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/AbstractUpdateExtractor.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/AbstractWriter.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/ExecutionNodePreorderIterator.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/ExecutionNodeReader.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/ExecutionNodeSymbolicLayoutExtractor.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/ExecutionNodeWriter.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/ExecutionVariableExtractor.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/SymbolicExecutionTreeBuilder.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/SymbolicLayoutExtractor.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/SymbolicLayoutReader.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/SymbolicLayoutWriter.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/TruthValueTracingUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/BlockContractValidityTermLabelUpdate.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/FormulaTermLabelMerger.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/FormulaTermLabelRefactoring.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/FormulaTermLabelUpdate.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/LoopBodyTermLabelUpdate.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/LoopInvariantNormalBehaviorTermLabelUpdate.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/RemoveInCheckBranchesTermLabelRefactoring.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/StayOnFormulaTermLabelPolicy.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{rule => symbex}/label/SymbolicExecutionTermLabelUpdate.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionAuxiliaryContract.java (87%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionBaseMethodReturn.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionBlockStartNode.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionBranchCondition.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionBranchStatement.java (79%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionConstraint.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionElement.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionExceptionalMethodReturn.java (76%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionJoin.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionLink.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionLoopCondition.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionLoopInvariant.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionLoopStatement.java (79%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionMethodCall.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionMethodReturn.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionMethodReturnValue.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionNode.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionOperationContract.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionStart.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionStatement.java (77%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionTermination.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionValue.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/IExecutionVariable.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/ITreeSettings.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionBlockStartNode.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionElement.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionMethodReturn.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionNode.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionValue.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/AbstractExecutionVariable.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionAllArrayIndicesVariable.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionAuxiliaryContract.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionBranchCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionBranchStatement.java (82%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionConstraint.java (88%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionExceptionalMethodReturn.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionJoin.java (81%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionLink.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionLoopCondition.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionLoopInvariant.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionLoopStatement.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionMethodCall.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionMethodReturn.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionMethodReturnValue.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionOperationContract.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionStart.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionStatement.java (76%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionTermination.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/ExecutionVariable.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/model/impl/TreeSettings.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/IModelSettings.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicAssociation.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicAssociationValueContainer.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicElement.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicEquivalenceClass.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicLayout.java (80%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicObject.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicState.java (81%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/ISymbolicValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/AbstractElement.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/AbstractSymbolicAssociationValueContainer.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/ModelSettings.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicAssociation.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicEquivalenceClass.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicLayout.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicObject.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicState.java (80%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/object_model/impl/SymbolicValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/po/ProgramMethodPO.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/po/ProgramMethodSubsetPO.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/po/TruthValuePOExtension.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/profile/SimplifyTermProfile.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/profile/SymbolicExecutionJavaProfile.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{ => symbex}/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/rule/AbstractSideProofRule.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/rule/ModalitySideProofRule.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/rule/QuerySideProofRule.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/slicing/AbstractBackwardSlicer.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/slicing/AbstractSlicer.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/slicing/Access.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/slicing/Location.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/slicing/ThinBackwardSlicer.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/AbstractCallStackBasedStopCondition.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/BreakpointStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/CompoundStopCondition.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/CutHeapObjectsFeature.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/CutHeapObjectsTermGenerator.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{ => symbex}/strategy/IBreakpointStopCondition.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/SimplifyTermStrategy.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/SymbolicExecutionBreakpointStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/SymbolicExecutionGoalChooser.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/SymbolicExecutionGoalChooserBuilder.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/SymbolicExecutionStrategy.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/AbstractBreakpoint.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/AbstractConditionalBreakpoint.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/AbstractHitCountBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/ExceptionBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/FieldWatchpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/IBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/KeYWatchpoint.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/LineBreakpoint.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/MethodBreakpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/DefaultEntry.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/EqualsHashCodeResetter.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/SideProofStore.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/SymbolicExecutionEnvironment.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/SymbolicExecutionSideProofUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/SymbolicExecutionUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/event/ISideProofStoreListener.java (78%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbolic_execution => symbex}/util/event/SideProofStoreEvent.java (86%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/macros/SemanticsBlastingMacro.java (98%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/macros/TestGenMacro.java (94%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/settings/TestGenerationSettings.java (97%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/counterexample/AbstractCounterExampleGenerator.java (98%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/counterexample/AbstractSideProofCounterExampleGenerator.java (96%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/testgen/AbstractTestGenerator.java (98%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/testgen/MemoryTestGenerationLog.java (96%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/testgen/StopRequest.java (83%) rename key.core.testgen/src/main/java/de/uka/ilkd/key/{ => testgen}/smt/testgen/TestGenerationLog.java (88%) rename key.core/src/main/java/{recoder/service => de/uka/ilkd/key/java}/KeYCrossReferenceSourceInfo.java (99%) delete mode 100644 key.core/src/main/java/de/uka/ilkd/key/parser/WarningException.java delete mode 100644 key.ui/src/main/java/de/uka/ilkd/key/gui/actions/SystemInfoAction.java rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/InterruptListener.java (92%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/KeYMediator.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/KeYSelectionEvent.java (97%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/KeYSelectionListener.java (96%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/KeYSelectionModel.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/Log.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/Main.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/core/Watchdog.java (98%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/io/ProblemLoader.java (96%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/mgt/BasicTask.java (94%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/mgt/EnvNode.java (91%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/mgt/ProofAggregateTask.java (94%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/mgt/TaskTreeModel.java (97%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/proof/mgt/TaskTreeNode.java (83%) rename key.ui/src/main/java/{org/key_project/util/java => de/uka/ilkd/key/ui/util}/CheckedProcessBuilder.java (98%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/util/CommandLine.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/util/CommandLineException.java (97%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/util/PreferenceSaver.java (99%) rename key.ui/src/main/java/{org/key_project/util/java => de/uka/ilkd/key/ui/util}/SwingUtil.java (99%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/util/ThreadUtilities.java (98%) rename key.ui/src/main/java/de/uka/ilkd/key/{ => ui}/util/XMLResources.java (98%) 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 904292a5548..d5ec4df5fce 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 d4a12b894c9..6b5f444241e 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 8773f536ec1..c7a17d7434b 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..25df497e770 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; @@ -19,6 +19,7 @@ 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; import org.key_project.util.collection.ImmutableSLList; 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..633c388c800 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; @@ -13,6 +13,7 @@ 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; import org.key_project.util.collection.ImmutableSLList; 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..51a63273675 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,7 @@ * 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 87deb6675f6..33c02a47dc7 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 f4544824321..51bd46cb054 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 6700f2db57f..7734c977c8e 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 a8e23732cb9..ba6940e9bee 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/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 1405ff15f6c..d968d2fc89d 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/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 5126e429d94..94b039a3c1a 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; @@ -12,8 +12,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..d7318845794 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.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.rule.label.StayOnOperatorTermLabelPolicy; -import de.uka.ilkd.key.rule.label.SymbolicExecutionTermLabelUpdate; +import de.uka.ilkd.key.symbex.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.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 b4f25f305e1..59dd79c3053 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; @@ -24,7 +24,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 de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; 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 98% 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 6c1a1fa4212..16f90b1a972 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; @@ -23,8 +23,8 @@ import de.uka.ilkd.key.rule.IBuiltInRuleApp; 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.symbolic_execution.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; 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 727b69d9f19..673f3364fe7 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; import java.util.Set; @@ -24,7 +24,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 de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; 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..3ae9f675d35 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,8 @@ 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.IBreakpointStopCondition; +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..0cdda227ac2 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,8 @@ 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.IBreakpointStopCondition; +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 639365d2b37..f508bb6dce8 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.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/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 235a298b454..60ecb3b7955 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 766547c958c..91edc5d72ff 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,8 +30,8 @@ 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.symbex.profile.SimplifyTermProfile; +import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; import de.uka.ilkd.key.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; import de.uka.ilkd.key.util.Triple; 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 0be6244d625..492e266a69a 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/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java b/key.core.symbolic_execution/src/test/java/de/uka/ilkd/key/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java index 95c6da8fe33..448082fdf51 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/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java @@ -20,7 +20,7 @@ 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.symbex.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; 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..4bda83f01c0 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,7 +21,7 @@ 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.testgen.settings.TestGenerationSettings; import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.lang.SMTSort; import de.uka.ilkd.key.smt.model.Model; 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 c652b73a373..c3b0d98526f 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,12 +20,12 @@ 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.testgen.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.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; 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..571936dde7d 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,18 +1,21 @@ /* 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.testgen.settings.TestGenerationSettings; import de.uka.ilkd.key.strategy.NumberRuleAppCost; import de.uka.ilkd.key.strategy.RuleAppCost; import de.uka.ilkd.key.strategy.Strategy; 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 96d99994211..3c96bec5743 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,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.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..ec09a9a3400 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,7 @@ 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.testgen.macros.SemanticsBlastingMacro; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.init.ProofInputException; import de.uka.ilkd.key.prover.ProverTaskListener; 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..04ea9ab279b 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,8 @@ 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.testgen.macros.SemanticsBlastingMacro; +import de.uka.ilkd.key.testgen.macros.TestGenMacro; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; @@ -33,7 +33,7 @@ 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.testgen.settings.TestGenerationSettings; import de.uka.ilkd.key.smt.*; import de.uka.ilkd.key.smt.model.Model; import de.uka.ilkd.key.smt.solvertypes.SolverType; 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/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..d17b0cf40e5 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,7 @@ 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.testgen.macros.SemanticsBlastingMacro; import de.uka.ilkd.key.macros.TryCloseMacro; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; 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..5ded65d639e 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,7 +7,7 @@ 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.testgen.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; 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 65dcb2554a8..094de25f254 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 { @@ -221,7 +222,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 04f81ecef57..b9d6a84ff1e 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..3aaa0c5e16b 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 @@ -29,7 +29,7 @@ import recoder.io.DataLocation; import recoder.java.CompilationUnit; import recoder.java.JavaProgramFactory; -import recoder.service.KeYCrossReferenceSourceInfo; +import de.uka.ilkd.key.java.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..ae3c0d2ca5a 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 @@ -9,7 +9,7 @@ import recoder.CrossReferenceServiceConfiguration; import recoder.ProgramFactory; import recoder.io.SourceFileRepository; -import recoder.service.KeYCrossReferenceSourceInfo; +import de.uka.ilkd.key.java.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..6ec6ea2c2f8 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 @@ -10,7 +10,7 @@ import recoder.java.declaration.VariableSpecification; import recoder.java.reference.TypeReference; import recoder.java.reference.UncollatedReferenceQualifier; -import recoder.service.KeYCrossReferenceSourceInfo; +import de.uka.ilkd.key.java.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 a80a85e8728..e536f5e3054 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 @@ -33,7 +33,6 @@ import org.key_project.util.collection.ImmutableSet; import org.key_project.util.collection.Pair; -import antlr.RecognitionException; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.RuleContext; import org.antlr.v4.runtime.Token; @@ -796,7 +795,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/proof/io/AbstractProblemLoader.java b/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java index 8417e0fbbc3..82fd458fc78 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java +++ b/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java @@ -44,7 +44,6 @@ import org.key_project.util.java.IOUtil; import org.key_project.util.reflection.ClassLoaderUtil; -import org.antlr.runtime.MismatchedTokenException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -379,6 +378,8 @@ private Throwable unwrap(Throwable e) { */ protected ProblemLoaderException recoverParserErrorMessage(Exception e) { // try to resolve error message + + /* weigl These are exception from antlr3, these should not happen anymore final Throwable c0 = unwrap(e); if (c0 instanceof org.antlr.runtime.RecognitionException re) { final org.antlr.runtime.Token occurrence = re.token; // may be null @@ -386,14 +387,12 @@ protected ProblemLoaderException recoverParserErrorMessage(Exception e) { if (c0 instanceof org.antlr.runtime.MissingTokenException) { final org.antlr.runtime.MissingTokenException mte = (org.antlr.runtime.MissingTokenException) c0; - // TODO: other commonly missed tokens final String readable = missedErrors.get(mte.expecting); final String token = readable == null ? "token id " + mte.expecting : readable; final String msg = "Syntax error: missing " + token + (occurrence == null ? "" : " at " + occurrence.getText()) + " statement (" + mte.input.getSourceName() + ":" + mte.line + ")"; return new ProblemLoaderException(this, msg, mte); - // TODO other ANTLR exceptions } else { final org.antlr.runtime.MismatchedTokenException mte = (MismatchedTokenException) c0; @@ -405,7 +404,7 @@ protected ProblemLoaderException recoverParserErrorMessage(Exception e) { return new ProblemLoaderException(this, msg, mte); } } - } + }*/ // default return new ProblemLoaderException(this, "Loading proof input failed", e); } 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 c04b662a9e7..c70ed4487e7 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 @@ -29,6 +29,7 @@ import de.uka.ilkd.key.util.MiscTools; import de.uka.ilkd.key.util.Triple; +import org.antlr.v4.runtime.Token; import org.key_project.logic.Name; import org.key_project.logic.Named; import org.key_project.logic.TermCreationException; @@ -37,7 +38,6 @@ import org.key_project.util.collection.ImmutableSLList; import org.key_project.util.collection.Pair; -import org.antlr.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/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..be2b2f1858a 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,7 @@ 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.ui.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; 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 36f80c07666..61f5b480e9e 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..169d6cb6f40 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 @@ -13,7 +13,7 @@ import de.uka.ilkd.key.rule.OneStepSimplifier; import de.uka.ilkd.key.rule.Taclet; import de.uka.ilkd.key.util.MiscTools; -import de.uka.ilkd.key.util.XMLResources; +import de.uka.ilkd.key.ui.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..bc010ce84e4 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,10 @@ 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.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.gui.extension.api.DefaultContextMenuKind; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.extension.api.TabPanel; @@ -25,8 +25,8 @@ 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.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 6e36b867321..0824a8e538b 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 @@ -39,7 +39,7 @@ 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 de.uka.ilkd.key.ui.util.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 1e5dc67fef0..98b69815481 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..4b93b90b6aa 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,7 +18,7 @@ import javax.swing.text.SimpleAttributeSet; import javax.swing.text.StyleConstants; -import de.uka.ilkd.key.core.Log; +import de.uka.ilkd.key.ui.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; 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 e25b78cf31f..bd44442cb02 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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 +66,8 @@ 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.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..8f3f7f0f4b6 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,7 +8,7 @@ import java.util.stream.Stream; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..733abac2e5a 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,7 @@ import java.util.*; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..bb597af2505 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,8 @@ 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.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.macros.ProofMacroFinishedInfo; 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 54a0ddc0f86..69354de636d 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,7 @@ import javax.swing.*; import javax.swing.border.TitledBorder; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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 6c94d762e00..0fc639c3455 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 @@ -16,9 +16,9 @@ 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.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionModel; import de.uka.ilkd.key.java.Position; import de.uka.ilkd.key.macros.scripts.ProofScriptEngine; import de.uka.ilkd.key.macros.scripts.ScriptException; 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..d8daebd38a0 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,7 +12,7 @@ import java.util.stream.Collectors; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.settings.Configuration; import de.uka.ilkd.key.settings.PathConfig; 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..e12b37c7517 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,9 +11,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.event.ProofDisposedEvent; 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 ca11ccaa58e..fb57c55a6af 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..6461297ead1 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,7 @@ 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.ui.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; 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..a841228699a 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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.ui.proof.mgt.BasicTask; +import de.uka.ilkd.key.ui.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.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 f9066745de7..90b09071e80 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,8 +17,7 @@ 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.actions.ExitMainAction; +import de.uka.ilkd.key.ui.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; @@ -44,18 +43,19 @@ 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.proof.io.ProblemLoader; import de.uka.ilkd.key.util.KeYConstants; import de.uka.ilkd.key.util.MiscTools; -import de.uka.ilkd.key.util.ThreadUtilities; +import de.uka.ilkd.key.ui.util.ThreadUtilities; import org.key_project.util.collection.ImmutableSet; import org.key_project.util.collection.Pair; -import org.key_project.util.java.SwingUtil; +import de.uka.ilkd.key.ui.util.SwingUtil; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sun.misc.Signal; +//import sun.misc.Signal; /** * Implementation of {@link UserInterfaceControl} which controls the {@link MainWindow} with the @@ -80,7 +80,8 @@ public WindowUserInterfaceControl(MainWindow mainWindow) { completions.add(new BlockContractExternalCompletion(mainWindow)); completions.add(MergeRuleCompletion.INSTANCE); try { - Signal.handle(new Signal("INT"), sig -> { + /* 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(); @@ -88,7 +89,7 @@ public WindowUserInterfaceControl(MainWindow mainWindow) { LOGGER.warn("Caught SIGINT, exiting..."); new ExitMainAction(mainWindow).exitMainWithoutInteraction(); } - }); + });*/ } catch (Exception e) { // the above is optional functionality and may not work on every OS } 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..81e6bf3900e 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..50ee6434762 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,8 +8,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; 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..a24b9a1a0ec 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,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Goal; 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..3563159a1ad 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,8 +5,8 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.HeatmapOptionsDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; 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 b7df2f6c0b5..697c1e1788e 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 @@ -7,8 +7,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Proof; 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..a4f62ab75be 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; @@ -14,7 +13,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..01a6ed9c2ac 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,7 @@ import javax.swing.JComponent; import javax.swing.KeyStroke; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..f87278d5197 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,9 +7,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; 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..08ae9917602 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,7 +6,7 @@ import java.awt.event.ActionEvent; import java.io.File; -import de.uka.ilkd.key.core.Main; +import de.uka.ilkd.key.ui.core.Main; import de.uka.ilkd.key.gui.ExampleChooser; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; 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..0dd0c24e760 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,8 +7,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofSelectionDialog; 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..e47245d6d5d 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,8 +5,8 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofManagementDialog; import de.uka.ilkd.key.gui.fonticons.IconFactory; 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 c9287ec7252..2cb622ede03 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,7 +7,7 @@ import java.io.File; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; 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 3eb39a51170..3adfaae705a 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 @@ -11,7 +11,7 @@ import javax.swing.JDialog; import javax.swing.JTextArea; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofScriptWorker; import de.uka.ilkd.key.java.Position; 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..3b2e7a0a766 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,8 +6,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Node; 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 ceaba6d1bb1..5fae29ec725 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,12 +11,12 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.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.proof.io.ProblemLoader; import de.uka.ilkd.key.ui.MediatorProofControl; import org.jspecify.annotations.NonNull; 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..7565e51504c 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,7 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.smt.SolverListener; import de.uka.ilkd.key.proof.Proof; 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..b2532bba1da 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,8 +5,8 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; import de.uka.ilkd.key.proof.Proof; 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 1d87d1712ac..1e1ea9a4728 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 @@ -21,7 +21,7 @@ import javax.swing.filechooser.FileFilter; import javax.swing.text.html.HTMLEditorKit; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.parser.Location; 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..ae1ac16b6f5 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,8 +12,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; 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..4af0a51a0d9 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; /** 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..28a8c05ef75 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.proof.Proof; 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..9d26786318b 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.proof.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..61064cae5f8 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.macros.ProofMacro; import de.uka.ilkd.key.proof.Proof; 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..234e0ef373e 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,7 +7,7 @@ import java.util.List; import java.util.stream.Collectors; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; 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..83b7096a959 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; 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..cedbddfa2ff 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,7 @@ import java.util.HashSet; import java.util.Iterator; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.smt.SolverListener; import de.uka.ilkd.key.logic.PosInOccurrence; import de.uka.ilkd.key.proof.Goal; 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..6e1e1717e55 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,7 +3,7 @@ * 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.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; 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..935737bd4f6 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,7 +6,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; /** 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 68fa871169e..8b2d2a19cff 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,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.MainWindowAction; 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 5aa68721268..99974566b68 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,7 +7,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.proof.Node; import de.uka.ilkd.key.proof.Proof; 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..5bd366e366e 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,7 @@ import javax.swing.JMenu; import javax.swing.JToolBar; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.GoalList; import de.uka.ilkd.key.gui.InfoView; import de.uka.ilkd.key.gui.MainWindow; 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..2eb80fdd8f9 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,7 +8,7 @@ import java.util.Objects; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.GoalList; import de.uka.ilkd.key.gui.InfoView; import de.uka.ilkd.key.gui.StrategySelectionView; 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..1380b37d2ed 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,7 @@ import java.util.stream.Stream; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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 549aedbd1d6..1e6a6dd588b 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,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..071afe1da82 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 @@ -14,7 +14,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..4c2569e9b58 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,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..719dc0b7f98 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.ui.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.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..4df44491d2e 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,7 @@ import java.awt.event.ActionEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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 5704821655d..dd7d6780210 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,7 @@ import java.util.LinkedList; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.ApplyTacletDialog; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.MainWindow; 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 16a2d2d2ac8..2f82c4ef309 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,7 +8,7 @@ import java.awt.event.MouseEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.ProofMacroMenu; import de.uka.ilkd.key.pp.PosInSequent; import de.uka.ilkd.key.rule.BuiltInRule; 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..4ca7179c2df 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,7 @@ import java.util.Set; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..1cb96d24a40 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,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; 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..a037dc0cdab 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,7 @@ import java.awt.event.ActionEvent; import javax.swing.*; -import de.uka.ilkd.key.core.KeYSelectionModel; +import de.uka.ilkd.key.ui.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; 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 13dfee01edf..b33663adebc 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,7 +5,7 @@ import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.logic.op.*; import de.uka.ilkd.key.pp.SequentViewLogicPrinter; 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..f7d65d3cdcd 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,7 +8,7 @@ import javax.swing.JFrame; import de.uka.ilkd.key.control.AutoModeListener; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.notification.events.NotificationEvent; import de.uka.ilkd.key.proof.ProofEvent; 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..d1e5d6678f2 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,7 @@ import javax.swing.tree.TreePath; import de.uka.ilkd.key.control.TermLabelVisibilityManager; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.nodeviews.SequentView; 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..ad6d8e5c1bc 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,7 @@ import java.util.stream.Collectors; import javax.swing.Action; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.actions.KeyAction; 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..93de81a637b 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..e8257aee8fe 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,7 @@ import java.util.List; import de.uka.ilkd.key.control.InteractionListener; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..95c1b62e205 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.PositionedIssueString; 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..b26931e8f5e 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,7 @@ import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.InspectorForDecisionPredicates; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofMacroMenu; 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 d0361823e12..f805151b45d 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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 +38,7 @@ 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.util.ThreadUtilities; import org.key_project.util.collection.ImmutableList; 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..bcc5352bd97 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 @@ -18,7 +18,7 @@ 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 c68bbc9fbeb..d2cd78a87b0 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,7 @@ import java.util.Timer; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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 1ee7b710b81..56cd239151a 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,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..121a04f0c1e 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,8 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.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 +24,7 @@ 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.ui.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; @@ -34,7 +34,7 @@ import de.uka.ilkd.key.prover.impl.DefaultTaskStartedInfo; import de.uka.ilkd.key.util.KeYResourceManager; import de.uka.ilkd.key.util.MiscTools; -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/ui/ConsoleProofObligationSelector.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/ConsoleProofObligationSelector.java index b86deb6382c..33b217c3ffc 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,7 @@ import java.util.ArrayList; import java.util.List; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.ProofAggregate; import de.uka.ilkd.key.proof.init.InitConfig; 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 c0cf68fe6c7..7cb937019a3 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 @@ -11,8 +11,8 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.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; @@ -30,7 +30,7 @@ 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.ui.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; 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..f0a3f179713 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,7 @@ 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.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofMacroWorker; 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 d279e9f33ee..7fdcbaed032 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 b3a72e3f867..a49a61642d8 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..cdbaee3894c 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,17 +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.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.ui.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; 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/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/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java b/key.ui/src/test/java/de/uka/ilkd/key/gui/ChaosMonkey.java index fad4e66973a..b5b48e45fe7 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,15 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.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.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 c0f7f1d813c..5bb6def7d49 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..e2139ccc555 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,7 @@ * 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.ui.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; 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..355cf5046e7 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,7 +6,7 @@ import java.util.function.Consumer; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.ShowProofStatistics; 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..2d23ff25f1f 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,9 +8,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.colors.ColorSettings; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; 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..b946ff02334 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 @@ -11,7 +11,7 @@ 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..456d74cf57f 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,7 +12,7 @@ import javax.swing.event.TableModelListener; import javax.swing.table.TableModel; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; 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..5364c3fd656 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,7 +8,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..126f2bdf0fd 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,7 +9,7 @@ import java.util.List; import javax.swing.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..0ea361c8c2d 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,7 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; 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..fd1fd85e384 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,7 +5,7 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..5c04662034e 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,7 +5,7 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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 0ea1280b2bb..e30b4e27ea6 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..2cea7859207 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 @@ -15,6 +15,7 @@ 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..36b6ce7b74f 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,7 @@ import java.util.Objects; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.*; import de.uka.ilkd.key.logic.op.SchemaVariable; 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..0821e0c5f46 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,8 +5,8 @@ import java.awt.event.ActionEvent; -import de.uka.ilkd.key.core.KeYSelectionEvent; -import de.uka.ilkd.key.core.KeYSelectionListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.actions.KeyAction; 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 cfc68cf0b41..4da7d51df4e 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,7 @@ import javax.swing.*; import javax.swing.tree.*; -import de.uka.ilkd.key.core.KeYMediator; +import de.uka.ilkd.key.ui.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; 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..08ce6e0aae2 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.ui.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.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 13b32c6c07f..ae4b9b730a3 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..3941fa2249f 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,9 +18,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.configuration.Config; import de.uka.ilkd.key.proof.Node; 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 6af1fb82d77..8525ae47b76 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,9 @@ 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.ui.core.KeYMediator; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; @@ -32,7 +32,7 @@ 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.ui.proof.io.ProblemLoader; import de.uka.ilkd.key.proof.io.ProblemLoaderControl; import org.key_project.slicing.DependencyTracker; 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..b89e87f6759 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,22 +9,22 @@ 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.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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.testgen.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.testgen.smt.counterexample.AbstractCounterExampleGenerator; +import de.uka.ilkd.key.testgen.smt.counterexample.AbstractSideProofCounterExampleGenerator; import de.uka.ilkd.key.smt.solvertypes.SolverTypes; import org.slf4j.Logger; 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..320ecc69137 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,8 @@ 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.ui.core.InterruptListener; +import de.uka.ilkd.key.ui.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 +18,8 @@ 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; /** * 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..4f1aff0a97c 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,8 @@ 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.ui.core.KeYSelectionEvent; +import de.uka.ilkd.key.ui.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; 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..c445c512467 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.ui.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 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 cd48ec0e173..c9800b533e0 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); From a85a022d0ab10035220054baf2c6863d7be94f2d Mon Sep 17 00:00:00 2001 From: Alexander Weigl Date: Sun, 31 Mar 2024 23:03:43 +0200 Subject: [PATCH 2/4] add module-info.java --- .../src/main/java/module-info.java | 7 + .../src/main/java/module-info.java | 10 ++ key.core.rifl/src/main/java/module-info.java | 13 ++ .../src/main/java/module-info.java | 11 ++ .../src/main/java/module-info.java | 26 ++++ key.core/src/main/java/module-info.java | 146 ++++++++++++++++++ .../src/main/java/module-info.java | 9 ++ key.ui/src/main/java/module-info.java | 34 ++++ keyext.caching/src/main/java/module-info.java | 7 + .../src/main/java/module-info.java | 7 + .../src/main/java/module-info.java | 7 + keyext.slicing/src/main/java/module-info.java | 7 + .../src/main/java/module-info.java | 7 + recoder/src/main/java/module-info.java | 27 ++++ 14 files changed, 318 insertions(+) create mode 100644 key.core.example/src/main/java/module-info.java create mode 100644 key.core.proof_references/src/main/java/module-info.java create mode 100644 key.core.rifl/src/main/java/module-info.java create mode 100644 key.core.symbolic_execution.example/src/main/java/module-info.java create mode 100644 key.core.symbolic_execution/src/main/java/module-info.java create mode 100644 key.core/src/main/java/module-info.java create mode 100644 key.removegenerics/src/main/java/module-info.java create mode 100644 key.ui/src/main/java/module-info.java create mode 100644 keyext.caching/src/main/java/module-info.java create mode 100644 keyext.exploration/src/main/java/module-info.java create mode 100644 keyext.proofmanagement/src/main/java/module-info.java create mode 100644 keyext.slicing/src/main/java/module-info.java create mode 100644 keyext.ui.testgen/src/main/java/module-info.java create mode 100644 recoder/src/main/java/module-info.java diff --git a/key.core.example/src/main/java/module-info.java b/key.core.example/src/main/java/module-info.java new file mode 100644 index 00000000000..1589f3563f6 --- /dev/null +++ b/key.core.example/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.core.example { +} \ No newline at end of file diff --git a/key.core.proof_references/src/main/java/module-info.java b/key.core.proof_references/src/main/java/module-info.java new file mode 100644 index 00000000000..0eb1124f190 --- /dev/null +++ b/key.core.proof_references/src/main/java/module-info.java @@ -0,0 +1,10 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.proof_references { + requires org.key_project.core; + requires org.key_project.ncore; + requires org.key_project.util; +} \ No newline at end of file diff --git a/key.core.rifl/src/main/java/module-info.java b/key.core.rifl/src/main/java/module-info.java new file mode 100644 index 00000000000..db958b87368 --- /dev/null +++ b/key.core.rifl/src/main/java/module-info.java @@ -0,0 +1,13 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.core.rifl { + exports de.uka.ilkd.key.util.rifl; + requires org.key_project.core; + requires key.recoder; + requires java.xml; + requires org.slf4j; + requires org.key_project.util; +} \ No newline at end of file diff --git a/key.core.symbolic_execution.example/src/main/java/module-info.java b/key.core.symbolic_execution.example/src/main/java/module-info.java new file mode 100644 index 00000000000..7d5f55b3703 --- /dev/null +++ b/key.core.symbolic_execution.example/src/main/java/module-info.java @@ -0,0 +1,11 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module key.core.symbolic_execution.example { + requires transitive org.key_project.symbolic_execution; + requires org.key_project.core; + requires org.key_project.util; + requires org.slf4j; +} \ No newline at end of file diff --git a/key.core.symbolic_execution/src/main/java/module-info.java b/key.core.symbolic_execution/src/main/java/module-info.java new file mode 100644 index 00000000000..31786bf48f9 --- /dev/null +++ b/key.core.symbolic_execution/src/main/java/module-info.java @@ -0,0 +1,26 @@ +import de.uka.ilkd.key.proof.init.POExtension; +import de.uka.ilkd.key.symbex.po.TruthValuePOExtension; + +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.symbolic_execution { + exports de.uka.ilkd.key.symbex; + exports de.uka.ilkd.key.symbex.model; + exports de.uka.ilkd.key.symbex.po; + exports de.uka.ilkd.key.symbex.profile; + exports de.uka.ilkd.key.symbex.strategy; + exports de.uka.ilkd.key.symbex.strategy.breakpoint; + exports de.uka.ilkd.key.symbex.util; + requires java.xml; + requires org.key_project.core; + requires org.key_project.ncore; + requires org.key_project.util; + requires java.desktop; + requires org.slf4j; + requires org.jspecify; + + provides POExtension with TruthValuePOExtension; +} \ No newline at end of file diff --git a/key.core/src/main/java/module-info.java b/key.core/src/main/java/module-info.java new file mode 100644 index 00000000000..ab61a1fe083 --- /dev/null +++ b/key.core/src/main/java/module-info.java @@ -0,0 +1,146 @@ +import de.uka.ilkd.key.macros.ProofMacro; +import de.uka.ilkd.key.macros.scripts.ProofScriptCommand; +import de.uka.ilkd.key.proof.init.DefaultProfileResolver; + +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.core { + exports de.uka.ilkd.key.java; + exports de.uka.ilkd.key.java.abstraction; + exports de.uka.ilkd.key.logic.op; + exports de.uka.ilkd.key.proof; + exports de.uka.ilkd.key.proof.init; + exports de.uka.ilkd.key.rule; + exports de.uka.ilkd.key.speclang; + exports de.uka.ilkd.key.util; + exports de.uka.ilkd.key.java.statement; + exports de.uka.ilkd.key.java.expression; + exports de.uka.ilkd.key.java.reference; + exports de.uka.ilkd.key.logic; + exports de.uka.ilkd.key.java.expression.operator; + exports de.uka.ilkd.key.proof.mgt; + exports de.uka.ilkd.key.rule.inst; + exports de.uka.ilkd.key.java.recoderext; + exports de.uka.ilkd.key.logic.label; + exports de.uka.ilkd.key.prover.impl; + exports de.uka.ilkd.key.strategy; + exports de.uka.ilkd.key.pp; + exports de.uka.ilkd.key.speclang.jml.translation; + exports de.uka.ilkd.key.speclang.njml; + exports de.uka.ilkd.key.java.visitor; + exports de.uka.ilkd.key.control; + exports de.uka.ilkd.key.ldt; + exports de.uka.ilkd.key.rule.tacletbuilder; + exports de.uka.ilkd.key.settings; + exports de.uka.ilkd.key.rule.merge; + exports de.uka.ilkd.key.java.declaration; + exports de.uka.ilkd.key.logic.sort; + exports de.uka.ilkd.key.proof.io; + exports de.uka.ilkd.key.logic.equality; + exports de.uka.ilkd.key.rule.label; + exports de.uka.ilkd.key.macros; + exports de.uka.ilkd.key.macros.scripts; + exports de.uka.ilkd.key.prover; + exports de.uka.ilkd.key.strategy.feature; + exports de.uka.ilkd.key.strategy.definition; + exports de.uka.ilkd.key.speclang.translation; + exports de.uka.ilkd.key.proof.rulefilter; + exports de.uka.ilkd.key.strategy.feature.instantiator; + exports de.uka.ilkd.key.strategy.termProjection; + exports de.uka.ilkd.key.strategy.termfeature; + exports de.uka.ilkd.key.strategy.termgenerator; + exports de.uka.ilkd.key.control.instantiation_model; + exports de.uka.ilkd.key.parser; + exports de.uka.ilkd.key.proof.event; + exports de.uka.ilkd.key.proof.join; + exports org.key_project.proof; + exports de.uka.ilkd.key.util.mergerule; + exports de.uka.ilkd.key.proof.reference; + exports de.uka.ilkd.key.smt; + exports de.uka.ilkd.key.smt.solvertypes; + exports de.uka.ilkd.key.taclettranslation.assumptions; + exports de.uka.ilkd.key.smt.model; + exports de.uka.ilkd.key.rule.merge.procedures; + exports de.uka.ilkd.key.axiom_abstraction.predicateabstraction; + exports de.uka.ilkd.key.control.event; + exports de.uka.ilkd.key.informationflow.macros; + exports de.uka.ilkd.key.proof.io.consistency; + exports de.uka.ilkd.key.taclettranslation.lemma; + exports de.uka.ilkd.key.nparser; + exports de.uka.ilkd.key.proof.delayedcut; + exports de.uka.ilkd.key.speclang.jml; + exports de.uka.ilkd.key.smt.newsmt2; + exports de.uka.ilkd.key.util.pp; + exports de.uka.ilkd.key.axiom_abstraction; + requires org.slf4j; + requires key.recoder; + requires org.key_project.ncore; + requires org.key_project.util; + requires java.desktop; + requires org.jspecify; + requires org.antlr.antlr4.runtime; + requires java.scripting; + + provides ProofMacro with + de.uka.ilkd.key.informationflow.macros.FullInformationFlowAutoPilotMacro, + de.uka.ilkd.key.informationflow.macros.AuxiliaryComputationAutoPilotMacro, + de.uka.ilkd.key.informationflow.macros.StartAuxiliaryComputationMacro, + de.uka.ilkd.key.informationflow.macros.FinishAuxiliaryComputationMacro, + de.uka.ilkd.key.macros.FullAutoPilotProofMacro, + de.uka.ilkd.key.macros.AutoPilotPrepareProofMacro, + de.uka.ilkd.key.macros.SMTPreparationMacro, + de.uka.ilkd.key.informationflow.macros.StateExpansionAndInfFlowContractApplicationMacro, + de.uka.ilkd.key.informationflow.macros.SelfcompositionStateExpansionMacro, + de.uka.ilkd.key.informationflow.macros.FullUseInformationFlowContractMacro, + de.uka.ilkd.key.macros.PropositionalExpansionMacro, + de.uka.ilkd.key.macros.FullPropositionalExpansionMacro, + de.uka.ilkd.key.macros.TryCloseMacro, + de.uka.ilkd.key.macros.FinishSymbolicExecutionMacro, + de.uka.ilkd.key.macros.AutoMacro, + de.uka.ilkd.key.macros.HeapSimplificationMacro, + de.uka.ilkd.key.macros.IntegerSimplificationMacro, + de.uka.ilkd.key.macros.OneStepProofMacro, + de.uka.ilkd.key.macros.WellDefinednessMacro, + de.uka.ilkd.key.macros.UpdateSimplificationMacro, + de.uka.ilkd.key.macros.TranscendentalFloatSMTMacro; + + provides ProofScriptCommand with + de.uka.ilkd.key.macros.scripts.EchoCommand, + de.uka.ilkd.key.macros.scripts.MacroCommand, + de.uka.ilkd.key.macros.scripts.FocusCommand, + de.uka.ilkd.key.macros.scripts.AutoCommand, + de.uka.ilkd.key.macros.scripts.CutCommand, + de.uka.ilkd.key.macros.scripts.SetCommand, + de.uka.ilkd.key.macros.scripts.SetEchoCommand, + de.uka.ilkd.key.macros.scripts.SetFailOnClosedCommand, + de.uka.ilkd.key.macros.scripts.SMTCommand, + de.uka.ilkd.key.macros.scripts.RuleCommand, + de.uka.ilkd.key.macros.scripts.ActivateCommand, + de.uka.ilkd.key.macros.scripts.LeaveCommand, + de.uka.ilkd.key.macros.scripts.TryCloseCommand, + de.uka.ilkd.key.macros.scripts.ExitCommand, + de.uka.ilkd.key.macros.scripts.InstantiateCommand, + de.uka.ilkd.key.macros.scripts.SelectCommand, + de.uka.ilkd.key.macros.scripts.ScriptCommand, + de.uka.ilkd.key.macros.scripts.LetCommand, + de.uka.ilkd.key.macros.scripts.SaveInstCommand, + de.uka.ilkd.key.macros.scripts.SaveNewNameCommand, + de.uka.ilkd.key.macros.scripts.SchemaVarCommand, + de.uka.ilkd.key.macros.scripts.JavascriptCommand, + de.uka.ilkd.key.macros.scripts.SkipCommand, + de.uka.ilkd.key.macros.scripts.AxiomCommand, + de.uka.ilkd.key.macros.scripts.AssumeCommand, + de.uka.ilkd.key.macros.scripts.AssertCommand, + de.uka.ilkd.key.macros.scripts.RewriteCommand, + de.uka.ilkd.key.macros.scripts.AllCommand, + de.uka.ilkd.key.macros.scripts.HideCommand, + de.uka.ilkd.key.macros.scripts.UnhideCommand; + + provides DefaultProfileResolver with + de.uka.ilkd.key.proof.init.JavaProfileDefaultProfileResolver, + de.uka.ilkd.key.proof.init.JavaProfileWithPermissionsDefaultProfileResolver; + +} \ No newline at end of file diff --git a/key.removegenerics/src/main/java/module-info.java b/key.removegenerics/src/main/java/module-info.java new file mode 100644 index 00000000000..5a183a653c3 --- /dev/null +++ b/key.removegenerics/src/main/java/module-info.java @@ -0,0 +1,9 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.removegenerics { + requires key.recoder; + requires org.slf4j; +} \ No newline at end of file diff --git a/key.ui/src/main/java/module-info.java b/key.ui/src/main/java/module-info.java new file mode 100644 index 00000000000..627806cab58 --- /dev/null +++ b/key.ui/src/main/java/module-info.java @@ -0,0 +1,34 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module org.key_project.ui { + requires org.slf4j; + requires java.desktop; + requires org.key_project.core; + requires java.prefs; + requires org.jspecify; + requires org.key_project.util; + requires org.key_project.ncore; + requires com.miglayout.core; + requires com.miglayout.swing; + requires ch.qos.logback.core; + requires ch.qos.logback.classic; + requires key.recoder; + requires org.key_project.core.rifl; + requires java.compiler; + + provides de.uka.ilkd.key.gui.extension.api.KeYGuiExtension with + de.uka.ilkd.key.gui.originlabels.OriginTermLabelsExt, + de.uka.ilkd.key.gui.extension.impl.HeatmapExt, + de.uka.ilkd.key.gui.extension.impl.TestExtension, + de.uka.ilkd.key.gui.docking.DockingLayout, + 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.utilities.HeapStatusExt, + de.uka.ilkd.key.gui.JmlEnabledKeysIndicator; + +} \ No newline at end of file diff --git a/keyext.caching/src/main/java/module-info.java b/keyext.caching/src/main/java/module-info.java new file mode 100644 index 00000000000..fd9b38ea05c --- /dev/null +++ b/keyext.caching/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module keyext.caching { +} \ No newline at end of file diff --git a/keyext.exploration/src/main/java/module-info.java b/keyext.exploration/src/main/java/module-info.java new file mode 100644 index 00000000000..08fd3443676 --- /dev/null +++ b/keyext.exploration/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module keyext.exploration { +} \ No newline at end of file diff --git a/keyext.proofmanagement/src/main/java/module-info.java b/keyext.proofmanagement/src/main/java/module-info.java new file mode 100644 index 00000000000..39e27dede8f --- /dev/null +++ b/keyext.proofmanagement/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module keyext.proofmanagement { +} \ No newline at end of file diff --git a/keyext.slicing/src/main/java/module-info.java b/keyext.slicing/src/main/java/module-info.java new file mode 100644 index 00000000000..d05ecbc927f --- /dev/null +++ b/keyext.slicing/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module keyext.slicing { +} \ No newline at end of file diff --git a/keyext.ui.testgen/src/main/java/module-info.java b/keyext.ui.testgen/src/main/java/module-info.java new file mode 100644 index 00000000000..97aedec13a5 --- /dev/null +++ b/keyext.ui.testgen/src/main/java/module-info.java @@ -0,0 +1,7 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module keyext.ui.testgen { +} \ No newline at end of file diff --git a/recoder/src/main/java/module-info.java b/recoder/src/main/java/module-info.java new file mode 100644 index 00000000000..21f69e729ff --- /dev/null +++ b/recoder/src/main/java/module-info.java @@ -0,0 +1,27 @@ +/** + * + * @author Alexander Weigl + * @version 1 (31.03.24) + */ +module key.recoder { + exports recoder; + exports recoder.abstraction; + exports recoder.convenience; + exports recoder.java.declaration; + exports recoder.java; + exports recoder.java.reference; + exports recoder.java.statement; + exports recoder.list.generic; + exports recoder.service; + exports recoder.parser; + exports recoder.io; + exports recoder.java.expression; + exports recoder.bytecode; + exports recoder.java.expression.operator; + exports recoder.util; + exports recoder.java.declaration.modifier; + exports recoder.kit; + exports recoder.java.expression.literal; + requires java.desktop; + requires org.slf4j; +} \ No newline at end of file From 02ca61d2de25de06a72162f00190aa5e61042044 Mon Sep 17 00:00:00 2001 From: Alexander Weigl Date: Thu, 4 Apr 2024 02:58:42 +0200 Subject: [PATCH 3/4] last steps for JPMS - add SNAPSHOT of dockingframes - removal of JUnit4 from root gradle --- build.gradle | 7 +- .../src/main/java/module-info.java | 5 +- .../src/main/java/module-info.java | 2 +- key.core.rifl/src/main/java/module-info.java | 2 +- .../src/main/java/module-info.java | 2 +- .../java/org/key_project/example/Main.java | 24 +-- .../AbstractUpdateExtractor.java | 10 +- .../AbstractWriter.java | 2 +- .../ExecutionNodePreorderIterator.java | 4 +- .../ExecutionNodeReader.java | 10 +- .../ExecutionNodeSymbolicLayoutExtractor.java | 6 +- .../ExecutionNodeWriter.java | 48 +++--- .../ExecutionVariableExtractor.java | 16 +- .../SymbolicExecutionTreeBuilder.java | 16 +- .../SymbolicLayoutExtractor.java | 10 +- .../SymbolicLayoutReader.java | 20 +-- .../SymbolicLayoutWriter.java | 14 +- .../TruthValueTracingUtil.java | 4 +- .../BlockContractValidityTermLabelUpdate.java | 4 +- .../label/FormulaTermLabelMerger.java | 2 +- .../label/FormulaTermLabelRefactoring.java | 4 +- .../label/FormulaTermLabelUpdate.java | 4 +- .../label/LoopBodyTermLabelUpdate.java | 4 +- ...nvariantNormalBehaviorTermLabelUpdate.java | 4 +- ...veInCheckBranchesTermLabelRefactoring.java | 4 +- .../label/StayOnFormulaTermLabelPolicy.java | 4 +- .../SymbolicExecutionTermLabelUpdate.java | 4 +- .../model/IExecutionAuxiliaryContract.java | 6 +- .../model/IExecutionBaseMethodReturn.java | 2 +- .../model/IExecutionBlockStartNode.java | 2 +- .../model/IExecutionBranchCondition.java | 6 +- .../model/IExecutionBranchStatement.java | 6 +- .../model/IExecutionConstraint.java | 4 +- .../model/IExecutionElement.java | 2 +- .../IExecutionExceptionalMethodReturn.java | 6 +- .../model/IExecutionJoin.java | 6 +- .../model/IExecutionLink.java | 2 +- .../model/IExecutionLoopCondition.java | 6 +- .../model/IExecutionLoopInvariant.java | 6 +- .../model/IExecutionLoopStatement.java | 6 +- .../model/IExecutionMethodCall.java | 6 +- .../model/IExecutionMethodReturn.java | 6 +- .../model/IExecutionMethodReturnValue.java | 6 +- .../model/IExecutionNode.java | 8 +- .../model/IExecutionOperationContract.java | 6 +- .../model/IExecutionStart.java | 6 +- .../model/IExecutionStatement.java | 6 +- .../model/IExecutionTermination.java | 8 +- .../model/IExecutionValue.java | 4 +- .../model/IExecutionVariable.java | 4 +- .../model/ITreeSettings.java | 2 +- .../impl/AbstractExecutionBlockStartNode.java | 8 +- .../model/impl/AbstractExecutionElement.java | 10 +- .../impl/AbstractExecutionMethodReturn.java | 16 +- .../model/impl/AbstractExecutionNode.java | 12 +- .../model/impl/AbstractExecutionValue.java | 6 +- .../model/impl/AbstractExecutionVariable.java | 12 +- .../ExecutionAllArrayIndicesVariable.java | 12 +- .../impl/ExecutionAuxiliaryContract.java | 12 +- .../model/impl/ExecutionBranchCondition.java | 12 +- .../model/impl/ExecutionBranchStatement.java | 12 +- .../model/impl/ExecutionConstraint.java | 8 +- .../ExecutionExceptionalMethodReturn.java | 14 +- .../model/impl/ExecutionJoin.java | 12 +- .../model/impl/ExecutionLink.java | 6 +- .../model/impl/ExecutionLoopCondition.java | 12 +- .../model/impl/ExecutionLoopInvariant.java | 12 +- .../model/impl/ExecutionLoopStatement.java | 12 +- .../model/impl/ExecutionMethodCall.java | 14 +- .../model/impl/ExecutionMethodReturn.java | 20 +-- .../impl/ExecutionMethodReturnValue.java | 8 +- .../impl/ExecutionOperationContract.java | 14 +- .../model/impl/ExecutionStart.java | 14 +- .../model/impl/ExecutionStatement.java | 12 +- .../model/impl/ExecutionTermination.java | 12 +- .../model/impl/ExecutionValue.java | 12 +- .../model/impl/ExecutionVariable.java | 14 +- .../model/impl/TreeSettings.java | 6 +- .../object_model/IModelSettings.java | 2 +- .../object_model/ISymbolicAssociation.java | 4 +- .../ISymbolicAssociationValueContainer.java | 4 +- .../object_model/ISymbolicElement.java | 2 +- .../ISymbolicEquivalenceClass.java | 2 +- .../object_model/ISymbolicLayout.java | 10 +- .../object_model/ISymbolicObject.java | 4 +- .../object_model/ISymbolicState.java | 4 +- .../object_model/ISymbolicValue.java | 4 +- .../object_model/impl/AbstractElement.java | 8 +- ...ractSymbolicAssociationValueContainer.java | 10 +- .../object_model/impl/ModelSettings.java | 4 +- .../impl/SymbolicAssociation.java | 10 +- .../impl/SymbolicEquivalenceClass.java | 8 +- .../object_model/impl/SymbolicLayout.java | 12 +- .../object_model/impl/SymbolicObject.java | 6 +- .../object_model/impl/SymbolicState.java | 6 +- .../object_model/impl/SymbolicValue.java | 8 +- .../po/ProgramMethodPO.java | 2 +- .../po/ProgramMethodSubsetPO.java | 2 +- .../po/TruthValuePOExtension.java | 6 +- .../profile/SimplifyTermProfile.java | 8 +- .../profile/SymbolicExecutionJavaProfile.java | 30 ++-- ...tionJavaProfileDefaultProfileResolver.java | 2 +- ...torKeepUpdatesForBreakpointconditions.java | 8 +- .../rule/AbstractSideProofRule.java | 4 +- .../rule/ModalitySideProofRule.java | 6 +- .../rule/QuerySideProofRule.java | 4 +- .../slicing/AbstractBackwardSlicer.java | 4 +- .../slicing/AbstractSlicer.java | 8 +- .../slicing/Access.java | 2 +- .../slicing/Location.java | 4 +- .../slicing/ThinBackwardSlicer.java | 4 +- .../AbstractCallStackBasedStopCondition.java | 4 +- .../strategy/BreakpointStopCondition.java | 5 +- .../strategy/CompoundStopCondition.java | 2 +- .../strategy/CutHeapObjectsFeature.java | 2 +- .../strategy/CutHeapObjectsTermGenerator.java | 2 +- ...mbolicExecutionTreeNodesStopCondition.java | 4 +- .../strategy/IBreakpointStopCondition.java | 4 +- .../strategy/SimplifyTermStrategy.java | 4 +- ...mbolicExecutionTreeNodesStopCondition.java | 2 +- ...mbolicExecutionTreeNodesStopCondition.java | 2 +- ...bolicExecutionBreakpointStopCondition.java | 5 +- .../SymbolicExecutionGoalChooser.java | 4 +- .../SymbolicExecutionGoalChooserBuilder.java | 2 +- .../strategy/SymbolicExecutionStrategy.java | 8 +- .../breakpoint/AbstractBreakpoint.java | 2 +- .../AbstractConditionalBreakpoint.java | 6 +- .../AbstractHitCountBreakpoint.java | 2 +- .../breakpoint/ExceptionBreakpoint.java | 4 +- .../strategy/breakpoint/FieldWatchpoint.java | 2 +- .../strategy/breakpoint/IBreakpoint.java | 2 +- .../strategy/breakpoint/KeYWatchpoint.java | 6 +- .../strategy/breakpoint/LineBreakpoint.java | 2 +- .../strategy/breakpoint/MethodBreakpoint.java | 4 +- .../SymbolicExecutionExceptionBreakpoint.java | 4 +- .../util/DefaultEntry.java | 2 +- .../util/EqualsHashCodeResetter.java | 2 +- .../util/SideProofStore.java | 6 +- .../util/SymbolicExecutionEnvironment.java | 10 +- .../util/SymbolicExecutionSideProofUtil.java | 6 +- .../util/SymbolicExecutionUtil.java | 22 +-- .../util/event/ISideProofStoreListener.java | 6 +- .../util/event/SideProofStoreEvent.java | 6 +- .../src/main/java/module-info.java | 23 +-- .../AbstractSymbolicExecutionTestCase.java | 2 +- .../uka/ilkd/key/testgen/ModelGenerator.java | 2 +- .../ilkd/key/testgen/TestCaseGenerator.java | 4 +- .../ilkd/key/testgen/macros/TestGenMacro.java | 2 +- .../settings/TestGenerationSettings.java | 1 + .../AbstractCounterExampleGenerator.java | 2 +- .../smt/testgen/AbstractTestGenerator.java | 6 +- .../src/main/java/module-info.java | 16 ++ .../uka/ilkd/key/testcase/smt/ce/TestCE.java | 2 +- .../key/testcase/smt/testgen/TestTestgen.java | 2 +- .../ClassFileDeclarationManager.java | 2 +- ...KeYCrossReferenceServiceConfiguration.java | 2 +- .../SchemaCrossReferenceSourceInfo.java | 3 +- .../key/proof/io/AbstractProblemLoader.java | 56 +++---- .../key/speclang/njml/JmlTermFactory.java | 2 +- key.core/src/main/java/module-info.java | 140 +----------------- .../uka/ilkd/key/smt/newsmt2/TestSMTMod.java | 2 +- .../src/main/java/module-info.java | 2 +- key.ui/build.gradle | 5 +- .../uka/ilkd/key/gui/ApplyTacletDialog.java | 2 +- .../java/de/uka/ilkd/key/gui/GoalList.java | 6 +- .../de/uka/ilkd/key/gui/InfoTreeModel.java | 2 +- .../java/de/uka/ilkd/key/gui/InfoView.java | 8 +- .../java/de/uka/ilkd/key/gui/IssueDialog.java | 2 +- .../ilkd/key/gui/KeyboardTacletExtension.java | 10 +- .../java/de/uka/ilkd/key/gui/LogView.java | 2 +- .../java/de/uka/ilkd/key/gui/MainWindow.java | 16 +- .../ilkd/key/gui/MainWindowTabbedPane.java | 2 +- .../de/uka/ilkd/key/gui/ProofMacroMenu.java | 2 +- .../de/uka/ilkd/key/gui/ProofMacroWorker.java | 4 +- .../ilkd/key/gui/ProofManagementDialog.java | 2 +- .../uka/ilkd/key/gui/ProofScriptWorker.java | 6 +- .../de/uka/ilkd/key/gui/RecentFileMenu.java | 2 +- .../de/uka/ilkd/key/gui/SelectionHistory.java | 6 +- .../ilkd/key/gui/StrategySelectionView.java | 6 +- .../key/gui/TacletMatchCompletionDialog.java | 2 +- .../java/de/uka/ilkd/key/gui/TaskTree.java | 10 +- .../key/gui/WindowUserInterfaceControl.java | 30 ++-- .../ilkd/key/gui/actions/AutoModeAction.java | 6 +- .../gui/actions/EditMostRecentFileAction.java | 4 +- .../ilkd/key/gui/actions/GoalBackAction.java | 4 +- .../gui/actions/HeatmapSettingsAction.java | 4 +- .../key/gui/actions/HeatmapToggleAction.java | 4 +- .../gui/actions/KeYProjectHomepageAction.java | 1 - .../ilkd/key/gui/actions/MacroKeyBinding.java | 2 +- .../key/gui/actions/MainWindowAction.java | 4 +- .../key/gui/actions/OpenExampleAction.java | 2 +- .../gui/actions/OpenMostRecentFileAction.java | 4 +- .../gui/actions/ProofManagementAction.java | 4 +- .../actions/ProofScriptFromFileAction.java | 2 +- .../gui/actions/ProofScriptInputAction.java | 2 +- .../key/gui/actions/PruneProofAction.java | 4 +- .../key/gui/actions/RunAllProofsAction.java | 6 +- .../ilkd/key/gui/actions/SMTInvokeAction.java | 2 +- .../key/gui/actions/SaveBundleAction.java | 4 +- .../key/gui/actions/SendFeedbackAction.java | 2 +- .../ilkd/key/gui/actions/TermLabelMenu.java | 2 +- .../useractions/AutoModeUserAction.java | 2 +- .../FocussedAutoModeUserAction.java | 2 +- .../useractions/ProofLoadUserAction.java | 2 +- .../useractions/ProofMacroUserAction.java | 2 +- .../useractions/ProofModifyingUserAction.java | 2 +- .../useractions/ProofRuleUserAction.java | 2 +- .../useractions/ProofSMTApplyUserAction.java | 2 +- .../RunStrategyOnNodeUserAction.java | 2 +- .../gui/actions/useractions/UserAction.java | 2 +- .../ilkd/key/gui/docking/DockingHelper.java | 19 +-- .../ilkd/key/gui/docking/DockingLayout.java | 9 +- .../ilkd/key/gui/docking/DynamicCMenu.java | 20 ++- .../gui/extension/api/ContextMenuAdapter.java | 2 +- .../gui/extension/api/KeYGuiExtension.java | 2 +- .../api/KeyboardShortcutAdapter.java | 2 +- .../ilkd/key/gui/extension/api/TabPanel.java | 5 +- .../extension/impl/KeYGuiExtensionFacade.java | 2 +- .../key/gui/extension/impl/TestExtension.java | 2 +- .../de/uka/ilkd/key/gui/help/HelpFacade.java | 6 +- .../uka/ilkd/key/gui/join/JoinMenuItem.java | 2 +- .../LemmataAutoModeOptions.java | 2 +- .../key/gui/mergerule/MergeRuleMenuItem.java | 2 +- .../key/gui/nodeviews/CurrentGoalView.java | 2 +- .../nodeviews/CurrentGoalViewListener.java | 2 +- .../gui/nodeviews/CurrentGoalViewMenu.java | 2 +- .../gui/nodeviews/DragNDropInstantiator.java | 2 +- .../key/gui/nodeviews/SequentViewDock.java | 9 +- .../key/gui/nodeviews/TacletDescriber.java | 2 +- .../gui/notification/NotificationManager.java | 2 +- .../OriginTermLabelVisualizer.java | 4 +- .../gui/originlabels/OriginTermLabelsExt.java | 2 +- .../ActionHistoryExtension.java | 6 +- .../action_history/StateChangeListener.java | 2 +- .../key/gui/plugins/javac/JavacExtension.java | 6 +- .../gui/prooftree/ProofTreePopupFactory.java | 2 +- .../ProofTreeSettingsMenuFactory.java | 5 +- .../ilkd/key/gui/prooftree/ProofTreeView.java | 8 +- .../ilkd/key/gui/smt/InformationWindow.java | 6 +- .../uka/ilkd/key/gui/smt/ProgressDialog.java | 1 - .../uka/ilkd/key/gui/smt/SolverListener.java | 2 +- .../ilkd/key/gui/sourceview/SourceView.java | 4 +- .../AbstractMediatorUserInterfaceControl.java | 8 +- .../ui/ConsoleProofObligationSelector.java | 2 +- .../key/ui/ConsoleUserInterfaceControl.java | 6 +- .../uka/ilkd/key/ui/MediatorProofControl.java | 2 +- .../ilkd/key/ui/proof/io/ProblemLoader.java | 2 +- .../de/uka/ilkd/key/ui/util/SwingUtil.java | 3 +- key.ui/src/main/java/module-info.java | 21 ++- ...ilkd.key.gui.extension.api.KeYGuiExtension | 1 - .../java/de/uka/ilkd/key/gui/ChaosMonkey.java | 8 +- .../gui/plugins/caching/CachingExtension.java | 7 +- .../plugins/caching/CachingPruneHandler.java | 2 +- .../DefaultReferenceSearchDialogListener.java | 2 +- .../plugins/caching}/ProgramMethodFinder.java | 2 +- .../caching/ReferenceSearchButton.java | 7 +- .../caching/ReferenceSearchDialog.java | 1 - .../plugins/caching/ReferenceSearchTable.java | 2 +- .../plugins/caching}/ReferenceSearcher.java | 4 +- .../caching/actions/CloseAllByReference.java | 4 +- .../caching/actions/CloseByReference.java | 4 +- .../caching/actions/CopyReferencedProof.java | 2 +- .../caching/actions/GotoReferenceAction.java | 2 +- .../RemoveCachingInformationAction.java | 2 +- keyext.caching/src/main/java/module-info.java | 10 +- .../reference/TestReferenceSearcher.java | 1 + .../src/main/java/module-info.java | 9 +- .../exploration/ExplorationExtension.java | 6 +- .../exploration/ExplorationModeModel.java | 2 +- .../exploration/ProofExplorationService.java | 2 +- .../actions/ToggleExplorationAction.java | 4 +- .../exploration/ui/ExplorationStepsList.java | 4 +- .../src/main/java/module-info.java | 10 +- keyext.slicing/src/main/java/module-info.java | 14 +- .../java/org/key_project/slicing/Main.java | 2 +- .../key_project/slicing/SlicingExtension.java | 6 +- .../slicing/ui/SliceToFixedPointDialog.java | 6 +- .../slicing/ui/SlicingLeftPanel.java | 10 +- .../key/gui/testgen/CounterExampleAction.java | 10 +- .../de/uka/ilkd/key/gui/testgen/TGWorker.java | 4 +- .../key/gui/testgen/TestGenerationAction.java | 4 +- .../key/gui/testgen/TestgenExtension.java | 2 +- .../src/main/java/module-info.java | 8 +- recoder/src/main/java/module-info.java | 2 +- 284 files changed, 890 insertions(+), 959 deletions(-) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/AbstractUpdateExtractor.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/AbstractWriter.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/ExecutionNodePreorderIterator.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/ExecutionNodeReader.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/ExecutionNodeSymbolicLayoutExtractor.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/ExecutionNodeWriter.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/ExecutionVariableExtractor.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/SymbolicExecutionTreeBuilder.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/SymbolicLayoutExtractor.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/SymbolicLayoutReader.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/SymbolicLayoutWriter.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/TruthValueTracingUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/BlockContractValidityTermLabelUpdate.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/FormulaTermLabelMerger.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/FormulaTermLabelRefactoring.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/FormulaTermLabelUpdate.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/LoopBodyTermLabelUpdate.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/LoopInvariantNormalBehaviorTermLabelUpdate.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/RemoveInCheckBranchesTermLabelRefactoring.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/StayOnFormulaTermLabelPolicy.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/label/SymbolicExecutionTermLabelUpdate.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionAuxiliaryContract.java (87%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionBaseMethodReturn.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionBlockStartNode.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionBranchCondition.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionBranchStatement.java (79%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionConstraint.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionElement.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionExceptionalMethodReturn.java (76%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionJoin.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionLink.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionLoopCondition.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionLoopInvariant.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionLoopStatement.java (79%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionMethodCall.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionMethodReturn.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionMethodReturnValue.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionNode.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionOperationContract.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionStart.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionStatement.java (77%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionTermination.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionValue.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/IExecutionVariable.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/ITreeSettings.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionBlockStartNode.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionElement.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionMethodReturn.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionNode.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionValue.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/AbstractExecutionVariable.java (90%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionAllArrayIndicesVariable.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionAuxiliaryContract.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionBranchCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionBranchStatement.java (82%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionConstraint.java (88%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionExceptionalMethodReturn.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionJoin.java (81%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionLink.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionLoopCondition.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionLoopInvariant.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionLoopStatement.java (85%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionMethodCall.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionMethodReturn.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionMethodReturnValue.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionOperationContract.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionStart.java (86%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionStatement.java (76%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionTermination.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/ExecutionVariable.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/model/impl/TreeSettings.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/IModelSettings.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicAssociation.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicAssociationValueContainer.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicElement.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicEquivalenceClass.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicLayout.java (80%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicObject.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicState.java (81%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/ISymbolicValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/AbstractElement.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/AbstractSymbolicAssociationValueContainer.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/ModelSettings.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicAssociation.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicEquivalenceClass.java (92%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicLayout.java (83%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicObject.java (89%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicState.java (80%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/object_model/impl/SymbolicValue.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/po/ProgramMethodPO.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/po/ProgramMethodSubsetPO.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/po/TruthValuePOExtension.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/profile/SimplifyTermProfile.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/profile/SymbolicExecutionJavaProfile.java (91%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java (84%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/rule/AbstractSideProofRule.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/rule/ModalitySideProofRule.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/rule/QuerySideProofRule.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/slicing/AbstractBackwardSlicer.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/slicing/AbstractSlicer.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/slicing/Access.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/slicing/Location.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/slicing/ThinBackwardSlicer.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/AbstractCallStackBasedStopCondition.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/BreakpointStopCondition.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/CompoundStopCondition.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/CutHeapObjectsFeature.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/CutHeapObjectsTermGenerator.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/IBreakpointStopCondition.java (88%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/SimplifyTermStrategy.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/SymbolicExecutionBreakpointStopCondition.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/SymbolicExecutionGoalChooser.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/SymbolicExecutionGoalChooserBuilder.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/SymbolicExecutionStrategy.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/AbstractBreakpoint.java (95%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/AbstractConditionalBreakpoint.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/AbstractHitCountBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/ExceptionBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/FieldWatchpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/IBreakpoint.java (97%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/KeYWatchpoint.java (96%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/LineBreakpoint.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/MethodBreakpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/DefaultEntry.java (93%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/EqualsHashCodeResetter.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/SideProofStore.java (98%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/SymbolicExecutionEnvironment.java (94%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/SymbolicExecutionSideProofUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/SymbolicExecutionUtil.java (99%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/event/ISideProofStoreListener.java (78%) rename key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/{symbex => symbolic_execution}/util/event/SideProofStoreEvent.java (86%) create mode 100644 key.core.testgen/src/main/java/module-info.java rename keyext.caching/src/main/java/de/uka/ilkd/key/{proof/reference => gui/plugins/caching}/ProgramMethodFinder.java (96%) rename keyext.caching/src/main/java/de/uka/ilkd/key/{proof/reference => gui/plugins/caching}/ReferenceSearcher.java (98%) diff --git a/build.gradle b/build.gradle index 5bb1ef3456b..e9d8cf09c22 100644 --- a/build.gradle +++ b/build.gradle @@ -64,9 +64,12 @@ subprojects { repositories { mavenCentral() - maven { + maven { // cleary if needed?! url 'https://git.key-project.org/api/v4/projects/35/packages/maven' } + maven { // remove if docking frames 1.1.3p2 on Maven Central + url "https://s01.oss.sonatype.org/content/repositories/snapshots/" + } } dependencies { @@ -77,8 +80,6 @@ subprojects { testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.2' testImplementation project(':key.util') - testCompileOnly 'junit:junit:4.13.2' - testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.10.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.2' implementation("org.jspecify:jspecify:0.3.0") diff --git a/key.core.example/src/main/java/module-info.java b/key.core.example/src/main/java/module-info.java index 1589f3563f6..01e7c518413 100644 --- a/key.core.example/src/main/java/module-info.java +++ b/key.core.example/src/main/java/module-info.java @@ -1,7 +1,10 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module org.key_project.core.example { + requires org.key_project.core; + requires org.key_project.util; + requires org.slf4j; } \ No newline at end of file diff --git a/key.core.proof_references/src/main/java/module-info.java b/key.core.proof_references/src/main/java/module-info.java index 0eb1124f190..caf7a2d3c10 100644 --- a/key.core.proof_references/src/main/java/module-info.java +++ b/key.core.proof_references/src/main/java/module-info.java @@ -1,6 +1,6 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module org.key_project.proof_references { diff --git a/key.core.rifl/src/main/java/module-info.java b/key.core.rifl/src/main/java/module-info.java index db958b87368..6a21411cf8d 100644 --- a/key.core.rifl/src/main/java/module-info.java +++ b/key.core.rifl/src/main/java/module-info.java @@ -1,6 +1,6 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module org.key_project.core.rifl { diff --git a/key.core.symbolic_execution.example/src/main/java/module-info.java b/key.core.symbolic_execution.example/src/main/java/module-info.java index 7d5f55b3703..a708dfbef82 100644 --- a/key.core.symbolic_execution.example/src/main/java/module-info.java +++ b/key.core.symbolic_execution.example/src/main/java/module-info.java @@ -1,6 +1,6 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module key.core.symbolic_execution.example { 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 e5d0e8f569f..ef1e4702531 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.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.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.util.MiscTools; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractUpdateExtractor.java index e6a4bf970af..e04c2be2a75 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractUpdateExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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 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 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/symbex/AbstractWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/AbstractWriter.java index 7da456092fd..e519e28039f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/AbstractWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; import java.util.Map; import java.util.Map.Entry; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodePreorderIterator.java index 006c9e63c3b..ded295278ea 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodePreorderIterator.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; -import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeReader.java index c7311929b73..3d062b171a8 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeReader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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 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 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/symbex/ExecutionNodeSymbolicLayoutExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeSymbolicLayoutExtractor.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeSymbolicLayoutExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeSymbolicLayoutExtractor.java index 1755574e0b1..4b6cb070107 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeSymbolicLayoutExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbex.model.IExecutionNode; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; /** * Special {@link SymbolicLayoutExtractor} for {@link IExecutionNode}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeWriter.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionNodeWriter.java index 7053fcbf298..33c282a19eb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionNodeWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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.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.util.LinkedHashMap; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionVariableExtractor.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/ExecutionVariableExtractor.java index d5ec4df5fce..904292a5548 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/ExecutionVariableExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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 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 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/symbex/SymbolicExecutionTreeBuilder.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicExecutionTreeBuilder.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicExecutionTreeBuilder.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicExecutionTreeBuilder.java index 574b80cf20b..35e6ea1b81d 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicExecutionTreeBuilder.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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.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.util.MiscTools; import de.uka.ilkd.key.util.NodePreorderIterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutExtractor.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutExtractor.java index 4ade9ef4c9c..7d849a0530f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutExtractor.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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.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.util.ProofStarter; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutReader.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutReader.java index 4d0248bdd82..eacd8958e66 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutReader.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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 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 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/symbex/SymbolicLayoutWriter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutWriter.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutWriter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/SymbolicLayoutWriter.java index 2ee73c71dca..954b1dbc0dc 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/SymbolicLayoutWriter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.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.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.util.LinkedHashMap; /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java index 6b5f444241e..d4a12b894c9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/TruthValueTracingUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex; +package de.uka.ilkd.key.symbolic_execution; 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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/BlockContractValidityTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/BlockContractValidityTermLabelUpdate.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/BlockContractValidityTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/BlockContractValidityTermLabelUpdate.java index 6f5bc6448e6..6d72e3bc0b5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/BlockContractValidityTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Set; @@ -16,7 +16,7 @@ import de.uka.ilkd.key.rule.Rule; import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.rule.label.TermLabelUpdate; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/FormulaTermLabelMerger.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelMerger.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelMerger.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelMerger.java index b460de3eb49..9bb27da2d7a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelMerger.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.ArrayList; import java.util.Arrays; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelRefactoring.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelRefactoring.java index c7a17d7434b..7126d919feb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelRefactoring.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.*; @@ -18,7 +18,7 @@ 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.symbex.TruthValueTracingUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/FormulaTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelUpdate.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/FormulaTermLabelUpdate.java index 2e77e38336e..1c68b0d8984 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/FormulaTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Collections; import java.util.LinkedHashMap; @@ -22,7 +22,7 @@ import de.uka.ilkd.key.rule.Taclet.TacletLabelHint.TacletOperation; import de.uka.ilkd.key.rule.TacletApp; import de.uka.ilkd.key.rule.label.TermLabelUpdate; -import de.uka.ilkd.key.symbex.TruthValueTracingUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/LoopBodyTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/LoopBodyTermLabelUpdate.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopBodyTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/LoopBodyTermLabelUpdate.java index 759584efda2..9083cb56442 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopBodyTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Set; @@ -14,7 +14,7 @@ import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.rule.WhileInvariantRule; import de.uka.ilkd.key.rule.label.TermLabelUpdate; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/LoopInvariantNormalBehaviorTermLabelUpdate.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/LoopInvariantNormalBehaviorTermLabelUpdate.java index 6ef18467baf..8f0fcb0d43a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/LoopInvariantNormalBehaviorTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Set; @@ -14,7 +14,7 @@ import de.uka.ilkd.key.rule.RuleApp; import de.uka.ilkd.key.rule.WhileInvariantRule; import de.uka.ilkd.key.rule.label.TermLabelUpdate; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/RemoveInCheckBranchesTermLabelRefactoring.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/RemoveInCheckBranchesTermLabelRefactoring.java index 25df497e770..c85d1d9f645 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/RemoveInCheckBranchesTermLabelRefactoring.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.PosInOccurrence; @@ -18,8 +18,8 @@ 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; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/StayOnFormulaTermLabelPolicy.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/StayOnFormulaTermLabelPolicy.java index 50ad87796fc..a20bfdf22ae 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/StayOnFormulaTermLabelPolicy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Deque; import java.util.LinkedHashSet; @@ -19,7 +19,7 @@ import de.uka.ilkd.key.rule.Taclet.TacletLabelHint; import de.uka.ilkd.key.rule.Taclet.TacletLabelHint.TacletOperation; import de.uka.ilkd.key.rule.label.TermLabelPolicy; -import de.uka.ilkd.key.symbex.TruthValueTracingUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/label/SymbolicExecutionTermLabelUpdate.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/SymbolicExecutionTermLabelUpdate.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/SymbolicExecutionTermLabelUpdate.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/label/SymbolicExecutionTermLabelUpdate.java index 633c388c800..de1ea5d5d92 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/label/SymbolicExecutionTermLabelUpdate.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.label; +package de.uka.ilkd.key.symbolic_execution.label; import java.util.Set; @@ -12,8 +12,8 @@ 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; import org.key_project.util.collection.ImmutableSLList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionAuxiliaryContract.java similarity index 87% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionAuxiliaryContract.java index 819fb5b3a6c..7b2e2f27990 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionAuxiliaryContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionAuxiliaryContract; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionAuxiliaryContract; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBaseMethodReturn.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBaseMethodReturn.java index 3766c0621c5..9c3ba6bd461 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBaseMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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/symbex/model/IExecutionBlockStartNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBlockStartNode.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBlockStartNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBlockStartNode.java index b4655b5306f..1a322fe8eb9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBlockStartNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.SourceElement; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchCondition.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchCondition.java index 6d9608aaa0f..caf9646d8fe 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionBranchCondition; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionBranchCondition; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchStatement.java similarity index 79% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionBranchStatement.java index a7d9e9fdf07..9300cc0f011 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionBranchStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.statement.BranchStatement; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionBranchStatement; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionBranchStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionConstraint.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionConstraint.java index 800c620c096..6d33f9bc5da 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionConstraint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbex.model.impl.ExecutionConstraint; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionConstraint; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionElement.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionElement.java index 3eb5f572797..1528fc2e0e0 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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/symbex/model/IExecutionExceptionalMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionExceptionalMethodReturn.java similarity index 76% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionExceptionalMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionExceptionalMethodReturn.java index ad196be0f3f..a18b61ada74 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionExceptionalMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.statement.Throw; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionExceptionalMethodReturn; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionExceptionalMethodReturn; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionJoin.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionJoin.java index 9a7e090e1c6..c1c51724e69 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionJoin.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionJoin; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionJoin; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLink.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLink.java index 7e43886c4cd..7b6e7b85f58 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLink.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; /** * A link between two {@link IExecutionNode}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopCondition.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopCondition.java index 81dc8cd0919..8d3a9447827 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopCondition; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopCondition; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopInvariant.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopInvariant.java index 7aaf23f6c42..f3229003192 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopInvariant.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopInvariant; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopInvariant; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopStatement.java similarity index 79% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionLoopStatement.java index ac370d061ee..df72534b7f7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionLoopStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.statement.LoopStatement; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionLoopStatement; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionLoopStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodCall.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodCall.java index 24999b73a20..d36b33bb802 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodCall.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodCall; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodCall; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturn.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturn.java index a51f963c068..44e9f58cec2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturn; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturn; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturnValue.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionMethodReturnValue.java index c3660c8510f..b424ad82821 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionMethodReturnValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturn; -import de.uka.ilkd.key.symbex.model.impl.ExecutionMethodReturnValue; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturn; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionMethodReturnValue; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionNode.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionNode.java index 7f09c949361..aa8bf8a966d 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbex.object_model.ISymbolicLayout; +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 org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionOperationContract.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionOperationContract.java index a85f75f07a5..87d1ea97634 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionOperationContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionOperationContract; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionOperationContract; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStart.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStart.java index 7d4dbdd4268..df963e16b32 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStart.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionStart; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionStart; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStatement.java similarity index 77% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionStatement.java index c9eb0cfbd28..112e1675403 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.java.SourceElement; -import de.uka.ilkd.key.symbex.SymbolicExecutionTreeBuilder; -import de.uka.ilkd.key.symbex.model.impl.ExecutionStatement; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionStatement; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.java index 51a63273675..4e71b6ba876 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionTermination.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionTermination.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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.SymbolicExecutionTreeBuilder; +import de.uka.ilkd.key.symbolic_execution.SymbolicExecutionTreeBuilder; import org.key_project.logic.sort.Sort; @@ -18,7 +18,9 @@ * in case of exceptional termination. *

*

- * The default implementation is {@link de.uka.ilkd.key.symbex.model.impl.ExecutionTermination} which is instantiated via a + * The default implementation is + * {@link de.uka.ilkd.key.symbolic_execution.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/symbex/model/IExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionValue.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionValue.java index d68c1e6afb8..194cd2907c2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.proof.init.ProofInputException; -import de.uka.ilkd.key.symbex.model.impl.ExecutionValue; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionValue; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionVariable.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/IExecutionVariable.java index 3db3b20effc..1411426459e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/IExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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.symbex.model.impl.ExecutionVariable; +import de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionVariable; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/ITreeSettings.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/ITreeSettings.java index 4e588955eb9..957d8a5e984 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/ITreeSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model; +package de.uka.ilkd.key.symbolic_execution.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/symbex/model/impl/AbstractExecutionBlockStartNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionBlockStartNode.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionBlockStartNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionBlockStartNode.java index c7340a90bd7..759f5a3e3a2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionBlockStartNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -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 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 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/symbex/model/impl/AbstractExecutionElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionElement.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionElement.java index b523a76130a..74a43bd66d2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * Provides a basic implementation of {@link IExecutionElement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionMethodReturn.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionMethodReturn.java index 7c91eef35e4..d74bfb41cd4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionBaseMethodReturn}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionNode.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionNode.java index 79ac096c5ae..56517808564 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionNode.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 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/symbex/model/impl/AbstractExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionValue.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionValue.java index 321f7a3e233..ac350ca0ea8 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.symbex.model.*; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.model.*; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; /** * Provides a basic implementation of {@link IExecutionValue}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionVariable.java similarity index 90% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/AbstractExecutionVariable.java index c1e6104ff94..b0106b6af44 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/AbstractExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * Provides a basic implementation of {@link IExecutionVariable}s. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAllArrayIndicesVariable.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAllArrayIndicesVariable.java index 197a1be822d..f7a1b5b9592 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAllArrayIndicesVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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.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 org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAuxiliaryContract.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionAuxiliaryContract.java index 33c02a47dc7..87deb6675f6 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionAuxiliaryContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 org.key_project.logic.Named; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchCondition.java index 54682ae647c..0ae1dc7806e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionBranchCondition}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchStatement.java similarity index 82% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionBranchStatement.java index c6e86b19c35..dc97d520667 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionBranchStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionBranchStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionConstraint.java similarity index 88% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionConstraint.java index 04a3823ddb0..db85bdc3d39 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionConstraint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.symbex.model.IExecutionConstraint; -import de.uka.ilkd.key.symbex.model.IExecutionNode; -import de.uka.ilkd.key.symbex.model.ITreeSettings; +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; /** * The default implementation of {@link IExecutionConstraint}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionExceptionalMethodReturn.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionExceptionalMethodReturn.java index a8e0b06e4cb..ae9dbaa77f5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionExceptionalMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionJoin.java similarity index 81% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionJoin.java index 8276cba3989..fa81adcf2ca 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionJoin.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -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; +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; /** * The default implementation of {@link IExecutionJoin}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLink.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLink.java index 350e6ceeb8e..8eff5671ca8 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLink.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.model.impl; -import de.uka.ilkd.key.symbex.model.IExecutionLink; -import de.uka.ilkd.key.symbex.model.IExecutionNode; +import de.uka.ilkd.key.symbolic_execution.model.IExecutionLink; +import de.uka.ilkd.key.symbolic_execution.model.IExecutionNode; /** * The default implementation of {@link IExecutionLink}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopCondition.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopCondition.java index 74bc8811251..b0eb7159950 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionLoopCondition}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopInvariant.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopInvariant.java index ec4815dd055..3a10756d56e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopInvariant.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionLoopInvariant}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopStatement.java similarity index 85% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionLoopStatement.java index 4724a8c732b..ba6acfee777 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionLoopStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * The default implementation of {@link IExecutionLoopStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodCall.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodCall.java index 9c0f0776623..a5f0add941e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodCall.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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.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.util.KeYTypeUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturn.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturn.java index 1f6ff4a0e43..f2c8c34144e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturn.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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.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.util.MiscTools; import org.key_project.util.java.StringUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturnValue.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionMethodReturnValue.java index d83a928740f..19ea5bc0e96 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionMethodReturnValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.symbex.model.IExecutionMethodReturnValue; -import de.uka.ilkd.key.symbex.model.IExecutionNode; -import de.uka.ilkd.key.symbex.model.ITreeSettings; +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; /** * The default implementation of {@link IExecutionMethodReturnValue}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionOperationContract.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionOperationContract.java index 51bd46cb054..f4544824321 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionOperationContract.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStart.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStart.java index 4a5370c277e..3795c1b603e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStart.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 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/symbex/model/impl/ExecutionStatement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStatement.java similarity index 76% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStatement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionStatement.java index b9ec2d7d036..af498913591 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionStatement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.model.impl; import de.uka.ilkd.key.java.SourceElement; import de.uka.ilkd.key.proof.Node; -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; +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; /** * The default implementation of {@link IExecutionStatement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionTermination.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionTermination.java index da3ff1d8ffd..92114afa8a2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionTermination.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionValue.java index cd17b8ff1b3..0a7dcc4b78a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 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/symbex/model/impl/ExecutionVariable.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionVariable.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionVariable.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/ExecutionVariable.java index 8122e276d14..f16fe3fee68 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/ExecutionVariable.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/TreeSettings.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/model/impl/TreeSettings.java index 7734c977c8e..6700f2db57f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/model/impl/TreeSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.model.impl; +package de.uka.ilkd.key.symbolic_execution.model.impl; -import de.uka.ilkd.key.symbex.model.IExecutionVariable; -import de.uka.ilkd.key.symbex.model.ITreeSettings; +import de.uka.ilkd.key.symbolic_execution.model.IExecutionVariable; +import de.uka.ilkd.key.symbolic_execution.model.ITreeSettings; /** * The default implementation of {@link ITreeSettings}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/IModelSettings.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/IModelSettings.java index e856a48add0..fcd85bcc43b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/IModelSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.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/symbex/object_model/ISymbolicAssociation.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociation.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociation.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociation.java index 3b9972ec030..0de22f3fc1d 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociation.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbex.object_model.impl.SymbolicAssociation; +import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicAssociation; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociationValueContainer.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicAssociationValueContainer.java index b0e8c47a4ff..c11cdf622f3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicAssociationValueContainer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbex.object_model.impl.AbstractSymbolicAssociationValueContainer; +import de.uka.ilkd.key.symbolic_execution.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/symbex/object_model/ISymbolicElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicElement.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicElement.java index 1fbde9851d3..d81761b15f3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.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/symbex/object_model/ISymbolicEquivalenceClass.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicEquivalenceClass.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicEquivalenceClass.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicEquivalenceClass.java index 946cef16909..f2d94bc108b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicEquivalenceClass.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; import de.uka.ilkd.key.logic.Term; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicLayout.java similarity index 80% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicLayout.java index 03c0acf5f42..215ec54385e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicLayout.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; -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 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 org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicObject.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicObject.java index 06f559035f4..4ca7e06fcd7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicObject.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbex.object_model.impl.SymbolicObject; +import de.uka.ilkd.key.symbolic_execution.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/symbex/object_model/ISymbolicState.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicState.java similarity index 81% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicState.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicState.java index 45ae2188937..3ba45b8edc7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicState.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; -import de.uka.ilkd.key.symbex.object_model.impl.SymbolicState; +import de.uka.ilkd.key.symbolic_execution.object_model.impl.SymbolicState; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/ISymbolicValue.java index 21934dda890..01a6318059c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/ISymbolicValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model; +package de.uka.ilkd.key.symbolic_execution.object_model; import de.uka.ilkd.key.logic.Term; import de.uka.ilkd.key.logic.op.IProgramVariable; -import de.uka.ilkd.key.symbex.object_model.impl.SymbolicValue; +import de.uka.ilkd.key.symbolic_execution.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/symbex/object_model/impl/AbstractElement.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractElement.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractElement.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractElement.java index 4ef52ce7ceb..7bf88024779 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractElement.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; -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; +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; /** * Default implementation of {@link ISymbolicElement}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractSymbolicAssociationValueContainer.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/AbstractSymbolicAssociationValueContainer.java index cde82de41c5..943bb95af2e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/AbstractSymbolicAssociationValueContainer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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 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 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/symbex/object_model/impl/ModelSettings.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/ModelSettings.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/ModelSettings.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/ModelSettings.java index 372258dda19..aa4e65891f9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/ModelSettings.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.object_model.impl; -import de.uka.ilkd.key.symbex.object_model.IModelSettings; +import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; /** * Default implementation of {@link IModelSettings}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicAssociation.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicAssociation.java index d888f1d5eae..d05704edc0e 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicAssociation.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * Default implementation of {@link ISymbolicAssociation}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicEquivalenceClass.java similarity index 92% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicEquivalenceClass.java index cc1a4af8576..3761a10d655 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicEquivalenceClass.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.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.symbex.object_model.IModelSettings; -import de.uka.ilkd.key.symbex.object_model.ISymbolicEquivalenceClass; -import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +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 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/symbex/object_model/impl/SymbolicLayout.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicLayout.java similarity index 83% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicLayout.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicLayout.java index 28dde3a5b90..fb2181fb47d 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicLayout.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.object_model.impl; -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 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 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/symbex/object_model/impl/SymbolicObject.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicObject.java similarity index 89% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicObject.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicObject.java index e403b4d5b7b..cbb4537a61f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicObject.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.object_model.impl; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; -import de.uka.ilkd.key.symbex.object_model.IModelSettings; -import de.uka.ilkd.key.symbex.object_model.ISymbolicObject; +import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; +import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicObject; import org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicState.java similarity index 80% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicState.java index 22aa55baffa..133b59590d3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicState.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.object_model.impl; -import de.uka.ilkd.key.symbex.object_model.IModelSettings; -import de.uka.ilkd.key.symbex.object_model.ISymbolicState; +import de.uka.ilkd.key.symbolic_execution.object_model.IModelSettings; +import de.uka.ilkd.key.symbolic_execution.object_model.ISymbolicState; /** * Default implementation of {@link ISymbolicState}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicValue.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/object_model/impl/SymbolicValue.java index 4fb4c051d5b..13290731263 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/object_model/impl/SymbolicValue.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.object_model.impl; +package de.uka.ilkd.key.symbolic_execution.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.symbex.object_model.IModelSettings; -import de.uka.ilkd.key.symbex.object_model.ISymbolicValue; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +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 org.key_project.logic.sort.Sort; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPO.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodPO.java index ba6940e9bee..a8e23732cb9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodPO.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.po; +package de.uka.ilkd.key.symbolic_execution.po; import java.io.IOException; import java.util.List; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPO.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/ProgramMethodSubsetPO.java index d968d2fc89d..1405ff15f6c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/ProgramMethodSubsetPO.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.po; +package de.uka.ilkd.key.symbolic_execution.po; import java.io.IOException; import java.util.*; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/TruthValuePOExtension.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/po/TruthValuePOExtension.java index 94b039a3c1a..5126e429d94 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/po/TruthValuePOExtension.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.po; +package de.uka.ilkd.key.symbolic_execution.po; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Term; @@ -12,8 +12,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.symbex.TruthValueTracingUtil; -import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil; +import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; import org.key_project.util.collection.ImmutableArray; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SimplifyTermProfile.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SimplifyTermProfile.java index ad6dc507e3c..293e3526990 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SimplifyTermProfile.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.profile; +package de.uka.ilkd.key.symbolic_execution.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.symbex.strategy.SimplifyTermStrategy; -import de.uka.ilkd.key.symbex.strategy.SymbolicExecutionStrategy; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +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 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/symbex/profile/SymbolicExecutionJavaProfile.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfile.java similarity index 91% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfile.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfile.java index d7318845794..86d3218e809 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfile.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.profile; +package de.uka.ilkd.key.symbolic_execution.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.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.rule.label.StayOnOperatorTermLabelPolicy; -import de.uka.ilkd.key.symbex.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.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 de.uka.ilkd.key.symbolic_execution.label.BlockContractValidityTermLabelUpdate; +import de.uka.ilkd.key.symbolic_execution.label.FormulaTermLabelMerger; +import de.uka.ilkd.key.symbolic_execution.label.FormulaTermLabelRefactoring; +import de.uka.ilkd.key.symbolic_execution.label.FormulaTermLabelUpdate; +import de.uka.ilkd.key.symbolic_execution.label.LoopBodyTermLabelUpdate; +import de.uka.ilkd.key.symbolic_execution.label.LoopInvariantNormalBehaviorTermLabelUpdate; +import de.uka.ilkd.key.symbolic_execution.label.RemoveInCheckBranchesTermLabelRefactoring; +import de.uka.ilkd.key.symbolic_execution.label.StayOnFormulaTermLabelPolicy; +import de.uka.ilkd.key.symbolic_execution.label.SymbolicExecutionTermLabelUpdate; +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 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/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java index 5ee47b85554..0540ea16ab5 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/profile/SymbolicExecutionJavaProfileDefaultProfileResolver.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.profile; +package de.uka.ilkd.key.symbolic_execution.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/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java similarity index 84% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java index 6123a13b0e0..e83141d4cf4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/proof/TermProgramVariableCollectorKeepUpdatesForBreakpointconditions.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.symbex.proof; +package de.uka.ilkd.key.symbolic_execution.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.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; +import de.uka.ilkd.key.symbolic_execution.strategy.IBreakpointStopCondition; +import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.AbstractConditionalBreakpoint; +import de.uka.ilkd.key.symbolic_execution.strategy.breakpoint.IBreakpoint; public class TermProgramVariableCollectorKeepUpdatesForBreakpointconditions extends TermProgramVariableCollector { diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/AbstractSideProofRule.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/AbstractSideProofRule.java index 59dd79c3053..b4f25f305e1 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/AbstractSideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.rule; +package de.uka.ilkd.key.symbolic_execution.rule; import java.util.Deque; import java.util.LinkedList; @@ -24,7 +24,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.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; import de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ModalitySideProofRule.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/ModalitySideProofRule.java index 16f90b1a972..6c1a1fa4212 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/ModalitySideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.rule; +package de.uka.ilkd.key.symbolic_execution.rule; import java.util.LinkedHashSet; import java.util.List; @@ -23,8 +23,8 @@ import de.uka.ilkd.key.rule.IBuiltInRuleApp; import de.uka.ilkd.key.rule.RuleAbortException; import de.uka.ilkd.key.rule.RuleApp; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/QuerySideProofRule.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/rule/QuerySideProofRule.java index 673f3364fe7..727b69d9f19 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/rule/QuerySideProofRule.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.rule; +package de.uka.ilkd.key.symbolic_execution.rule; import java.util.List; import java.util.Set; @@ -24,7 +24,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.symbex.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; import de.uka.ilkd.key.util.Triple; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractBackwardSlicer.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractBackwardSlicer.java index b74e8941c43..bfb10ac3e91 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractBackwardSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.slicing; +package de.uka.ilkd.key.symbolic_execution.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.symbex.object_model.ISymbolicEquivalenceClass; +import de.uka.ilkd.key.symbolic_execution.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/symbex/slicing/AbstractSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractSlicer.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/AbstractSlicer.java index 5061dbe5e12..56ead50dddb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/AbstractSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.slicing; +package de.uka.ilkd.key.symbolic_execution.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.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.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.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Access.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Access.java index c2f35aeba10..b9f0b4690f4 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Access.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.slicing; +package de.uka.ilkd.key.symbolic_execution.slicing; import java.util.Objects; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Location.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/Location.java index 49ac152b729..3091bad94d2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/Location.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.slicing; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/slicing/ThinBackwardSlicer.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/ThinBackwardSlicer.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/ThinBackwardSlicer.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/slicing/ThinBackwardSlicer.java index 44e554da786..bbfd01ef2ae 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/slicing/ThinBackwardSlicer.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.slicing; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableArray; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/AbstractCallStackBasedStopCondition.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/AbstractCallStackBasedStopCondition.java index a390f098747..bf67bbd65fc 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/AbstractCallStackBasedStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/BreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/BreakpointStopCondition.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/BreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/BreakpointStopCondition.java index 3ae9f675d35..06447d62f5f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/BreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.strategy.IBreakpointStopCondition; -import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/CompoundStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CompoundStopCondition.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CompoundStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CompoundStopCondition.java index 0fffe8b95eb..1e85ccdb33f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CompoundStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.strategy; import java.util.Collections; import java.util.Iterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsFeature.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsFeature.java index f77f1fc68f0..b82c837cd0c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsFeature.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.strategy; import java.util.Iterator; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsTermGenerator.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/CutHeapObjectsTermGenerator.java index d3a64d34684..db00d1469bf 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/CutHeapObjectsTermGenerator.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.strategy; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java index a8139fd241b..119b7478a40 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/ExecutedSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; /** *

diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/IBreakpointStopCondition.java similarity index 88% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/IBreakpointStopCondition.java index 0c8077e368f..58eed615d8a 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/IBreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.strategy; import java.util.Set; import de.uka.ilkd.key.prover.StopCondition; -import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/SimplifyTermStrategy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SimplifyTermStrategy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java index b20fe6c3bbb..a6594e4e05b 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SimplifyTermStrategy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java index 661c7329e42..dd1ef9e6088 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepOverSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java index 89054f1fc96..dc3d06162e6 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/StepReturnSymbolicExecutionTreeNodesStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionBreakpointStopCondition.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionBreakpointStopCondition.java index 0cdda227ac2..9bb2e5ab060 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionBreakpointStopCondition.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.strategy.IBreakpointStopCondition; -import de.uka.ilkd.key.symbex.strategy.breakpoint.IBreakpoint; +import de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/SymbolicExecutionGoalChooser.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooser.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooser.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooser.java index 7f9b272d2fd..0d236e76049 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooser.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooserBuilder.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionGoalChooserBuilder.java index 2f902706918..bd766f2bda2 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionGoalChooserBuilder.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/SymbolicExecutionStrategy.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionStrategy.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SymbolicExecutionStrategy.java index 9cc544ae0da..58082c12603 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/SymbolicExecutionStrategy.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy; +package de.uka.ilkd.key.symbolic_execution.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.symbex.rule.ModalitySideProofRule; -import de.uka.ilkd.key.symbex.rule.QuerySideProofRule; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +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 org.key_project.logic.Name; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractBreakpoint.java similarity index 95% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractBreakpoint.java index 1422da59824..febfffe47cb 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractConditionalBreakpoint.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractConditionalBreakpoint.java index f508bb6dce8..639365d2b37 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractConditionalBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractHitCountBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/AbstractHitCountBreakpoint.java index 8a7a5d7a054..9dbccd8c745 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/AbstractHitCountBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; import java.util.HashMap; import java.util.Map; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/ExceptionBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/ExceptionBreakpoint.java index f9349a438fe..bb81a7f3e64 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/ExceptionBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/FieldWatchpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/FieldWatchpoint.java index b2c376eeff1..d1082bca4c9 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/FieldWatchpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/breakpoint/IBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/IBreakpoint.java similarity index 97% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/IBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/IBreakpoint.java index 667d41c359b..3c1c27d359f 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/IBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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/symbex/strategy/breakpoint/KeYWatchpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/KeYWatchpoint.java similarity index 96% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/KeYWatchpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/KeYWatchpoint.java index 07033f95d5a..1a9e2afa618 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/KeYWatchpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionSideProofUtil; -import de.uka.ilkd.key.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionSideProofUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/LineBreakpoint.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/LineBreakpoint.java index 94789726195..2006e2c34b8 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/LineBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.strategy.breakpoint; import java.nio.file.Paths; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/MethodBreakpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/MethodBreakpoint.java index 671d4bd5dad..d49545137a3 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/MethodBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; public class MethodBreakpoint extends AbstractConditionalBreakpoint { /** diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java index a953a0da4b6..18787225830 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/strategy/breakpoint/SymbolicExecutionExceptionBreakpoint.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.strategy.breakpoint; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.SymbolicExecutionUtil; +import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil; import org.key_project.util.collection.ImmutableList; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/DefaultEntry.java similarity index 93% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/DefaultEntry.java index 2e8c8419a2e..4824f61d591 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/DefaultEntry.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.util; import java.util.Map.Entry; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/EqualsHashCodeResetter.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/EqualsHashCodeResetter.java index 60ecb3b7955..235a298b454 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/EqualsHashCodeResetter.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.util; import java.util.Collection; import java.util.Map; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SideProofStore.java similarity index 98% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SideProofStore.java index 18c263bb693..5e068334a5c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SideProofStore.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.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.symbex.util.event.ISideProofStoreListener; -import de.uka.ilkd.key.symbex.util.event.SideProofStoreEvent; +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.util.ProofUserManager; import org.key_project.util.java.CollectionUtil; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionEnvironment.java similarity index 94% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionEnvironment.java index ccbec883861..3111f1628df 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionEnvironment.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.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.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; +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; /** * 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/symbex/util/SymbolicExecutionSideProofUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionSideProofUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionSideProofUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionSideProofUtil.java index 91edc5d72ff..766547c958c 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionSideProofUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.util; import java.util.*; @@ -30,8 +30,8 @@ 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.symbex.profile.SimplifyTermProfile; -import de.uka.ilkd.key.symbex.profile.SymbolicExecutionJavaProfile; +import de.uka.ilkd.key.symbolic_execution.profile.SimplifyTermProfile; +import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfile; import de.uka.ilkd.key.util.ProofStarter; import de.uka.ilkd.key.util.SideProofUtil; import de.uka.ilkd.key.util.Triple; diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java similarity index 99% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/SymbolicExecutionUtil.java index 492e266a69a..0be6244d625 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/SymbolicExecutionUtil.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util; +package de.uka.ilkd.key.symbolic_execution.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.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.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.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.symbex.model.impl.ExecutionTermination#getExceptionSort()} + * {@link de.uka.ilkd.key.symbolic_execution.model.impl.ExecutionTermination#getExceptionSort()} * is called the * first time. * diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/ISideProofStoreListener.java similarity index 78% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/ISideProofStoreListener.java index b8c3ac038a5..e49771dfb22 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/ISideProofStoreListener.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util.event; +package de.uka.ilkd.key.symbolic_execution.util.event; import java.util.EventListener; -import de.uka.ilkd.key.symbex.util.SideProofStore; -import de.uka.ilkd.key.symbex.util.SideProofStore.Entry; +import de.uka.ilkd.key.symbolic_execution.util.SideProofStore; +import de.uka.ilkd.key.symbolic_execution.util.SideProofStore.Entry; /** * Observes changes on a {@link SideProofStore}. diff --git a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/SideProofStoreEvent.java similarity index 86% rename from key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java rename to key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/util/event/SideProofStoreEvent.java index bf5a43d7919..d235c5f6fa7 100644 --- a/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbex/util/event/SideProofStoreEvent.java +++ b/key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/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.symbex.util.event; +package de.uka.ilkd.key.symbolic_execution.util.event; import java.util.EventObject; -import de.uka.ilkd.key.symbex.util.SideProofStore; -import de.uka.ilkd.key.symbex.util.SideProofStore.Entry; +import de.uka.ilkd.key.symbolic_execution.util.SideProofStore; +import de.uka.ilkd.key.symbolic_execution.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/java/module-info.java b/key.core.symbolic_execution/src/main/java/module-info.java index 31786bf48f9..e0f66a0149c 100644 --- a/key.core.symbolic_execution/src/main/java/module-info.java +++ b/key.core.symbolic_execution/src/main/java/module-info.java @@ -1,26 +1,11 @@ import de.uka.ilkd.key.proof.init.POExtension; -import de.uka.ilkd.key.symbex.po.TruthValuePOExtension; +import de.uka.ilkd.key.symbolic_execution.po.TruthValuePOExtension; /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ -module org.key_project.symbolic_execution { - exports de.uka.ilkd.key.symbex; - exports de.uka.ilkd.key.symbex.model; - exports de.uka.ilkd.key.symbex.po; - exports de.uka.ilkd.key.symbex.profile; - exports de.uka.ilkd.key.symbex.strategy; - exports de.uka.ilkd.key.symbex.strategy.breakpoint; - exports de.uka.ilkd.key.symbex.util; - requires java.xml; - requires org.key_project.core; - requires org.key_project.ncore; - requires org.key_project.util; - requires java.desktop; - requires org.slf4j; - requires org.jspecify; +module org.key_project.symbolic_execution{exports de.uka.ilkd.key.symbolic_execution;exports de.uka.ilkd.key.symbolic_execution.model;exports de.uka.ilkd.key.symbolic_execution.po;exports de.uka.ilkd.key.symbolic_execution.profile;exports de.uka.ilkd.key.symbolic_execution.strategy;exports de.uka.ilkd.key.symbolic_execution.strategy.breakpoint;exports de.uka.ilkd.key.symbolic_execution.util;requires java.xml;requires org.key_project.core;requires org.key_project.ncore;requires org.key_project.util;requires java.desktop;requires org.slf4j;requires org.jspecify; - provides POExtension with TruthValuePOExtension; -} \ No newline at end of file +provides POExtension with TruthValuePOExtension;} 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/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java index 448082fdf51..37d7ae297ed 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/symbolic_execution/testcase/AbstractSymbolicExecutionTestCase.java @@ -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.symbex.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; @@ -39,6 +38,7 @@ 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.proof.TermProgramVariableCollectorKeepUpdatesForBreakpointconditions; 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; 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 4bda83f01c0..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.testgen.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 c3b0d98526f..c908a86a118 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.testgen.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.testgen.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/testgen/macros/TestGenMacro.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java index 571936dde7d..866454c1782 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java @@ -15,11 +15,11 @@ 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.testgen.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/testgen/settings/TestGenerationSettings.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java index 3c96bec5743..6fc02bb25d8 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/settings/TestGenerationSettings.java @@ -10,6 +10,7 @@ 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/testgen/smt/counterexample/AbstractCounterExampleGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java index ec09a9a3400..bb4d41100dd 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/counterexample/AbstractCounterExampleGenerator.java @@ -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.testgen.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/testgen/smt/testgen/AbstractTestGenerator.java b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java index 04ea9ab279b..42feebac6e8 100644 --- a/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java +++ b/key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/smt/testgen/AbstractTestGenerator.java @@ -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.testgen.macros.SemanticsBlastingMacro; -import de.uka.ilkd.key.testgen.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.testgen.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/module-info.java b/key.core.testgen/src/main/java/module-info.java new file mode 100644 index 00000000000..9a2d85a8960 --- /dev/null +++ b/key.core.testgen/src/main/java/module-info.java @@ -0,0 +1,16 @@ +/** + * + * @author Alexander Weigl + * @version 1 (04.04.24) + */ +module org.key_project.core.testgen { + requires org.key_project.core; + requires org.slf4j; + requires org.key_project.util; + requires org.key_project.ncore; + requires org.jspecify; + exports de.uka.ilkd.key.testgen.smt.testgen; + exports de.uka.ilkd.key.testgen.macros; + exports de.uka.ilkd.key.testgen.smt.counterexample; + exports de.uka.ilkd.key.testgen.settings; +} \ No newline at end of file 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 d17b0cf40e5..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.testgen.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 5ded65d639e..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.testgen.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/java/recoderext/ClassFileDeclarationManager.java b/key.core/src/main/java/de/uka/ilkd/key/java/recoderext/ClassFileDeclarationManager.java index 3aaa0c5e16b..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 de.uka.ilkd.key.java.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 ae3c0d2ca5a..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 de.uka.ilkd.key.java.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 6ec6ea2c2f8..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 de.uka.ilkd.key.java.KeYCrossReferenceSourceInfo; public class SchemaCrossReferenceSourceInfo extends KeYCrossReferenceSourceInfo { diff --git a/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java b/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java index 82fd458fc78..a5ba764104c 100644 --- a/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java +++ b/key.core/src/main/java/de/uka/ilkd/key/proof/io/AbstractProblemLoader.java @@ -378,33 +378,35 @@ private Throwable unwrap(Throwable e) { */ protected ProblemLoaderException recoverParserErrorMessage(Exception e) { // try to resolve error message - - /* weigl These are exception from antlr3, these should not happen anymore - final Throwable c0 = unwrap(e); - if (c0 instanceof org.antlr.runtime.RecognitionException re) { - final org.antlr.runtime.Token occurrence = re.token; // may be null - if (c0 instanceof org.antlr.runtime.MismatchedTokenException) { - if (c0 instanceof org.antlr.runtime.MissingTokenException) { - final org.antlr.runtime.MissingTokenException mte = - (org.antlr.runtime.MissingTokenException) c0; - final String readable = missedErrors.get(mte.expecting); - final String token = readable == null ? "token id " + mte.expecting : readable; - final String msg = "Syntax error: missing " + token - + (occurrence == null ? "" : " at " + occurrence.getText()) + " statement (" - + mte.input.getSourceName() + ":" + mte.line + ")"; - return new ProblemLoaderException(this, msg, mte); - } else { - final org.antlr.runtime.MismatchedTokenException mte = - (MismatchedTokenException) c0; - final String genericMsg = "expected " + mte.expecting + ", but found " + mte.c; - final String readable = - mismatchErrors.get(new Pair<>(mte.expecting, mte.c)); - final String msg = "Syntax error: " + (readable == null ? genericMsg : readable) - + " (" + mte.input.getSourceName() + ":" + mte.line + ")"; - return new ProblemLoaderException(this, msg, mte); - } - } - }*/ + + /* + * weigl These are exception from antlr3, these should not happen anymore + * final Throwable c0 = unwrap(e); + * if (c0 instanceof org.antlr.runtime.RecognitionException re) { + * final org.antlr.runtime.Token occurrence = re.token; // may be null + * if (c0 instanceof org.antlr.runtime.MismatchedTokenException) { + * if (c0 instanceof org.antlr.runtime.MissingTokenException) { + * final org.antlr.runtime.MissingTokenException mte = + * (org.antlr.runtime.MissingTokenException) c0; + * final String readable = missedErrors.get(mte.expecting); + * final String token = readable == null ? "token id " + mte.expecting : readable; + * final String msg = "Syntax error: missing " + token + * + (occurrence == null ? "" : " at " + occurrence.getText()) + " statement (" + * + mte.input.getSourceName() + ":" + mte.line + ")"; + * return new ProblemLoaderException(this, msg, mte); + * } else { + * final org.antlr.runtime.MismatchedTokenException mte = + * (MismatchedTokenException) c0; + * final String genericMsg = "expected " + mte.expecting + ", but found " + mte.c; + * final String readable = + * mismatchErrors.get(new Pair<>(mte.expecting, mte.c)); + * final String msg = "Syntax error: " + (readable == null ? genericMsg : readable) + * + " (" + mte.input.getSourceName() + ":" + mte.line + ")"; + * return new ProblemLoaderException(this, msg, mte); + * } + * } + * } + */ // default return new ProblemLoaderException(this, "Loading proof input failed", e); } 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 c70ed4487e7..faeb8ab3bb5 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 @@ -29,7 +29,6 @@ import de.uka.ilkd.key.util.MiscTools; import de.uka.ilkd.key.util.Triple; -import org.antlr.v4.runtime.Token; import org.key_project.logic.Name; import org.key_project.logic.Named; import org.key_project.logic.TermCreationException; @@ -38,6 +37,7 @@ import org.key_project.util.collection.ImmutableSLList; import org.key_project.util.collection.Pair; +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/java/module-info.java b/key.core/src/main/java/module-info.java index ab61a1fe083..59349dc6f7c 100644 --- a/key.core/src/main/java/module-info.java +++ b/key.core/src/main/java/module-info.java @@ -4,143 +4,15 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ -module org.key_project.core { - exports de.uka.ilkd.key.java; - exports de.uka.ilkd.key.java.abstraction; - exports de.uka.ilkd.key.logic.op; - exports de.uka.ilkd.key.proof; - exports de.uka.ilkd.key.proof.init; - exports de.uka.ilkd.key.rule; - exports de.uka.ilkd.key.speclang; - exports de.uka.ilkd.key.util; - exports de.uka.ilkd.key.java.statement; - exports de.uka.ilkd.key.java.expression; - exports de.uka.ilkd.key.java.reference; - exports de.uka.ilkd.key.logic; - exports de.uka.ilkd.key.java.expression.operator; - exports de.uka.ilkd.key.proof.mgt; - exports de.uka.ilkd.key.rule.inst; - exports de.uka.ilkd.key.java.recoderext; - exports de.uka.ilkd.key.logic.label; - exports de.uka.ilkd.key.prover.impl; - exports de.uka.ilkd.key.strategy; - exports de.uka.ilkd.key.pp; - exports de.uka.ilkd.key.speclang.jml.translation; - exports de.uka.ilkd.key.speclang.njml; - exports de.uka.ilkd.key.java.visitor; - exports de.uka.ilkd.key.control; - exports de.uka.ilkd.key.ldt; - exports de.uka.ilkd.key.rule.tacletbuilder; - exports de.uka.ilkd.key.settings; - exports de.uka.ilkd.key.rule.merge; - exports de.uka.ilkd.key.java.declaration; - exports de.uka.ilkd.key.logic.sort; - exports de.uka.ilkd.key.proof.io; - exports de.uka.ilkd.key.logic.equality; - exports de.uka.ilkd.key.rule.label; - exports de.uka.ilkd.key.macros; - exports de.uka.ilkd.key.macros.scripts; - exports de.uka.ilkd.key.prover; - exports de.uka.ilkd.key.strategy.feature; - exports de.uka.ilkd.key.strategy.definition; - exports de.uka.ilkd.key.speclang.translation; - exports de.uka.ilkd.key.proof.rulefilter; - exports de.uka.ilkd.key.strategy.feature.instantiator; - exports de.uka.ilkd.key.strategy.termProjection; - exports de.uka.ilkd.key.strategy.termfeature; - exports de.uka.ilkd.key.strategy.termgenerator; - exports de.uka.ilkd.key.control.instantiation_model; - exports de.uka.ilkd.key.parser; - exports de.uka.ilkd.key.proof.event; - exports de.uka.ilkd.key.proof.join; - exports org.key_project.proof; - exports de.uka.ilkd.key.util.mergerule; - exports de.uka.ilkd.key.proof.reference; - exports de.uka.ilkd.key.smt; - exports de.uka.ilkd.key.smt.solvertypes; - exports de.uka.ilkd.key.taclettranslation.assumptions; - exports de.uka.ilkd.key.smt.model; - exports de.uka.ilkd.key.rule.merge.procedures; - exports de.uka.ilkd.key.axiom_abstraction.predicateabstraction; - exports de.uka.ilkd.key.control.event; - exports de.uka.ilkd.key.informationflow.macros; - exports de.uka.ilkd.key.proof.io.consistency; - exports de.uka.ilkd.key.taclettranslation.lemma; - exports de.uka.ilkd.key.nparser; - exports de.uka.ilkd.key.proof.delayedcut; - exports de.uka.ilkd.key.speclang.jml; - exports de.uka.ilkd.key.smt.newsmt2; - exports de.uka.ilkd.key.util.pp; - exports de.uka.ilkd.key.axiom_abstraction; - requires org.slf4j; - requires key.recoder; - requires org.key_project.ncore; - requires org.key_project.util; - requires java.desktop; - requires org.jspecify; - requires org.antlr.antlr4.runtime; - requires java.scripting; +module org.key_project.core{exports de.uka.ilkd.key.java;exports de.uka.ilkd.key.java.abstraction;exports de.uka.ilkd.key.logic.op;exports de.uka.ilkd.key.proof;exports de.uka.ilkd.key.proof.init;exports de.uka.ilkd.key.rule;exports de.uka.ilkd.key.speclang;exports de.uka.ilkd.key.util;exports de.uka.ilkd.key.java.statement;exports de.uka.ilkd.key.java.expression;exports de.uka.ilkd.key.java.reference;exports de.uka.ilkd.key.logic;exports de.uka.ilkd.key.java.expression.operator;exports de.uka.ilkd.key.proof.mgt;exports de.uka.ilkd.key.rule.inst;exports de.uka.ilkd.key.java.recoderext;exports de.uka.ilkd.key.logic.label;exports de.uka.ilkd.key.prover.impl;exports de.uka.ilkd.key.strategy;exports de.uka.ilkd.key.pp;exports de.uka.ilkd.key.speclang.jml.translation;exports de.uka.ilkd.key.speclang.njml;exports de.uka.ilkd.key.java.visitor;exports de.uka.ilkd.key.control;exports de.uka.ilkd.key.ldt;exports de.uka.ilkd.key.rule.tacletbuilder;exports de.uka.ilkd.key.settings;exports de.uka.ilkd.key.rule.merge;exports de.uka.ilkd.key.java.declaration;exports de.uka.ilkd.key.logic.sort;exports de.uka.ilkd.key.proof.io;exports de.uka.ilkd.key.logic.equality;exports de.uka.ilkd.key.rule.label;exports de.uka.ilkd.key.macros;exports de.uka.ilkd.key.macros.scripts;exports de.uka.ilkd.key.prover;exports de.uka.ilkd.key.strategy.feature;exports de.uka.ilkd.key.strategy.definition;exports de.uka.ilkd.key.speclang.translation;exports de.uka.ilkd.key.proof.rulefilter;exports de.uka.ilkd.key.strategy.feature.instantiator;exports de.uka.ilkd.key.strategy.termProjection;exports de.uka.ilkd.key.strategy.termfeature;exports de.uka.ilkd.key.strategy.termgenerator;exports de.uka.ilkd.key.control.instantiation_model;exports de.uka.ilkd.key.parser;exports de.uka.ilkd.key.proof.event;exports de.uka.ilkd.key.proof.join;exports org.key_project.proof;exports de.uka.ilkd.key.util.mergerule;exports de.uka.ilkd.key.proof.reference;exports de.uka.ilkd.key.smt;exports de.uka.ilkd.key.smt.solvertypes;exports de.uka.ilkd.key.taclettranslation.assumptions;exports de.uka.ilkd.key.smt.model;exports de.uka.ilkd.key.rule.merge.procedures;exports de.uka.ilkd.key.axiom_abstraction.predicateabstraction;exports de.uka.ilkd.key.control.event;exports de.uka.ilkd.key.informationflow.macros;exports de.uka.ilkd.key.proof.io.consistency;exports de.uka.ilkd.key.taclettranslation.lemma;exports de.uka.ilkd.key.nparser;exports de.uka.ilkd.key.proof.delayedcut;exports de.uka.ilkd.key.speclang.jml;exports de.uka.ilkd.key.smt.newsmt2;exports de.uka.ilkd.key.util.pp;exports de.uka.ilkd.key.axiom_abstraction;exports de.uka.ilkd.key.proof.replay;exports de.uka.ilkd.key.smt.communication;exports de.uka.ilkd.key.proof.io.intermediate;exports de.uka.ilkd.key.proof.proofevent;exports de.uka.ilkd.key.util.parsing;exports de.uka.ilkd.key.smt.lang;requires org.slf4j;requires key.recoder;requires org.key_project.ncore;requires org.key_project.util;requires java.desktop;requires org.jspecify;requires org.antlr.antlr4.runtime;requires java.scripting; - provides ProofMacro with - de.uka.ilkd.key.informationflow.macros.FullInformationFlowAutoPilotMacro, - de.uka.ilkd.key.informationflow.macros.AuxiliaryComputationAutoPilotMacro, - de.uka.ilkd.key.informationflow.macros.StartAuxiliaryComputationMacro, - de.uka.ilkd.key.informationflow.macros.FinishAuxiliaryComputationMacro, - de.uka.ilkd.key.macros.FullAutoPilotProofMacro, - de.uka.ilkd.key.macros.AutoPilotPrepareProofMacro, - de.uka.ilkd.key.macros.SMTPreparationMacro, - de.uka.ilkd.key.informationflow.macros.StateExpansionAndInfFlowContractApplicationMacro, - de.uka.ilkd.key.informationflow.macros.SelfcompositionStateExpansionMacro, - de.uka.ilkd.key.informationflow.macros.FullUseInformationFlowContractMacro, - de.uka.ilkd.key.macros.PropositionalExpansionMacro, - de.uka.ilkd.key.macros.FullPropositionalExpansionMacro, - de.uka.ilkd.key.macros.TryCloseMacro, - de.uka.ilkd.key.macros.FinishSymbolicExecutionMacro, - de.uka.ilkd.key.macros.AutoMacro, - de.uka.ilkd.key.macros.HeapSimplificationMacro, - de.uka.ilkd.key.macros.IntegerSimplificationMacro, - de.uka.ilkd.key.macros.OneStepProofMacro, - de.uka.ilkd.key.macros.WellDefinednessMacro, - de.uka.ilkd.key.macros.UpdateSimplificationMacro, - de.uka.ilkd.key.macros.TranscendentalFloatSMTMacro; +provides ProofMacro with de.uka.ilkd.key.informationflow.macros.FullInformationFlowAutoPilotMacro,de.uka.ilkd.key.informationflow.macros.AuxiliaryComputationAutoPilotMacro,de.uka.ilkd.key.informationflow.macros.StartAuxiliaryComputationMacro,de.uka.ilkd.key.informationflow.macros.FinishAuxiliaryComputationMacro,de.uka.ilkd.key.macros.FullAutoPilotProofMacro,de.uka.ilkd.key.macros.AutoPilotPrepareProofMacro,de.uka.ilkd.key.macros.SMTPreparationMacro,de.uka.ilkd.key.informationflow.macros.StateExpansionAndInfFlowContractApplicationMacro,de.uka.ilkd.key.informationflow.macros.SelfcompositionStateExpansionMacro,de.uka.ilkd.key.informationflow.macros.FullUseInformationFlowContractMacro,de.uka.ilkd.key.macros.PropositionalExpansionMacro,de.uka.ilkd.key.macros.FullPropositionalExpansionMacro,de.uka.ilkd.key.macros.TryCloseMacro,de.uka.ilkd.key.macros.FinishSymbolicExecutionMacro,de.uka.ilkd.key.macros.AutoMacro,de.uka.ilkd.key.macros.HeapSimplificationMacro,de.uka.ilkd.key.macros.IntegerSimplificationMacro,de.uka.ilkd.key.macros.OneStepProofMacro,de.uka.ilkd.key.macros.WellDefinednessMacro,de.uka.ilkd.key.macros.UpdateSimplificationMacro,de.uka.ilkd.key.macros.TranscendentalFloatSMTMacro; - provides ProofScriptCommand with - de.uka.ilkd.key.macros.scripts.EchoCommand, - de.uka.ilkd.key.macros.scripts.MacroCommand, - de.uka.ilkd.key.macros.scripts.FocusCommand, - de.uka.ilkd.key.macros.scripts.AutoCommand, - de.uka.ilkd.key.macros.scripts.CutCommand, - de.uka.ilkd.key.macros.scripts.SetCommand, - de.uka.ilkd.key.macros.scripts.SetEchoCommand, - de.uka.ilkd.key.macros.scripts.SetFailOnClosedCommand, - de.uka.ilkd.key.macros.scripts.SMTCommand, - de.uka.ilkd.key.macros.scripts.RuleCommand, - de.uka.ilkd.key.macros.scripts.ActivateCommand, - de.uka.ilkd.key.macros.scripts.LeaveCommand, - de.uka.ilkd.key.macros.scripts.TryCloseCommand, - de.uka.ilkd.key.macros.scripts.ExitCommand, - de.uka.ilkd.key.macros.scripts.InstantiateCommand, - de.uka.ilkd.key.macros.scripts.SelectCommand, - de.uka.ilkd.key.macros.scripts.ScriptCommand, - de.uka.ilkd.key.macros.scripts.LetCommand, - de.uka.ilkd.key.macros.scripts.SaveInstCommand, - de.uka.ilkd.key.macros.scripts.SaveNewNameCommand, - de.uka.ilkd.key.macros.scripts.SchemaVarCommand, - de.uka.ilkd.key.macros.scripts.JavascriptCommand, - de.uka.ilkd.key.macros.scripts.SkipCommand, - de.uka.ilkd.key.macros.scripts.AxiomCommand, - de.uka.ilkd.key.macros.scripts.AssumeCommand, - de.uka.ilkd.key.macros.scripts.AssertCommand, - de.uka.ilkd.key.macros.scripts.RewriteCommand, - de.uka.ilkd.key.macros.scripts.AllCommand, - de.uka.ilkd.key.macros.scripts.HideCommand, - de.uka.ilkd.key.macros.scripts.UnhideCommand; +provides ProofScriptCommand with de.uka.ilkd.key.macros.scripts.EchoCommand,de.uka.ilkd.key.macros.scripts.MacroCommand,de.uka.ilkd.key.macros.scripts.FocusCommand,de.uka.ilkd.key.macros.scripts.AutoCommand,de.uka.ilkd.key.macros.scripts.CutCommand,de.uka.ilkd.key.macros.scripts.SetCommand,de.uka.ilkd.key.macros.scripts.SetEchoCommand,de.uka.ilkd.key.macros.scripts.SetFailOnClosedCommand,de.uka.ilkd.key.macros.scripts.SMTCommand,de.uka.ilkd.key.macros.scripts.RuleCommand,de.uka.ilkd.key.macros.scripts.ActivateCommand,de.uka.ilkd.key.macros.scripts.LeaveCommand,de.uka.ilkd.key.macros.scripts.TryCloseCommand,de.uka.ilkd.key.macros.scripts.ExitCommand,de.uka.ilkd.key.macros.scripts.InstantiateCommand,de.uka.ilkd.key.macros.scripts.SelectCommand,de.uka.ilkd.key.macros.scripts.ScriptCommand,de.uka.ilkd.key.macros.scripts.LetCommand,de.uka.ilkd.key.macros.scripts.SaveInstCommand,de.uka.ilkd.key.macros.scripts.SaveNewNameCommand,de.uka.ilkd.key.macros.scripts.SchemaVarCommand,de.uka.ilkd.key.macros.scripts.JavascriptCommand,de.uka.ilkd.key.macros.scripts.SkipCommand,de.uka.ilkd.key.macros.scripts.AxiomCommand,de.uka.ilkd.key.macros.scripts.AssumeCommand,de.uka.ilkd.key.macros.scripts.AssertCommand,de.uka.ilkd.key.macros.scripts.RewriteCommand,de.uka.ilkd.key.macros.scripts.AllCommand,de.uka.ilkd.key.macros.scripts.HideCommand,de.uka.ilkd.key.macros.scripts.UnhideCommand; - provides DefaultProfileResolver with - de.uka.ilkd.key.proof.init.JavaProfileDefaultProfileResolver, - de.uka.ilkd.key.proof.init.JavaProfileWithPermissionsDefaultProfileResolver; +provides DefaultProfileResolver with de.uka.ilkd.key.proof.init.JavaProfileDefaultProfileResolver,de.uka.ilkd.key.proof.init.JavaProfileWithPermissionsDefaultProfileResolver; -} \ No newline at end of file +} diff --git a/key.core/src/test/java/de/uka/ilkd/key/smt/newsmt2/TestSMTMod.java b/key.core/src/test/java/de/uka/ilkd/key/smt/newsmt2/TestSMTMod.java index 664b631aca8..8c84069e5e4 100644 --- a/key.core/src/test/java/de/uka/ilkd/key/smt/newsmt2/TestSMTMod.java +++ b/key.core/src/test/java/de/uka/ilkd/key/smt/newsmt2/TestSMTMod.java @@ -20,7 +20,7 @@ import org.key_project.util.helper.FindResources; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.removegenerics/src/main/java/module-info.java b/key.removegenerics/src/main/java/module-info.java index 5a183a653c3..27f1eb8cef0 100644 --- a/key.removegenerics/src/main/java/module-info.java +++ b/key.removegenerics/src/main/java/module-info.java @@ -1,6 +1,6 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module org.key_project.removegenerics { diff --git a/key.ui/build.gradle b/key.ui/build.gradle index 93edbc44890..fbc953cf4d1 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 { @@ -25,8 +26,8 @@ dependencies { //logging implementation used by the slf4j implementation 'ch.qos.logback:logback-classic:1.5.6' - api 'org.key-project:docking-frames-common:1.1.3p1' - api 'org.key-project:docking-frames-core:1.1.3p1' + api 'org.key-project:docking-frames-common:1.1.3p4-SNAPSHOT' + api 'org.key-project:docking-frames-core:1.1.3p4-SNAPSHOT' runtimeOnly project(":keyext.ui.testgen") runtimeOnly project(":keyext.caching") 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 be2b2f1858a..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.ui.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 61f5b480e9e..7fc3f1e7617 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 169d6cb6f40..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.util.MiscTools; import de.uka.ilkd.key.ui.util.XMLResources; +import de.uka.ilkd.key.util.MiscTools; 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 bc010ce84e4..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.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.gui.extension.api.DefaultContextMenuKind; import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; import de.uka.ilkd.key.gui.extension.api.TabPanel; @@ -25,6 +21,10 @@ 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.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; 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 0824a8e538b..0ac73ab6e7c 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 @@ -34,12 +34,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 de.uka.ilkd.key.ui.util.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/KeyboardTacletExtension.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/KeyboardTacletExtension.java index 98b69815481..74d2a086860 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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,12 +30,15 @@ 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.dockingframes.common.common.action.CAction; +import org.key_project.dockingframes.common.common.action.CDropDownButton; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSet; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.action.CDropDownButton; import net.miginfocom.layout.CC; import net.miginfocom.swing.MigLayout; import org.jspecify.annotations.NonNull; 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 4b93b90b6aa..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.ui.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 bd44442cb02..7df299437e7 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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,17 +63,20 @@ 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.dockingframes.common.common.CControl; +import org.key_project.dockingframes.common.common.SingleCDockable; +import org.key_project.dockingframes.common.common.intern.CDockable; +import org.key_project.dockingframes.core.gui.dock.StackDockStation; +import org.key_project.dockingframes.core.gui.dock.station.stack.tab.layouting.TabPlacement; import org.key_project.logic.Name; -import bibliothek.gui.dock.StackDockStation; -import bibliothek.gui.dock.common.CControl; -import bibliothek.gui.dock.common.SingleCDockable; -import bibliothek.gui.dock.common.intern.CDockable; -import bibliothek.gui.dock.station.stack.tab.layouting.TabPlacement; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 8f3f7f0f4b6..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.ui.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/ProofMacroMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/ProofMacroMenu.java index 733abac2e5a..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.ui.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 bb597af2505..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.ui.core.InterruptListener; -import de.uka.ilkd.key.ui.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 69354de636d..fb320284b69 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.ui.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 0fc639c3455..81af7bb3279 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 @@ -16,15 +16,15 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; -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 de.uka.ilkd.key.java.Position; import de.uka.ilkd.key.macros.scripts.ProofScriptEngine; import de.uka.ilkd.key.macros.scripts.ScriptException; import de.uka.ilkd.key.parser.Location; import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; +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.slf4j.Logger; import org.slf4j.LoggerFactory; 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 d8daebd38a0..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.ui.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 e12b37c7517..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 fb57c55a6af..8d70df6266e 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 de.uka.ilkd.key.util.Triple; import org.slf4j.Logger; 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 6461297ead1..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.ui.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 a841228699a..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,19 +18,19 @@ import javax.swing.tree.TreePath; import de.uka.ilkd.key.control.AutoModeListener; -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.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.ui.proof.mgt.BasicTask; -import de.uka.ilkd.key.ui.proof.mgt.EnvNode; import de.uka.ilkd.key.proof.mgt.ProofEnvironment; import de.uka.ilkd.key.proof.mgt.ProofStatus; +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; 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 90b09071e80..85df7cb1418 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,7 +17,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.ui.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; @@ -43,19 +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.ui.util.ThreadUtilities; import org.key_project.util.collection.ImmutableSet; import org.key_project.util.collection.Pair; -import de.uka.ilkd.key.ui.util.SwingUtil; import org.antlr.v4.runtime.misc.ParseCancellationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -//import sun.misc.Signal; +// import sun.misc.Signal; /** * Implementation of {@link UserInterfaceControl} which controls the {@link MainWindow} with the @@ -80,16 +80,18 @@ public WindowUserInterfaceControl(MainWindow 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(); - } - });*/ + /* + * 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 } 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 81e6bf3900e..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 50ee6434762..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 a24b9a1a0ec..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 3563159a1ad..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 697c1e1788e..5a8364faf40 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 @@ -7,13 +7,13 @@ import java.beans.PropertyChangeListener; import javax.swing.*; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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.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 a4f62ab75be..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 @@ -12,7 +12,6 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.fonticons.IconFactory; - import de.uka.ilkd.key.ui.util.SwingUtil; /** 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 01a6ed9c2ac..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.ui.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 f87278d5197..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.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 de.uka.ilkd.key.gui.MainWindow; -import de.uka.ilkd.key.gui.keyshortcuts.KeyStrokeManager; 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 08ae9917602..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.ui.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 0dd0c24e760..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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/ProofManagementAction.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/ProofManagementAction.java index e47245d6d5d..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 2cb622ede03..a2eebe01b9c 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,12 +7,12 @@ import java.io.File; import javax.swing.*; -import de.uka.ilkd.key.ui.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.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 3adfaae705a..c357ddc7ca7 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 @@ -11,11 +11,11 @@ import javax.swing.JDialog; import javax.swing.JTextArea; -import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.gui.ProofScriptWorker; import de.uka.ilkd.key.java.Position; import de.uka.ilkd.key.parser.Location; +import de.uka.ilkd.key.ui.core.KeYMediator; /** * The Class ProofScriptInputAction. 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 3b2e7a0a766..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 5fae29ec725..9c4de3ab818 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.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.ui.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 7565e51504c..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.ui.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 b2532bba1da..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 1e1ea9a4728..f20243a704a 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 @@ -21,7 +21,6 @@ import javax.swing.filechooser.FileFilter; import javax.swing.text.html.HTMLEditorKit; -import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.parser.Location; @@ -29,6 +28,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/TermLabelMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/actions/TermLabelMenu.java index ae1ac16b6f5..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.gui.MainWindow; import de.uka.ilkd.key.ui.core.KeYSelectionEvent; import de.uka.ilkd.key.ui.core.KeYSelectionListener; -import de.uka.ilkd.key.gui.MainWindow; 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 4af0a51a0d9..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.ui.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 28a8c05ef75..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.ui.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 9d26786318b..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.ui.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 61064cae5f8..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.ui.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 234e0ef373e..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.ui.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 83b7096a959..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.ui.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 cedbddfa2ff..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.ui.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 6e1e1717e55..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.ui.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 935737bd4f6..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.ui.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/DockingHelper.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingHelper.java index 5c76e148649..a30e29314cf 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingHelper.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DockingHelper.java @@ -20,18 +20,13 @@ import de.uka.ilkd.key.gui.prooftree.ProofTreeView; import de.uka.ilkd.key.gui.sourceview.SourceViewFrame; -import bibliothek.gui.dock.common.CGrid; -import bibliothek.gui.dock.common.DefaultSingleCDockable; -import bibliothek.gui.dock.common.MultipleCDockable; -import bibliothek.gui.dock.common.SingleCDockable; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.action.CButton; -import bibliothek.gui.dock.common.action.CCheckBox; -import bibliothek.gui.dock.common.action.core.CommonDecoratableDockAction; -import bibliothek.gui.dock.common.intern.CDockable; -import bibliothek.gui.dock.common.intern.action.CDecorateableAction; -import bibliothek.gui.dock.control.focus.DefaultFocusRequest; -import bibliothek.gui.dock.control.focus.FocusRequest; +import org.key_project.dockingframes.common.common.*; +import org.key_project.dockingframes.common.common.action.*; +import org.key_project.dockingframes.common.common.action.core.*; +import org.key_project.dockingframes.common.common.intern.*; +import org.key_project.dockingframes.common.common.intern.action.*; +import org.key_project.dockingframes.core.gui.dock.control.focus.*; + import org.jspecify.annotations.NonNull; public class DockingHelper { 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 8b2d2a19cff..5e113c26cb4 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.ui.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,10 +23,12 @@ 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 org.key_project.dockingframes.common.common.CControl; +import org.key_project.dockingframes.core.gui.dock.util.IconManager; +import org.key_project.dockingframes.core.gui.dock.util.Priority; -import bibliothek.gui.dock.common.CControl; -import bibliothek.gui.dock.util.IconManager; -import bibliothek.gui.dock.util.Priority; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DynamicCMenu.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DynamicCMenu.java index c57dcedd03e..5a972dd55be 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DynamicCMenu.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/docking/DynamicCMenu.java @@ -6,17 +6,15 @@ import java.util.function.Supplier; import javax.swing.*; -import bibliothek.gui.Dockable; -import bibliothek.gui.dock.action.ActionType; -import bibliothek.gui.dock.action.DockActionSource; -import bibliothek.gui.dock.action.MenuDockAction; -import bibliothek.gui.dock.action.actions.SimpleDockAction; -import bibliothek.gui.dock.action.view.ActionViewConverter; -import bibliothek.gui.dock.action.view.ViewTarget; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.action.CMenu; -import bibliothek.gui.dock.common.action.core.CommonDecoratableDockAction; -import bibliothek.gui.dock.common.intern.action.CDecorateableAction; +import org.key_project.dockingframes.common.common.action.*; +import org.key_project.dockingframes.common.common.action.core.CommonDecoratableDockAction; +import org.key_project.dockingframes.common.common.intern.action.CDecorateableAction; +import org.key_project.dockingframes.core.gui.Dockable; +import org.key_project.dockingframes.core.gui.dock.action.*; +import org.key_project.dockingframes.core.gui.dock.action.actions.*; +import org.key_project.dockingframes.core.gui.dock.action.view.ActionViewConverter; +import org.key_project.dockingframes.core.gui.dock.action.view.ViewTarget; + /** * CMenu that gets (re-)generated when the action gets fired using the provided supplier. 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 99974566b68..ed82c60227e 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.ui.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 5bd366e366e..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.ui.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 2eb80fdd8f9..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.ui.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/api/TabPanel.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/TabPanel.java index 6c7dc4b05ba..0648ffd7dd4 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/TabPanel.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/extension/api/TabPanel.java @@ -7,8 +7,9 @@ import java.util.Collections; import javax.swing.*; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.intern.DefaultCDockable; +import org.key_project.dockingframes.common.common.action.CAction; +import org.key_project.dockingframes.common.common.intern.DefaultCDockable; + import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; 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 1380b37d2ed..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.ui.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 1e6a6dd588b..dfb3442dcf8 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.ui.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 071afe1da82..59bdad324b2 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,11 +13,11 @@ import de.uka.ilkd.key.gui.actions.KeyAction; import de.uka.ilkd.key.gui.fonticons.IconFactory; - import de.uka.ilkd.key.ui.util.SwingUtil; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.action.CButton; +import org.key_project.dockingframes.common.common.action.CAction; +import org.key_project.dockingframes.common.common.action.CButton; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 4c2569e9b58..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.ui.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 719dc0b7f98..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,8 +7,8 @@ import java.util.Collection; import java.util.LinkedList; -import de.uka.ilkd.key.ui.core.Main; import de.uka.ilkd.key.proof.Proof; +import de.uka.ilkd.key.ui.core.Main; import de.uka.ilkd.key.ui.util.CommandLine; import de.uka.ilkd.key.ui.util.CommandLineException; 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 4df44491d2e..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.ui.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 dd7d6780210..9e0bde820c3 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.ui.core.KeYMediator; import de.uka.ilkd.key.gui.ApplyTacletDialog; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.MainWindow; @@ -23,6 +22,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 2f82c4ef309..8905affc761 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.ui.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 4ca7179c2df..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.ui.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 1cb96d24a40..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.ui.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/SequentViewDock.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/SequentViewDock.java index a037dc0cdab..cac09f67a26 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.ui.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,10 +14,12 @@ 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 org.key_project.dockingframes.common.common.CLocation; +import org.key_project.dockingframes.common.common.DefaultMultipleCDockable; +import org.key_project.dockingframes.common.common.NullMultipleCDockableFactory; -import bibliothek.gui.dock.common.CLocation; -import bibliothek.gui.dock.common.DefaultMultipleCDockable; -import bibliothek.gui.dock.common.NullMultipleCDockableFactory; /** * @author Alexander Weigl 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 b33663adebc..05e6bddac01 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.ui.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 f7d65d3cdcd..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.ui.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 d1e5d6678f2..2acb6402e03 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.ui.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,13 +28,14 @@ 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.dockingframes.common.common.DefaultSingleCDockable; import org.key_project.util.collection.ImmutableArray; import org.key_project.util.collection.ImmutableList; import org.key_project.util.collection.ImmutableSLList; -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 ad6d8e5c1bc..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.ui.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 93de81a637b..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 e8257aee8fe..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.ui.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 95c1b62e205..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 b26931e8f5e..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.ui.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/ProofTreeSettingsMenuFactory.java b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeSettingsMenuFactory.java index 9e83ad4c04e..605c2ffcf9b 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeSettingsMenuFactory.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/gui/prooftree/ProofTreeSettingsMenuFactory.java @@ -11,10 +11,7 @@ import de.uka.ilkd.key.proof.Goal; import de.uka.ilkd.key.proof.Proof; -import bibliothek.gui.dock.common.action.CAction; -import bibliothek.gui.dock.common.action.CButton; -import bibliothek.gui.dock.common.action.CCheckBox; -import bibliothek.gui.dock.common.action.CMenu; +import org.key_project.dockingframes.common.common.action.*; import static de.uka.ilkd.key.gui.prooftree.ProofTreePopupFactory.ICON_SIZE; 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 f805151b45d..588d29920de 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.GUIListener; import de.uka.ilkd.key.gui.NodeInfoVisualizer; import de.uka.ilkd.key.gui.NodeInfoVisualizerListener; @@ -38,11 +35,14 @@ 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.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.dockingframes.common.common.action.CAction; import org.key_project.util.collection.ImmutableList; -import bibliothek.gui.dock.common.action.CAction; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 0a681e55bd4..cbeedf53396 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 @@ -12,6 +12,7 @@ import de.uka.ilkd.key.gui.configuration.Config; 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; @@ -92,11 +93,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 bcc5352bd97..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,7 +17,6 @@ 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 de.uka.ilkd.key.ui.util.SwingUtil; import org.slf4j.Logger; 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 d2cd78a87b0..a1d8775b61a 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.ui.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 56cd239151a..c8e18db4365 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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 121a04f0c1e..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.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.ui.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.ui.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 33b217c3ffc..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.ui.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 7cb937019a3..e1027b6bb03 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 @@ -11,8 +11,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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.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; @@ -30,7 +28,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.ui.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.prover.impl.DefaultTaskStartedInfo; import de.uka.ilkd.key.rule.IBuiltInRuleApp; 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 f0a3f179713..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.ui.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/ui/proof/io/ProblemLoader.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java index cdbaee3894c..1a3a890f4cb 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/proof/io/ProblemLoader.java @@ -8,7 +8,6 @@ import java.util.Properties; import javax.swing.SwingWorker; -import de.uka.ilkd.key.ui.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; @@ -20,6 +19,7 @@ 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/ui/util/SwingUtil.java b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java index 75af2256f81..242ef7460c8 100644 --- a/key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java +++ b/key.ui/src/main/java/de/uka/ilkd/key/ui/util/SwingUtil.java @@ -17,7 +17,8 @@ import de.uka.ilkd.key.gui.fonticons.IconFactory; -import bibliothek.gui.dock.themes.basic.BasicDockableDisplayer; +import org.key_project.dockingframes.core.gui.dock.themes.basic.BasicDockableDisplayer; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/key.ui/src/main/java/module-info.java b/key.ui/src/main/java/module-info.java index 627806cab58..9cc8a6495f9 100644 --- a/key.ui/src/main/java/module-info.java +++ b/key.ui/src/main/java/module-info.java @@ -1,9 +1,28 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module org.key_project.ui { + exports de.uka.ilkd.key.gui.extension.api; + exports de.uka.ilkd.key.gui.help; + exports de.uka.ilkd.key.ui.core; + exports de.uka.ilkd.key.gui; + exports de.uka.ilkd.key.gui.settings; + exports de.uka.ilkd.key.gui.colors; + exports de.uka.ilkd.key.ui.util; + exports de.uka.ilkd.key.gui.actions; + exports de.uka.ilkd.key.gui.fonticons; + exports de.uka.ilkd.key.gui.prooftree; + exports de.uka.ilkd.key.gui.configuration; + exports de.uka.ilkd.key.gui.smt; + exports de.uka.ilkd.key.gui.keyshortcuts; + exports de.uka.ilkd.key.ui; + exports de.uka.ilkd.key.ui.proof.io; + + requires dockingframes.core; + requires dockingframes.common; + requires org.slf4j; requires java.desktop; requires org.key_project.core; 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 b5b48e45fe7..0f00103f233 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,17 +13,17 @@ import java.util.stream.Collectors; import javax.swing.*; -import de.uka.ilkd.key.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.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 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.key_project.dockingframes.core.gui.dock.dockable.AbstractDockable; + import org.junit.jupiter.api.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 5bb6def7d49..5e1b3e7c3e2 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 e2139ccc555..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.ui.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 355cf5046e7..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.ui.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 2d23ff25f1f..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 b946ff02334..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,7 +10,6 @@ import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.proof.Proof; import de.uka.ilkd.key.proof.reference.ClosedBy; - import de.uka.ilkd.key.ui.util.SwingUtil; import org.slf4j.Logger; 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 456d74cf57f..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.ui.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 5364c3fd656..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.ui.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 126f2bdf0fd..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.ui.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 0ea361c8c2d..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.ui.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 fd1fd85e384..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.ui.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 5c04662034e..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.ui.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/main/java/module-info.java b/keyext.caching/src/main/java/module-info.java index fd9b38ea05c..d2c0c0462bf 100644 --- a/keyext.caching/src/main/java/module-info.java +++ b/keyext.caching/src/main/java/module-info.java @@ -1,7 +1,11 @@ +import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; +import de.uka.ilkd.key.gui.plugins.caching.CachingExtension; + /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ -module keyext.caching { -} \ No newline at end of file +module keyext.caching{requires org.key_project.ui;requires org.key_project.core;requires org.slf4j;requires org.jspecify;requires java.desktop;requires org.key_project.util;requires org.key_project.ncore;requires keyext.slicing;requires com.miglayout.core; + +provides KeYGuiExtension with CachingExtension;} 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/module-info.java b/keyext.exploration/src/main/java/module-info.java index 08fd3443676..92d8ba9ed2c 100644 --- a/keyext.exploration/src/main/java/module-info.java +++ b/keyext.exploration/src/main/java/module-info.java @@ -1,7 +1,14 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module keyext.exploration { + requires transitive org.key_project.ui; + requires org.key_project.core; + requires org.jspecify; + requires java.desktop; + requires org.key_project.ncore; + requires org.key_project.util; + requires dockingframes.common; } \ No newline at end of file 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 e30b4e27ea6..a33ae2e827d 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 2cea7859207..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,8 +14,8 @@ 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; /** 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 36b6ce7b74f..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.ui.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 0821e0c5f46..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 4da7d51df4e..e6aa07e9bfd 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.ui.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,11 +18,12 @@ 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.dockingframes.common.common.action.CAction; import org.key_project.exploration.ExplorationNodeData; import org.key_project.exploration.Icons; -import bibliothek.gui.dock.common.action.CAction; import org.jspecify.annotations.NonNull; import org.jspecify.annotations.Nullable; diff --git a/keyext.proofmanagement/src/main/java/module-info.java b/keyext.proofmanagement/src/main/java/module-info.java index 39e27dede8f..0342bf50e2f 100644 --- a/keyext.proofmanagement/src/main/java/module-info.java +++ b/keyext.proofmanagement/src/main/java/module-info.java @@ -1,7 +1,15 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module keyext.proofmanagement { + requires org.key_project.ui; + requires org.jspecify; + requires java.desktop; + requires org.slf4j; + requires org.key_project.core; + requires org.key_project.util; + requires org.key_project.ncore; + /* not available requires ST4; */ } \ No newline at end of file diff --git a/keyext.slicing/src/main/java/module-info.java b/keyext.slicing/src/main/java/module-info.java index d05ecbc927f..744e7eac2ce 100644 --- a/keyext.slicing/src/main/java/module-info.java +++ b/keyext.slicing/src/main/java/module-info.java @@ -1,7 +1,19 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module keyext.slicing { + requires org.key_project.core; + requires org.key_project.ui; + requires java.desktop; + requires org.jspecify; + requires org.slf4j; + requires com.miglayout.core; + requires org.key_project.util; + requires org.key_project.ncore; + requires dockingframes.common; + requires dockingframes.core; + exports org.key_project.slicing; + exports org.key_project.slicing.analysis; } \ No newline at end of file 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 08ce6e0aae2..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,11 +12,11 @@ import de.uka.ilkd.key.control.DefaultUserInterfaceControl; import de.uka.ilkd.key.control.KeYEnvironment; -import de.uka.ilkd.key.ui.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.ui.core.Log; import de.uka.ilkd.key.ui.util.CommandLine; import de.uka.ilkd.key.ui.util.CommandLineException; 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 ae4b9b730a3..59c150fb291 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 3941fa2249f..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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 8525ae47b76..afa7c46a311 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.ui.core.KeYMediator; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.core.KeYSelectionListener; import de.uka.ilkd.key.gui.IssueDialog; import de.uka.ilkd.key.gui.KeYFileChooser; import de.uka.ilkd.key.gui.MainWindow; @@ -32,9 +29,13 @@ 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.ui.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.dockingframes.common.common.action.CAction; import org.key_project.slicing.DependencyTracker; import org.key_project.slicing.SlicingExtension; import org.key_project.slicing.SlicingProofReplayer; @@ -43,7 +44,6 @@ import org.key_project.slicing.util.GenericWorker; import org.key_project.slicing.util.GraphvizDotExecutor; -import bibliothek.gui.dock.common.action.CAction; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 b89e87f6759..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.ui.core.InterruptListener; -import de.uka.ilkd.key.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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.testgen.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.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.smt.solvertypes.SolverTypes; +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/TGWorker.java b/keyext.ui.testgen/src/main/java/de/uka/ilkd/key/gui/testgen/TGWorker.java index 320ecc69137..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.ui.core.InterruptListener; -import de.uka.ilkd.key.ui.core.KeYMediator; import de.uka.ilkd.key.gui.MainWindow; import de.uka.ilkd.key.java.Services; import de.uka.ilkd.key.logic.Sequent; @@ -20,6 +18,8 @@ import de.uka.ilkd.key.proof.mgt.SpecificationRepository; 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 4f1aff0a97c..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.ui.core.KeYSelectionEvent; -import de.uka.ilkd.key.ui.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 c445c512467..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.ui.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.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/module-info.java b/keyext.ui.testgen/src/main/java/module-info.java index 97aedec13a5..77a6820bc89 100644 --- a/keyext.ui.testgen/src/main/java/module-info.java +++ b/keyext.ui.testgen/src/main/java/module-info.java @@ -1,7 +1,13 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module keyext.ui.testgen { + requires java.desktop; + requires org.key_project.ui; + requires org.slf4j; + requires org.key_project.core; + requires org.key_project.core.testgen; + requires org.jspecify; } \ No newline at end of file diff --git a/recoder/src/main/java/module-info.java b/recoder/src/main/java/module-info.java index 21f69e729ff..373c3347ab5 100644 --- a/recoder/src/main/java/module-info.java +++ b/recoder/src/main/java/module-info.java @@ -1,6 +1,6 @@ /** * - * @author Alexander Weigl + * @author Alexander Weigl * @version 1 (31.03.24) */ module key.recoder { From dc253d7b121357f9914a9348c323de873f03f149 Mon Sep 17 00:00:00 2001 From: Alexander Weigl Date: Thu, 4 Apr 2024 03:15:32 +0200 Subject: [PATCH 4/4] add provided services --- .../src/main/java/module-info.java | 4 +++- .../src/main/java/module-info.java | 17 ++++++----------- .../de.uka.ilkd.key.macros.ProofMacro | 2 +- .../src/main/java/module-info.java | 14 +++++--------- .../src/main/java/module-info.java | 17 +++++++---------- keyext.slicing/src/main/java/module-info.java | 19 +++++-------------- .../src/main/java/module-info.java | 13 +++++-------- 7 files changed, 32 insertions(+), 54 deletions(-) diff --git a/key.core.symbolic_execution/src/main/java/module-info.java b/key.core.symbolic_execution/src/main/java/module-info.java index e0f66a0149c..85d5f648cdd 100644 --- a/key.core.symbolic_execution/src/main/java/module-info.java +++ b/key.core.symbolic_execution/src/main/java/module-info.java @@ -1,5 +1,7 @@ +import de.uka.ilkd.key.proof.init.DefaultProfileResolver; import de.uka.ilkd.key.proof.init.POExtension; import de.uka.ilkd.key.symbolic_execution.po.TruthValuePOExtension; +import de.uka.ilkd.key.symbolic_execution.profile.SymbolicExecutionJavaProfileDefaultProfileResolver; /** * @@ -8,4 +10,4 @@ */ module org.key_project.symbolic_execution{exports de.uka.ilkd.key.symbolic_execution;exports de.uka.ilkd.key.symbolic_execution.model;exports de.uka.ilkd.key.symbolic_execution.po;exports de.uka.ilkd.key.symbolic_execution.profile;exports de.uka.ilkd.key.symbolic_execution.strategy;exports de.uka.ilkd.key.symbolic_execution.strategy.breakpoint;exports de.uka.ilkd.key.symbolic_execution.util;requires java.xml;requires org.key_project.core;requires org.key_project.ncore;requires org.key_project.util;requires java.desktop;requires org.slf4j;requires org.jspecify; -provides POExtension with TruthValuePOExtension;} +provides DefaultProfileResolver with SymbolicExecutionJavaProfileDefaultProfileResolver;provides POExtension with TruthValuePOExtension;} diff --git a/key.core.testgen/src/main/java/module-info.java b/key.core.testgen/src/main/java/module-info.java index 9a2d85a8960..32db629691d 100644 --- a/key.core.testgen/src/main/java/module-info.java +++ b/key.core.testgen/src/main/java/module-info.java @@ -1,16 +1,11 @@ +import de.uka.ilkd.key.macros.ProofMacro; +import de.uka.ilkd.key.testgen.macros.TestGenMacro; + /** * * @author Alexander Weigl * @version 1 (04.04.24) */ -module org.key_project.core.testgen { - requires org.key_project.core; - requires org.slf4j; - requires org.key_project.util; - requires org.key_project.ncore; - requires org.jspecify; - exports de.uka.ilkd.key.testgen.smt.testgen; - exports de.uka.ilkd.key.testgen.macros; - exports de.uka.ilkd.key.testgen.smt.counterexample; - exports de.uka.ilkd.key.testgen.settings; -} \ No newline at end of file +module org.key_project.core.testgen{requires org.key_project.core;requires org.slf4j;requires org.key_project.util;requires org.key_project.ncore;requires org.jspecify;exports de.uka.ilkd.key.testgen.smt.testgen;exports de.uka.ilkd.key.testgen.macros;exports de.uka.ilkd.key.testgen.smt.counterexample;exports de.uka.ilkd.key.testgen.settings; + +provides ProofMacro with TestGenMacro;} 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/keyext.exploration/src/main/java/module-info.java b/keyext.exploration/src/main/java/module-info.java index 92d8ba9ed2c..322ba9b2bfd 100644 --- a/keyext.exploration/src/main/java/module-info.java +++ b/keyext.exploration/src/main/java/module-info.java @@ -1,14 +1,10 @@ +import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; + /** * * @author Alexander Weigl * @version 1 (31.03.24) */ -module keyext.exploration { - requires transitive org.key_project.ui; - requires org.key_project.core; - requires org.jspecify; - requires java.desktop; - requires org.key_project.ncore; - requires org.key_project.util; - requires dockingframes.common; -} \ No newline at end of file +module keyext.exploration{requires transitive org.key_project.ui;requires org.key_project.core;requires org.jspecify;requires java.desktop;requires org.key_project.ncore;requires org.key_project.util;requires dockingframes.common; + +provides KeYGuiExtension with org.key_project.exploration.ExplorationExtension;} diff --git a/keyext.proofmanagement/src/main/java/module-info.java b/keyext.proofmanagement/src/main/java/module-info.java index 0342bf50e2f..974ce1e0f1a 100644 --- a/keyext.proofmanagement/src/main/java/module-info.java +++ b/keyext.proofmanagement/src/main/java/module-info.java @@ -1,15 +1,12 @@ +import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; + /** * * @author Alexander Weigl * @version 1 (31.03.24) */ -module keyext.proofmanagement { - requires org.key_project.ui; - requires org.jspecify; - requires java.desktop; - requires org.slf4j; - requires org.key_project.core; - requires org.key_project.util; - requires org.key_project.ncore; - /* not available requires ST4; */ -} \ No newline at end of file +module keyext.proofmanagement{requires org.key_project.ui;requires org.jspecify;requires java.desktop;requires org.slf4j;requires org.key_project.core;requires org.key_project.util;requires org.key_project.ncore; +/* not available requires ST4; */ + + +provides KeYGuiExtension with org.key_project.proofmanagement.ProofManagementExt;} diff --git a/keyext.slicing/src/main/java/module-info.java b/keyext.slicing/src/main/java/module-info.java index 744e7eac2ce..e27dea16fb9 100644 --- a/keyext.slicing/src/main/java/module-info.java +++ b/keyext.slicing/src/main/java/module-info.java @@ -1,19 +1,10 @@ +import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; + /** * * @author Alexander Weigl * @version 1 (31.03.24) */ -module keyext.slicing { - requires org.key_project.core; - requires org.key_project.ui; - requires java.desktop; - requires org.jspecify; - requires org.slf4j; - requires com.miglayout.core; - requires org.key_project.util; - requires org.key_project.ncore; - requires dockingframes.common; - requires dockingframes.core; - exports org.key_project.slicing; - exports org.key_project.slicing.analysis; -} \ No newline at end of file +module keyext.slicing{requires org.key_project.core;requires org.key_project.ui;requires java.desktop;requires org.jspecify;requires org.slf4j;requires com.miglayout.core;requires org.key_project.util;requires org.key_project.ncore;requires dockingframes.common;requires dockingframes.core;exports org.key_project.slicing;exports org.key_project.slicing.analysis; + +provides KeYGuiExtension with org.key_project.slicing.SlicingExtension;} diff --git a/keyext.ui.testgen/src/main/java/module-info.java b/keyext.ui.testgen/src/main/java/module-info.java index 77a6820bc89..d6853b53e37 100644 --- a/keyext.ui.testgen/src/main/java/module-info.java +++ b/keyext.ui.testgen/src/main/java/module-info.java @@ -1,13 +1,10 @@ +import de.uka.ilkd.key.gui.extension.api.KeYGuiExtension; + /** * * @author Alexander Weigl * @version 1 (31.03.24) */ -module keyext.ui.testgen { - requires java.desktop; - requires org.key_project.ui; - requires org.slf4j; - requires org.key_project.core; - requires org.key_project.core.testgen; - requires org.jspecify; -} \ No newline at end of file +module keyext.ui.testgen{requires java.desktop;requires org.key_project.ui;requires org.slf4j;requires org.key_project.core;requires org.key_project.core.testgen;requires org.jspecify; + +provides KeYGuiExtension with de.uka.ilkd.key.gui.testgen.TestgenExtension;}