Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable check for non-unique taclet names and remove two taclet duplicates #3359

Merged
merged 2 commits into from
Nov 21, 2023
Merged

Re-enable check for non-unique taclet names and remove two taclet duplicates #3359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63c0e87
Re-enable check for non-unique taclet names and remove two taclet dup…
unp1 Nov 21, 2023
174ae11
Prevent second reading of declarations in KeYUserProblemFile
unp1 Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions key.core/src/main/java/de/uka/ilkd/key/proof/init/KeYUserProblemFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,6 @@ public void readProblem() throws ProofInputException {
throw new IllegalStateException("KeYUserProblemFile: InitConfig not set.");
}

readSorts();
readFuncAndPred();
readRules();

try {
problem = getProblemFinder().getProblem();
if (problem == null) {
Expand Down
9 changes: 3 additions & 6 deletions key.core/src/main/java/de/uka/ilkd/key/proof/mgt/RuleJustificationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

public class RuleJustificationInfo {

private final Map<RuleKey, RuleJustification> rule2justif =
new LinkedHashMap<>();
private final Map<RuleKey, RuleJustification> rule2justif = new LinkedHashMap<>();

public void addJustification(Rule r, RuleJustification j) {
final RuleKey ruleKey = new RuleKey(r);
Expand All @@ -26,10 +25,8 @@ public void addJustification(Rule r, RuleJustification j) {
// always an exception will be thrown
for (RuleKey key : rule2justif.keySet()) {
if (key.equals(ruleKey) && r != key.r) {
// FIXME weigl: hack
// throw new IllegalArgumentException("A rule named " + r.name()
// + "has already been registered.");

throw new IllegalArgumentException(
"A rule named " + r.name() + "has already been registered.");
}
}
} else {
Expand Down
22 changes: 0 additions & 22 deletions key.core/src/main/resources/de/uka/ilkd/key/proof/rules/wdNumericalRules.key
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,28 +944,6 @@
\displayname "wd_Numerical_Op_ShiftRight"
};

wd_Numerical_Op_CheckedUShiftRightInt {

\find(
wd(checkedUnsignedShiftRightInt(a, b))
)
\replacewith(
wd(a) & wd(b) & inRangeInt(checkedUnsignedShiftRightInt(a, b))
)
\heuristics(simplify)
};

wd_Numerical_Op_CheckedUShiftRightLong {

\find(
wd(checkedUnsignedShiftRightLong(a, b))
)
\replacewith(
wd(a) & wd(b) & inRangeInt(checkedUnsignedShiftRightLong(a, b))
)
\heuristics(simplify)
};

wd_Numerical_Op_OrJInt {

\find(
Expand Down
Loading