Skip to content

Commit d10c2e7

Browse files
committed
Moved rule instantiation related types to corresponding package (and gave the package a better name)
1 parent e6ba6a3 commit d10c2e7

File tree

107 files changed

+219
-192
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+219
-192
lines changed

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/rule/label/FormulaTermLabelUpdate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import de.uka.ilkd.key.symbolic_execution.TruthValueTracingUtil;
2222

2323
import org.key_project.logic.Name;
24-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
2524
import org.key_project.prover.rules.Rule;
2625
import org.key_project.prover.rules.RuleApp;
26+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
2727
import org.key_project.prover.sequent.PosInOccurrence;
2828
import org.key_project.prover.sequent.SequentFormula;
2929
import org.key_project.util.collection.ImmutableList;

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/TruthValueTracingUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
import org.key_project.logic.Name;
3838
import org.key_project.logic.op.SortedOperator;
3939
import org.key_project.logic.sort.Sort;
40-
import org.key_project.prover.rules.AssumesFormulaInstSeq;
41-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
4240
import org.key_project.prover.rules.RuleApp;
41+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstSeq;
42+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
4343
import org.key_project.prover.rules.tacletbuilder.TacletGoalTemplate;
4444
import org.key_project.prover.sequent.PosInOccurrence;
4545
import org.key_project.prover.sequent.Sequent;

key.core.symbolic_execution/src/main/java/de/uka/ilkd/key/symbolic_execution/strategy/SimplifyTermStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import de.uka.ilkd.key.symbolic_execution.util.SymbolicExecutionUtil;
1414

1515
import org.key_project.logic.Name;
16-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
16+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
1717

1818
/**
1919
* {@link Strategy} used to simplify {@link Term}s in side proofs.

key.core/src/main/java/de/uka/ilkd/key/api/Matcher.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import de.uka.ilkd.key.rule.match.vm.VMTacletMatcher;
1414

1515
import org.key_project.logic.Name;
16-
import org.key_project.prover.rules.AssumesFormulaInstSeq;
17-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
18-
import org.key_project.prover.rules.AssumesMatchResult;
19-
import org.key_project.prover.rules.inst.SVInstantiations;
16+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstSeq;
17+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
18+
import org.key_project.prover.rules.instantiation.AssumesMatchResult;
19+
import org.key_project.prover.rules.instantiation.SVInstantiations;
2020
import org.key_project.prover.sequent.Sequent;
2121
import org.key_project.prover.sequent.SequentFormula;
2222
import org.key_project.util.collection.ImmutableArray;

key.core/src/main/java/de/uka/ilkd/key/api/SearchNode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import de.uka.ilkd.key.logic.Term;
77

8-
import org.key_project.prover.rules.MatchConditions;
9-
import org.key_project.prover.rules.inst.SVInstantiations;
8+
import org.key_project.prover.rules.instantiation.MatchConditions;
9+
import org.key_project.prover.rules.instantiation.SVInstantiations;
1010
import org.key_project.prover.sequent.SequentFormula;
1111

1212
/**

key.core/src/main/java/de/uka/ilkd/key/control/AbstractProofControl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import de.uka.ilkd.key.strategy.FocussedBreakpointRuleApplicationManager;
2323
import de.uka.ilkd.key.strategy.FocussedRuleApplicationManager;
2424

25-
import org.key_project.prover.rules.AssumesFormulaInstSeq;
26-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
25+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstSeq;
26+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
2727
import org.key_project.prover.sequent.PosInOccurrence;
2828
import org.key_project.util.collection.DefaultImmutableSet;
2929
import org.key_project.util.collection.ImmutableList;

key.core/src/main/java/de/uka/ilkd/key/control/instantiation_model/TacletAssumesModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import de.uka.ilkd.key.util.RecognitionException;
2323

2424
import org.key_project.logic.LogicServices;
25-
import org.key_project.prover.rules.AssumesFormulaInstDirect;
26-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
25+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstDirect;
26+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
2727
import org.key_project.prover.sequent.SequentFormula;
2828
import org.key_project.util.collection.ImmutableList;
2929

key.core/src/main/java/de/uka/ilkd/key/control/instantiation_model/TacletInstantiationModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import de.uka.ilkd.key.rule.inst.SortException;
1717

1818
import org.key_project.logic.Namespace;
19-
import org.key_project.prover.rules.AssumesFormulaInstSeq;
20-
import org.key_project.prover.rules.AssumesFormulaInstantiation;
19+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstSeq;
20+
import org.key_project.prover.rules.instantiation.AssumesFormulaInstantiation;
2121
import org.key_project.prover.sequent.Sequent;
2222
import org.key_project.util.collection.ImmutableArray;
2323
import org.key_project.util.collection.ImmutableList;

key.core/src/main/java/de/uka/ilkd/key/informationflow/rule/executor/InfFlowContractAppTacletExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import de.uka.ilkd.key.util.properties.Properties;
1414

1515
import org.key_project.logic.LogicServices;
16-
import org.key_project.prover.rules.MatchConditions;
16+
import org.key_project.prover.rules.instantiation.MatchConditions;
1717
import org.key_project.prover.sequent.PosInOccurrence;
1818
import org.key_project.prover.sequent.Semisequent;
1919
import org.key_project.prover.sequent.SequentChangeInfo;

key.core/src/main/java/de/uka/ilkd/key/proof/ProgVarReplacer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import de.uka.ilkd.key.rule.inst.*;
1818

1919
import org.key_project.logic.PosInTerm;
20-
import org.key_project.prover.rules.inst.InstantiationEntry;
21-
import org.key_project.prover.rules.inst.ListInstantiation;
20+
import org.key_project.prover.rules.instantiation.InstantiationEntry;
21+
import org.key_project.prover.rules.instantiation.ListInstantiation;
2222
import org.key_project.prover.sequent.*;
2323
import org.key_project.util.collection.*;
2424

0 commit comments

Comments
 (0)