Skip to content

Fix refinement variable mapping: '_' and 'return' → #145

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

Fix refinement variable mapping: '_' and 'return' → #145

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
20 changes: 18 additions & 2 deletions liquidjava-verifier/src/main/java/liquidjava/rj_language/visitors/CreateASTVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,25 @@ private Expression literalExpressionCreate(ParseTree rc) throws LJError {
return new GroupExpression(create(((LitGroupContext) rc).literalExpression()));
else if (rc instanceof LitContext)
return create(((LitContext) rc).literal());

// else if (rc instanceof VarContext) {
// return new Var(((VarContext) rc).ID().getText());
// }
else if (rc instanceof VarContext) {
return new Var(((VarContext) rc).ID().getText());
} else if (rc instanceof TargetInvocationContext) {
// Normalize return-value identifiers:
// - "return" (legacy syntax)
// - "_" (current shorthand)
// Both are mapped to "$result", the canonical return value identifier.
String name = ((VarContext) rc).ID().getText();

if (name.equals("return") || name.equals("_")) {
name = "$result";
}

return new Var(name);
}

else if (rc instanceof TargetInvocationContext) {
// TODO Finish Invocation with Target (a.len())
return null;
} else {
Expand Down
Loading