Skip to content

Changed how class types are searched #14

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

Merged
Pichers merged 2 commits into from
Apr 22, 2025
Merged

Changed how class types are searched #14

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
33836c9
Changed how class types are registered to be coherent
Pichers Apr 22, 2025
1b40e31
minor fix to error debug
Pichers Apr 22, 2025
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: 2 additions & 2 deletions latte/src/main/java/typechecking/LatteClassFirstPass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public LatteClassFirstPass(SymbolicEnvironment se, PermissionEnvironment pe,
public <T> void visitCtClass(CtClass<T> ctClass) {
logInfo("Visiting class: " + ctClass.getSimpleName());
// Add the class to the type reference and class map
CtTypeReference<?> typeRef = ctClass.getReference();
maps.addTypeClass(typeRef, ctClass);
CtTypeReference<?> typeRef1 = ctClass.getReference();
maps.addTypeClass(typeRef1, ctClass);
super.visitCtClass(ctClass);
}

Expand Down
4 changes: 2 additions & 2 deletions latte/src/main/java/typechecking/LatteTypeChecker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,15 @@ public <T> void visitCtInvocation(CtInvocation<T> invocation) {
if (invocation.getTarget() == null){
logError("Invocation needs to have a target but found none -", invocation);
}
CtTypeReference<?> e = invocation.getTarget().getType();
CtTypeReference<?> e = invocation.getTarget().getType().getTypeErasure();

// method(Γ(𝑥), 𝑓 ) = 𝛼 𝐶 𝑚(𝛼0 𝐶0 this, 𝛼1 𝐶1 𝑥1, · · · , 𝛼𝑛 𝐶𝑛 𝑥𝑛 )
CtClass<?> klass = maps.getClassFrom(e);
CtMethod<?> m = maps.getCtMethod(klass, metName,
invocation.getArguments().size());

if (m == null){
logInfo(String.format("Cannot find method {} for {} in the context", metName, invocation.getType()));
logInfo("Cannot find method {" + metName + "} for {} in the context");
return;
}
List<SymbolicValue> paramSymbValues = new ArrayList<>();
Expand Down