Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Fix Method Check Ordering
  • Loading branch information
rcosta358 committed Mar 28, 2026
commit b56ac2119cc0551b65d8f58c392c2b95e280135c
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,22 @@ private Map<String, String> checkInvocationRefinements(CtElement invocation, Lis
return new HashMap<>();
Map<String, String> map = mapInvocation(arguments, f);

if (target != null) {
AuxStateHandler.checkTargetChanges(rtc, f, target, map, invocation);
}
if (target != null)
AuxStateHandler.prepareInvocationTarget(rtc, target, invocation);

if (f.allRefinementsTrue()) {
if (target != null)
AuxStateHandler.checkTargetChanges(rtc, f, target, map, invocation);

invocation.putMetadata(Keys.REFINEMENT, new Predicate());
return map;
}

checkParameters(invocation, arguments, f, map);

if (target != null)
AuxStateHandler.checkTargetChanges(rtc, f, target, map, invocation);

// -- Part 2: Apply changes
// applyRefinementsToArguments(element, arguments, f, map);
Predicate methodRef = f.getRefReturn();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ public static void addStateRefinements(TypeChecker tc, String varName, CtExpress
*/
public static void checkTargetChanges(TypeChecker tc, RefinedFunction f, CtExpression<?> target2,
Map<String, String> map, CtElement invocation) throws LJError {
String parentTargetName = searchFistVariableTarget(tc, target2, invocation);
String parentTargetName = prepareInvocationTarget(tc, target2, invocation);
VariableInstance target = getTarget(invocation);
if (target != null) {
if (f.hasStateChange() && !f.getFromStates().isEmpty()) {
Expand Down Expand Up @@ -576,7 +576,7 @@ private static void addInstanceWithState(TypeChecker tc, String superName, Strin
*
* @return the name of the parent target
*/
static String searchFistVariableTarget(TypeChecker tc, CtElement target2, CtElement invocation) {
public static String prepareInvocationTarget(TypeChecker tc, CtElement target2, CtElement invocation) {
if (target2 instanceof CtVariableRead<?> v) {
// v--------- field read
// means invocation is in a form of `t.method(args)`
Expand Down
Loading