Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import liquidjava.rj_language.Predicate;
import liquidjava.rj_language.parsing.RefinementsParser;
import liquidjava.utils.Utils;
import spoon.reflect.code.CtLiteral;
import spoon.reflect.declaration.CtAnnotation;
import spoon.reflect.declaration.CtClass;
import spoon.reflect.declaration.CtElement;
import spoon.reflect.declaration.CtField;
Expand All @@ -38,12 +40,14 @@ public <T> void visitCtClass(CtClass<T> ctClass) {

@Override
public <T> void visitCtInterface(CtInterface<T> intrface) {
Optional<String> externalRefinements = getExternalRefinement(intrface);
if (externalRefinements.isPresent()) {
this.prefix = externalRefinements.get();
Optional<CtAnnotation<?>> externalRef = getExternalRefinement(intrface);
if (externalRef.isPresent()) {
@SuppressWarnings("unchecked")
CtLiteral<String> literal = (CtLiteral<String>) externalRef.get().getAllValues().get("value");
this.prefix = literal.getValue();
if (!classExists(prefix)) {
String message = String.format("Could not find class '%s'", prefix);
diagnostics.add(new ExternalClassNotFoundWarning(intrface.getPosition(), message, prefix));
diagnostics.add(new ExternalClassNotFoundWarning(externalRef.get().getPosition(), message, prefix));
return;
}
getRefinementFromAnnotation(intrface);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -238,16 +238,13 @@ protected void handleAlias(String ref, CtElement element) throws LJError {
}
}

Optional<String> getExternalRefinement(CtInterface<?> intrface) {
Optional<String> ref = Optional.empty();
Optional<CtAnnotation<?>> getExternalRefinement(CtInterface<?> intrface) {
for (CtAnnotation<? extends Annotation> ann : intrface.getAnnotations())
if (ann.getActualAnnotation().annotationType().getCanonicalName()
.contentEquals("liquidjava.specification.ExternalRefinementsFor")) {
@SuppressWarnings("unchecked")
CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
ref = Optional.of(s.getValue());
return Optional.of(ann);
}
return ref;
return Optional.empty();
}

public void checkVariableRefinements(Predicate refinementFound, String simpleName, CtTypeReference<?> type,
Expand Down