Skip to content

Fix StateSet in Interface without ExternalRefinements #242

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
rcosta358 wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −21
Open

Fix StateSet in Interface without ExternalRefinements #242

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
7 changes: 7 additions & 0 deletions liquidjava-example/src/main/java/testSuite/CorrectInterfaceStateSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package testSuite;

import liquidjava.specification.StateSet;

@StateSet({"idle", "running"})
public interface CorrectInterfaceStateSet {
}
34 changes: 13 additions & 21 deletions liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/TypeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,40 +263,32 @@ private void createStateGhost(String string, CtElement element, SourcePosition p
}

protected String getQualifiedClassName(CtElement element) {
if (element.getParent() instanceof CtClass<?>) {
return ((CtClass<?>) element.getParent()).getQualifiedName();
} else if (element instanceof CtClass<?>) {
return ((CtClass<?>) element).getQualifiedName();
}
return null;
return getEnclosingType(element).map(CtType::getQualifiedName).orElse(null);
}

protected String getSimpleClassName(CtElement element) {
if (element.getParent() instanceof CtClass<?>) {
return ((CtClass<?>) element.getParent()).getSimpleName();
} else if (element instanceof CtClass<?>) {
return ((CtClass<?>) element).getSimpleName();
}
return null;
return getEnclosingType(element).map(CtType::getSimpleName).orElse(null);
}

protected Optional<GhostFunction> createStateGhost(int order, CtElement element) {
CtClass<?> klass = null;
if (element.getParent() instanceof CtClass<?>) {
klass = (CtClass<?>) element.getParent();
} else if (element instanceof CtClass<?>) {
klass = (CtClass<?>) element;
}
if (klass != null) {
Optional<CtType<?>> enclosingType = getEnclosingType(element);
if (enclosingType.isPresent()) {
CtType<?> type = enclosingType.get();
CtTypeReference<?> ret = factory.Type().INTEGER_PRIMITIVE;
List<String> params = Collections.singletonList(klass.getSimpleName());
List<String> params = Collections.singletonList(type.getSimpleName());
String name = String.format("state%d", order);
GhostFunction gh = new GhostFunction(name, params, ret, factory, klass.getQualifiedName());
GhostFunction gh = new GhostFunction(name, params, ret, factory, type.getQualifiedName());
return Optional.of(gh);
}
return Optional.empty();
}

private Optional<CtType<?>> getEnclosingType(CtElement element) {
if (element instanceof CtType<?> type)
return Optional.of(type);
return Optional.ofNullable(element.getParent(CtType.class));
}

protected void getGhostFunction(String value, CtElement element, SourcePosition position) throws LJError {
GhostDTO f = getGhostDeclaration(value, position);
CtType<?> type = element instanceof CtType<?> t ? t : element.getParent()instanceof CtType<?> t ? t : null;
Expand Down
Loading