Skip to content

Commit a16b9d1

Browse files
add success message and error messages
1 parent d5c4e79 commit a16b9d1

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

latte-umbrella/src/main/java/latte/latte_umbrella/App.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public static void launcher(String filePath) {
9494

9595
// To search all previous packages
9696
// processingManager.process(factory.Package().getRootPackage());
97+
System.out.println(":::SUCCESS:::");
9798
} catch(LatteException e){
9899

99100
// Print error for commandline use

latte-umbrella/src/main/java/typechecking/LatteTypeChecker.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public <T> void visitCtInvocation(CtInvocation<T> invocation) {
226226
logInfo(String.format("Checking constructor argument %s:%s, %s <= %s", p.getSimpleName(), vv, vvPerm, expectedUA));
227227
// Σ′ ⊢ 𝑒1, ... , 𝑒𝑛 : 𝛼1, ... , 𝛼𝑛 ⊣ Σ′′
228228
if (!permEnv.usePermissionAs(vv, vvPerm, expectedUA))
229-
logError(String.format("Expected %s but got %s from %s", expectedUA, vvPerm, vv), arg);
229+
logError(String.format("Expected %s but got %s", expectedUA, vvPerm), arg);
230230

231231
paramSymbValues.add(vv);
232232
}
@@ -262,9 +262,7 @@ private void handleInvocation(CtInvocation<?> value, CtVariableWriteImpl<?> assi
262262
UniquenessAnnotation valuePerm = permEnv.get(valueSV);
263263
UniquenessAnnotation targetPerm = permEnv.get(targetSV);
264264
if (!permEnv.usePermissionAs(valueSV, valuePerm, targetPerm))
265-
// logError(String.format("%s expected an assignment with permission %s but got %s:%s",
266-
// assignee, targetPerm, valueSV, valuePerm), value);
267-
logError(String.format("Expected %s but got %s in %s", targetPerm, valuePerm, value), value);
265+
logError(String.format("Expected %s but got %s", targetPerm, valuePerm, value), value);
268266
SymbolicValue fresh = symbEnv.addVariable(assignee.getVariable().getSimpleName());
269267
permEnv.add(fresh, targetPerm);
270268
}
@@ -457,9 +455,8 @@ public <T, A extends T> void visitCtAssignment(CtAssignment<T, A> assignment) {
457455

458456
// Check if we can use the permission of vv as the permission of the field
459457
if (!permEnv.usePermissionAs(vv, vvPerm, fieldPerm))
460-
// logError(String.format("Field %s expected an assignment with permission %s but got %s from %s", f.getSimpleName(), fieldPerm, vvPerm, vv, assignment), assignment);
461-
logError(String.format("Expected %s but got %s from %s",
462-
fieldPerm, vvPerm, assignment), assignment);
458+
logError(String.format("Expected %s but got %s",
459+
fieldPerm, vvPerm), assignment);
463460

464461
// Δ′′ [𝜈.𝑓 → 𝜈′]; Σ′′′ ⪰ Δ′′′; Σ′′′′
465462
symbEnv.addFieldSymbolicValue(v, f.getSimpleName(), vv);
@@ -504,8 +501,8 @@ private void handleConstructorArgs (CtConstructorCall<?> constCall){
504501
logInfo(String.format("Checking constructor argument %s:%s, %s <= %s", p.getSimpleName(), vv, vvPerm, expectedUA));
505502
// Σ′ ⊢ 𝑒1, ... , 𝑒𝑛 : 𝛼1, ... , 𝛼𝑛 ⊣ Σ′′
506503
if (!permEnv.usePermissionAs(vv, vvPerm, expectedUA))
507-
logError(String.format("Expected %s but got %s from %s",
508-
expectedUA, vvPerm, vv), arg);
504+
logError(String.format("Expected %s but got %s",
505+
expectedUA, vvPerm), arg);
509506
paramSymbValues.add(vv);
510507
}
511508

0 commit comments

Comments
 (0)