fix: #674, should throw expception while reaching MAX_LOOP_COUNT

Author: killme2008

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

@@ -539,7 +539,8 @@ public void onJoinLeft(final Token<?> lookahead) {
     visitLeftBranch(lookahead, IFNE, OperatorType.OR);
   }
 
-  private void visitLeftBranch(final Token<?> lookahead, final int ints, final OperatorType opType) {
+  private void visitLeftBranch(final Token<?> lookahead, final int ints,
+      final OperatorType opType) {
     this.checkExecutionTimeout();
     if (!OperationRuntime.hasRuntimeContext(this.compileEnv, opType)) {
       visitBoolean();

src/main/java/com/googlecode/aviator/parser/ExpressionParser.java

@@ -1737,9 +1737,11 @@ private Token<?> value2token(final Object val) {
     } else if (val == null) {
       return Variable.NIL;
     } else if (val instanceof String) {
-      return (new StringToken((String) val, this.lexer.getLineNo(), this.lookahead.getStartIndex()));
+      return (new StringToken((String) val, this.lexer.getLineNo(),
+          this.lookahead.getStartIndex()));
     } else if (val instanceof Number) {
-      return (new NumberToken((Number) val, val.toString(), this.lexer.getLineNo(), this.lookahead.getStartIndex()));
+      return (new NumberToken((Number) val, val.toString(), this.lexer.getLineNo(),
+          this.lookahead.getStartIndex()));
     } else if (val instanceof Boolean) {
       return (((boolean) val) ? Variable.TRUE : Variable.FALSE);
     } else {

src/main/java/com/googlecode/aviator/runtime/function/seq/SeqIncludeFunction.java

@@ -17,6 +17,7 @@
 
 import java.util.Map;
 import java.util.Set;
+import com.googlecode.aviator.exception.ExpressionRuntimeException;
 import com.googlecode.aviator.runtime.RuntimeUtils;
 import com.googlecode.aviator.runtime.function.AbstractFunction;
 import com.googlecode.aviator.runtime.type.AviatorBoolean;
@@ -56,6 +57,8 @@ public AviatorObject call(final Map<String, Object> env, final AviatorObject arg
             break;
           }
         }
+      } catch (ExpressionRuntimeException e) {
+        throw e;
       } catch (Exception e) {
         RuntimeUtils.printStackTrace(env, e);
         return AviatorBoolean.FALSE;

src/test/java/com/googlecode/aviator/test/function/FunctionTest.java

@@ -1607,4 +1607,10 @@ public String toString() {
       return "User{" + "id=" + this.id + ", age=" + this.age + ", name='" + this.name + '\'' + '}';
     }
   }
+
+  @Test(expected = ExpressionRuntimeException.class)
+  public void testIssue674() {
+    this.instance.setOption(Options.MAX_LOOP_COUNT, 3);
+    this.instance.execute("include(seq.list(1,2,3,4),4)");
+  }
 }