Skip to content

Use Dependency Contract: ignore all term labels #3776

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

Open
FliegendeWurst wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Dependency Contract: ignore all term labels #3776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion key.core/src/main/java/de/uka/ilkd/key/java/SourceElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ public interface SourceElement extends SyntaxElement, EqualsModProperty<SourceEl
* These are not syntactical equal, therefore false is returned.
*/
@Override
default <V> boolean equalsModProperty(Object o, Property<SourceElement> property, V... v) {
default <V> boolean equalsModProperty(Object o, Property<? super SourceElement> property,
V... v) {
if (!(o instanceof SourceElement)) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion key.core/src/main/java/de/uka/ilkd/key/logic/TermImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ protected int computeHashCode() {
}

@Override
public <V> boolean equalsModProperty(Object o, Property<JTerm> property, V... v) {
public <V> boolean equalsModProperty(Object o, Property<? super JTerm> property, V... v) {
if (!(o instanceof JTerm other)) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion key.core/src/main/java/de/uka/ilkd/key/logic/equality/EqualsModProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public interface EqualsModProperty<T> {
* @param <V> the type of the additional parameters needed by {@code property} for the
* comparison
*/
<V> boolean equalsModProperty(Object o, Property<T> property, V... v);
<V> boolean equalsModProperty(Object o, Property<? super T> property, V... v);

/**
* Computes the hash code according to the given ignored {@code property}.
Expand Down
4 changes: 2 additions & 2 deletions key.core/src/main/java/de/uka/ilkd/key/rule/UseDependencyContractRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

import org.jspecify.annotations.NonNull;

import static de.uka.ilkd.key.logic.equality.IrrelevantTermLabelsProperty.IRRELEVANT_TERM_LABELS_PROPERTY;
import static de.uka.ilkd.key.logic.equality.TermLabelsProperty.TERM_LABELS_PROPERTY;


public final class UseDependencyContractRule implements BuiltInRule {
Expand Down Expand Up @@ -224,7 +224,7 @@ public static boolean isBaseOcc(JTerm focus, JTerm candidate) {
return false;
}
for (int i = 1, n = candidate.arity(); i < n; i++) {
if (!(candidate.sub(i).equalsModProperty(focus.sub(i), IRRELEVANT_TERM_LABELS_PROPERTY)
if (!(candidate.sub(i).equalsModProperty(focus.sub(i), TERM_LABELS_PROPERTY)
|| candidate.sub(i).op() instanceof LogicVariable)) {
return false;
}
Expand Down
Loading