Skip to content

Commit be1a0f2

Browse files
rcosta358rcosta358
committed
Remove Error Checks From Visitor Methods
1 parent ff71e80 commit be1a0f2

File tree

4 files changed

+0
-115
lines changed

4 files changed

+0
-115
lines changed

‎liquidjava-verifier/src/main/java/liquidjava/processor/ann_generation/FieldGhostsGeneration.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ public Factory getFactory() {
2828

2929
@Override
3030
public <T> void visitCtClass(CtClass<T> ctClass) {
31-
if (diagnostics.foundError()) {
32-
return;
33-
}
34-
3531
ctClass.getDeclaredFields().stream().filter(fld -> fld.getType().getQualifiedName().equals("int"))
3632
.forEach(fld -> {
3733
CtTypeReference<?> fld_type = fld.getType();

‎liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/ExternalRefinementTypeChecker.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ public <T> void visitCtClass(CtClass<T> ctClass) {
4040

4141
@Override
4242
public <T> void visitCtInterface(CtInterface<T> intrface) {
43-
if (diagnostics.foundError())
44-
return;
45-
4643
Optional<String> externalRefinements = getExternalRefinement(intrface);
4744
if (externalRefinements.isPresent()) {
4845
this.prefix = externalRefinements.get();
@@ -59,9 +56,6 @@ public <T> void visitCtInterface(CtInterface<T> intrface) {
5956

6057
@Override
6158
public <T> void visitCtField(CtField<T> f) {
62-
if (diagnostics.foundError())
63-
return;
64-
6559
Optional<Predicate> oc;
6660
try {
6761
oc = getRefinementFromAnnotation(f);
@@ -75,9 +69,6 @@ public <T> void visitCtField(CtField<T> f) {
7569
}
7670

7771
public <R> void visitCtMethod(CtMethod<R> method) {
78-
if (diagnostics.foundError())
79-
return;
80-
8172
CtType<?> targetType = factory.Type().createReference(prefix).getTypeDeclaration();
8273
if (targetType == null || !(targetType instanceof CtClass))
8374
return;

‎liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/MethodsFirstChecker.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ public MethodsFirstChecker(Context context, Factory factory) {
2828

2929
@Override
3030
public <T> void visitCtClass(CtClass<T> ctClass) {
31-
if (diagnostics.foundError())
32-
return;
33-
3431
context.reinitializeContext();
3532
if (visitedClasses.contains(ctClass.getQualifiedName()))
3633
return;
@@ -59,9 +56,6 @@ public <T> void visitCtClass(CtClass<T> ctClass) {
5956

6057
@Override
6158
public <T> void visitCtInterface(CtInterface<T> intrface) {
62-
if (diagnostics.foundError())
63-
return;
64-
6559
if (visitedClasses.contains(intrface.getQualifiedName()))
6660
return;
6761
else
@@ -76,9 +70,6 @@ public <T> void visitCtInterface(CtInterface<T> intrface) {
7670

7771
@Override
7872
public <T> void visitCtConstructor(CtConstructor<T> c) {
79-
if (diagnostics.foundError())
80-
return;
81-
8273
context.enterContext();
8374
getRefinementFromAnnotation(c);
8475
mfc.getConstructorRefinements(c);
@@ -87,9 +78,6 @@ public <T> void visitCtConstructor(CtConstructor<T> c) {
8778
}
8879

8980
public <R> void visitCtMethod(CtMethod<R> method) {
90-
if (diagnostics.foundError())
91-
return;
92-
9381
context.enterContext();
9482
mfc.getMethodRefinements(method);
9583
super.visitCtMethod(method);

‎liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/RefinementTypeChecker.java‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,13 @@ public RefinementTypeChecker(Context context, Factory factory) {
6666

6767
@Override
6868
public <T> void visitCtClass(CtClass<T> ctClass) {
69-
if (diagnostics.foundError()) {
70-
return;
71-
}
72-
7369
// System.out.println("CTCLASS:"+ctClass.getSimpleName());
7470
context.reinitializeContext();
7571
super.visitCtClass(ctClass);
7672
}
7773

7874
@Override
7975
public <T> void visitCtInterface(CtInterface<T> intrface) {
80-
if (diagnostics.foundError()) {
81-
return;
82-
}
83-
8476
// System.out.println("CT INTERFACE: " +intrface.getSimpleName());
8577
if (getExternalRefinement(intrface).isPresent()) {
8678
return;
@@ -90,29 +82,18 @@ public <T> void visitCtInterface(CtInterface<T> intrface) {
9082

9183
@Override
9284
public <A extends Annotation> void visitCtAnnotationType(CtAnnotationType<A> annotationType) {
93-
if (diagnostics.foundError()) {
94-
return;
95-
}
9685
super.visitCtAnnotationType(annotationType);
9786
}
9887

9988
@Override
10089
public <T> void visitCtConstructor(CtConstructor<T> c) {
101-
if (diagnostics.foundError()) {
102-
return;
103-
}
104-
10590
context.enterContext();
10691
mfc.loadFunctionInfo(c);
10792
super.visitCtConstructor(c);
10893
context.exitContext();
10994
}
11095

11196
public <R> void visitCtMethod(CtMethod<R> method) {
112-
if (diagnostics.foundError()) {
113-
return;
114-
}
115-
11697
context.enterContext();
11798
if (!method.getSignature().equals("main(java.lang.String[])")) {
11899
mfc.loadFunctionInfo(method);
@@ -123,10 +104,6 @@ public <R> void visitCtMethod(CtMethod<R> method) {
123104

124105
@Override
125106
public <T> void visitCtLocalVariable(CtLocalVariable<T> localVariable) {
126-
if (diagnostics.foundError()) {
127-
return;
128-
}
129-
130107
super.visitCtLocalVariable(localVariable);
131108
// only declaration, no assignment
132109
if (localVariable.getAssignment() == null) {
@@ -150,10 +127,6 @@ public <T> void visitCtLocalVariable(CtLocalVariable<T> localVariable) {
150127

151128
@Override
152129
public <T> void visitCtNewArray(CtNewArray<T> newArray) {
153-
if (diagnostics.foundError()) {
154-
return;
155-
}
156-
157130
super.visitCtNewArray(newArray);
158131
List<CtExpression<Integer>> l = newArray.getDimensionExpressions();
159132
// TODO only working for 1 dimension
@@ -176,10 +149,6 @@ public <T> void visitCtNewArray(CtNewArray<T> newArray) {
176149

177150
@Override
178151
public <T> void visitCtThisAccess(CtThisAccess<T> thisAccess) {
179-
if (diagnostics.foundError()) {
180-
return;
181-
}
182-
183152
super.visitCtThisAccess(thisAccess);
184153
CtClass<?> c = thisAccess.getParent(CtClass.class);
185154
String s = c.getSimpleName();
@@ -193,10 +162,6 @@ public <T> void visitCtThisAccess(CtThisAccess<T> thisAccess) {
193162
@SuppressWarnings("unchecked")
194163
@Override
195164
public <T, A extends T> void visitCtAssignment(CtAssignment<T, A> assignment) throws LJError {
196-
if (diagnostics.foundError()) {
197-
return;
198-
}
199-
200165
super.visitCtAssignment(assignment);
201166
CtExpression<T> ex = assignment.getAssigned();
202167

@@ -222,10 +187,6 @@ public <T, A extends T> void visitCtAssignment(CtAssignment<T, A> assignment) th
222187

223188
@Override
224189
public <T> void visitCtArrayRead(CtArrayRead<T> arrayRead) {
225-
if (diagnostics.foundError()) {
226-
return;
227-
}
228-
229190
super.visitCtArrayRead(arrayRead);
230191
String name = String.format(Formats.INSTANCE, "arrayAccess", context.getCounter());
231192
context.addVarToContext(name, arrayRead.getType(), new Predicate(), arrayRead);
@@ -235,10 +196,6 @@ public <T> void visitCtArrayRead(CtArrayRead<T> arrayRead) {
235196

236197
@Override
237198
public <T> void visitCtLiteral(CtLiteral<T> lit) {
238-
if (diagnostics.foundError()) {
239-
return;
240-
}
241-
242199
List<String> types = Arrays.asList(Types.IMPLEMENTED);
243200
String type = lit.getType().getQualifiedName();
244201
if (types.contains(type)) {
@@ -257,10 +214,6 @@ public <T> void visitCtLiteral(CtLiteral<T> lit) {
257214

258215
@Override
259216
public <T> void visitCtField(CtField<T> f) {
260-
if (diagnostics.foundError()) {
261-
return;
262-
}
263-
264217
super.visitCtField(f);
265218
Optional<Predicate> c = getRefinementFromAnnotation(f);
266219

@@ -280,10 +233,6 @@ public <T> void visitCtField(CtField<T> f) {
280233

281234
@Override
282235
public <T> void visitCtFieldRead(CtFieldRead<T> fieldRead) {
283-
if (diagnostics.foundError()) {
284-
return;
285-
}
286-
287236
String fieldName = fieldRead.getVariable().getSimpleName();
288237
if (context.hasVariable(fieldName)) {
289238
RefinedVariable rv = context.getVariableByName(fieldName);
@@ -315,10 +264,6 @@ public <T> void visitCtFieldRead(CtFieldRead<T> fieldRead) {
315264

316265
@Override
317266
public <T> void visitCtVariableRead(CtVariableRead<T> variableRead) {
318-
if (diagnostics.foundError()) {
319-
return;
320-
}
321-
322267
super.visitCtVariableRead(variableRead);
323268
CtVariable<T> varDecl = variableRead.getVariable().getDeclaration();
324269
getPutVariableMetadada(variableRead, varDecl.getSimpleName());
@@ -329,48 +274,29 @@ public <T> void visitCtVariableRead(CtVariableRead<T> variableRead) {
329274
*/
330275
@Override
331276
public <T> void visitCtBinaryOperator(CtBinaryOperator<T> operator) {
332-
if (diagnostics.foundError()) {
333-
return;
334-
}
335277
super.visitCtBinaryOperator(operator);
336278
otc.getBinaryOpRefinements(operator);
337279
}
338280

339281
@Override
340282
public <T> void visitCtUnaryOperator(CtUnaryOperator<T> operator) {
341-
if (diagnostics.foundError()) {
342-
return;
343-
}
344-
345283
super.visitCtUnaryOperator(operator);
346284
otc.getUnaryOpRefinements(operator);
347285
}
348286

349287
public <R> void visitCtInvocation(CtInvocation<R> invocation) {
350-
if (diagnostics.foundError()) {
351-
return;
352-
}
353-
354288
super.visitCtInvocation(invocation);
355289
mfc.getInvocationRefinements(invocation);
356290
}
357291

358292
@Override
359293
public <R> void visitCtReturn(CtReturn<R> ret) {
360-
if (diagnostics.foundError()) {
361-
return;
362-
}
363-
364294
super.visitCtReturn(ret);
365295
mfc.getReturnRefinements(ret);
366296
}
367297

368298
@Override
369299
public void visitCtIf(CtIf ifElement) {
370-
if (diagnostics.foundError()) {
371-
return;
372-
}
373-
374300
CtExpression<Boolean> exp = ifElement.getCondition();
375301
Predicate expRefs = getExpressionRefinements(exp);
376302

@@ -418,10 +344,6 @@ public void visitCtIf(CtIf ifElement) {
418344

419345
@Override
420346
public <T> void visitCtArrayWrite(CtArrayWrite<T> arrayWrite) {
421-
if (diagnostics.foundError()) {
422-
return;
423-
}
424-
425347
super.visitCtArrayWrite(arrayWrite);
426348
CtExpression<?> index = arrayWrite.getIndexExpression();
427349
BuiltinFunctionPredicate fp = BuiltinFunctionPredicate.addToIndex(arrayWrite.getTarget().toString(), index.toString(), Keys.WILDCARD, arrayWrite);
@@ -430,10 +352,6 @@ public <T> void visitCtArrayWrite(CtArrayWrite<T> arrayWrite) {
430352

431353
@Override
432354
public <T> void visitCtConditional(CtConditional<T> conditional) {
433-
if (diagnostics.foundError()) {
434-
return;
435-
}
436-
437355
super.visitCtConditional(conditional);
438356
Predicate cond = getRefinement(conditional.getCondition());
439357
Predicate c = Predicate.createITE(cond, getRefinement(conditional.getThenExpression()),
@@ -443,20 +361,12 @@ public <T> void visitCtConditional(CtConditional<T> conditional) {
443361

444362
@Override
445363
public <T> void visitCtConstructorCall(CtConstructorCall<T> ctConstructorCall) {
446-
if (diagnostics.foundError()) {
447-
return;
448-
}
449-
450364
super.visitCtConstructorCall(ctConstructorCall);
451365
mfc.getConstructorInvocationRefinements(ctConstructorCall);
452366
}
453367

454368
@Override
455369
public <T> void visitCtNewClass(CtNewClass<T> newClass) {
456-
if (diagnostics.foundError()) {
457-
return;
458-
}
459-
460370
super.visitCtNewClass(newClass);
461371
}
462372

0 commit comments

Comments
 (0)