Skip to content

Commit 3f2ba66

Browse files
committed
fix: forget to check for logical operator in ASM mode
1 parent e693f1e commit 3f2ba66

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/main/java/com/googlecode/aviator/code/asm/ASMCodeGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
import java.util.Stack;
5757
import java.util.concurrent.atomic.AtomicLong;
5858
import com.googlecode.aviator.AviatorEvaluatorInstance;
59-
import com.googlecode.aviator.BaseExpression;
6059
import com.googlecode.aviator.ClassExpression;
6160
import com.googlecode.aviator.Expression;
6261
import com.googlecode.aviator.Options;
@@ -414,6 +413,7 @@ public void onAndRight(final Token<?> lookhead) {
414413

415414
private void visitRightBranch(final Token<?> lookhead, final int ints,
416415
final OperatorType opType) {
416+
this.checkExecutionTimeout();
417417
if (!OperationRuntime.hasRuntimeContext(this.compileEnv, opType)) {
418418
this.mv.visitInsn(DUP);
419419
loadEnv();
@@ -541,6 +541,7 @@ public void onJoinLeft(final Token<?> lookhead) {
541541
}
542542

543543
private void visitLeftBranch(final Token<?> lookhead, final int ints, final OperatorType opType) {
544+
this.checkExecutionTimeout();
544545
if (!OperationRuntime.hasRuntimeContext(this.compileEnv, opType)) {
545546
visitBoolean();
546547
Label l0 = makeLabel();

src/main/java/com/googlecode/aviator/code/interpreter/InterpretContext.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import java.util.ArrayDeque;
44
import java.util.List;
5-
import java.util.concurrent.TimeUnit;
65
import com.googlecode.aviator.InterpretExpression;
7-
import com.googlecode.aviator.exception.TimeoutException;
86
import com.googlecode.aviator.lexer.token.Token;
97
import com.googlecode.aviator.parser.VariableMeta;
108
import com.googlecode.aviator.runtime.RuntimeUtils;

0 commit comments

Comments
 (0)