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

Update to EISOP 3.39-eisop1 from 3.34-eisop1 #130

Merged
merged 6 commits into from
Apr 7, 2024
Merged

Update to EISOP 3.39-eisop1 from 3.34-eisop1 #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1dea021
Update API to compatiable with CFI change
Ao-senXiong Mar 31, 2024
49c4276
Update API to compatiable with CFI change
Ao-senXiong Mar 31, 2024
fa2c6ee
Use CF plumelib.util.IPair
Ao-senXiong Mar 31, 2024
6a3dd7f
Format code
Ao-senXiong Mar 31, 2024
996219d
Use IPair from non-shaded plumelib artifact
Ao-senXiong Apr 7, 2024
aa8c0f3
Apply spotless
Ao-senXiong Apr 7, 2024
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
10 changes: 6 additions & 4 deletions src/ontology/OntologyAnnotatedTypeFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ private final class OntologyQualifierHierarchy extends ElementQualifierHierarchy
public OntologyQualifierHierarchy() {
super(
OntologyAnnotatedTypeFactory.this.getSupportedTypeQualifiers(),
OntologyAnnotatedTypeFactory.this.elements);
OntologyAnnotatedTypeFactory.this.elements,
OntologyAnnotatedTypeFactory.this);
this.ONTOLOGY_KIND = getQualifierKind(OntologyUtils.ONTOLOGY);
}

@Override
public boolean isSubtype(AnnotationMirror subQualifier, AnnotationMirror superQualifier) {
public boolean isSubtypeQualifiers(
AnnotationMirror subQualifier, AnnotationMirror superQualifier) {
if (getQualifierKind(subQualifier) != ONTOLOGY_KIND
|| getQualifierKind(superQualifier) != ONTOLOGY_KIND) {
throw new BugInCF(
Expand All @@ -83,7 +85,7 @@ public boolean isSubtype(AnnotationMirror subQualifier, AnnotationMirror superQu
}

@Override
public @Nullable AnnotationMirror leastUpperBound(
public @Nullable AnnotationMirror leastUpperBoundQualifiers(
AnnotationMirror a1, AnnotationMirror a2) {
if (getQualifierKind(a1) != ONTOLOGY_KIND || getQualifierKind(a2) != ONTOLOGY_KIND) {
throw new BugInCF("unexpected annotation mirrors: %s, %s", a1, a2);
Expand All @@ -99,7 +101,7 @@ public boolean isSubtype(AnnotationMirror subQualifier, AnnotationMirror superQu
}

@Override
public @Nullable AnnotationMirror greatestLowerBound(
public @Nullable AnnotationMirror greatestLowerBoundQualifiers(
AnnotationMirror a1, AnnotationMirror a2) {
if (getQualifierKind(a1) != ONTOLOGY_KIND || getQualifierKind(a2) != ONTOLOGY_KIND) {
throw new BugInCF("unexpected annotation mirrors: %s, %s", a1, a2);
Expand Down
7 changes: 2 additions & 5 deletions src/ontology/OntologyTypeValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.checkerframework.framework.source.DiagMessage;
import org.checkerframework.framework.type.AnnotatedTypeFactory;
import org.checkerframework.framework.type.AnnotatedTypeMirror;
import org.checkerframework.framework.type.QualifierHierarchy;

/**
* This class checks the well-formedness of ontology values used inside an {@link Ontology}
Expand All @@ -30,10 +29,8 @@ public OntologyTypeValidator(
}

@Override
protected List<DiagMessage> isTopLevelValidType(
QualifierHierarchy qualifierHierarchy, AnnotatedTypeMirror type) {
List<DiagMessage> errorMsgs =
new ArrayList<>(super.isTopLevelValidType(qualifierHierarchy, type));
protected List<DiagMessage> isTopLevelValidType(AnnotatedTypeMirror type) {
List<DiagMessage> errorMsgs = new ArrayList<>(super.isTopLevelValidType(type));

AnnotationMirror am = type.getAnnotation(Ontology.class);
if (am != null) {
Expand Down
2 changes: 1 addition & 1 deletion src/ontology/util/OntologyStatisticUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public static void verifySolution(
continue;
}

if (!qualifierHierarchy.isSubtype(subtype, supertype)) {
if (!qualifierHierarchy.isSubtypeQualifiersOnly(subtype, supertype)) {
ViolatedConsDiagnostic consDiagRes =
new ViolatedConsDiagnostic(sConstraint, subtype, supertype);

Expand Down
6 changes: 3 additions & 3 deletions tests/ontology/OntologyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.util.List;
import ontology.solvers.backend.OntologySolverEngine;
import org.checkerframework.framework.test.TestUtilities;
import org.checkerframework.javacutil.Pair;
import org.junit.runners.Parameterized.Parameters;
import org.plumelib.util.IPair;

public class OntologyTest extends CFInferenceTest {

Expand All @@ -27,11 +27,11 @@ public boolean useHacks() {
}

@Override
public Pair<String, List<String>> getSolverNameAndOptions() {
public IPair<String, List<String>> getSolverNameAndOptions() {
final String solverName = OntologySolverEngine.class.getCanonicalName();
List<String> solverOptions = new ArrayList<>();
solverOptions.add("solver=Z3");
return Pair.<String, List<String>>of(solverName, solverOptions);
return IPair.<String, List<String>>of(solverName, solverOptions);
}

@Parameters
Expand Down
Loading