Совместимость кода с Android-версией

Author: aNNiMON

src/com/annimon/ownlang/Main.java

@@ -1,6 +1,7 @@
 package com.annimon.ownlang;
 
 import com.annimon.ownlang.exceptions.LexerException;
+import com.annimon.ownlang.exceptions.StoppedException;
 import com.annimon.ownlang.parser.Beautifier;
 import com.annimon.ownlang.parser.Lexer;
 import com.annimon.ownlang.parser.Linter;
@@ -167,7 +168,7 @@ private static void run(String input, Options options) {
         final Statement program;
         if (options.optimizationLevel > 0) {
             measurement.start("Optimization time");
-            program = Optimizer.optimize(parsedProgram, options.optimizationLevel);
+            program = Optimizer.optimize(parsedProgram, options.optimizationLevel, options.showAst);
             measurement.stop("Optimization time");
             if (options.showAst) {
                 System.out.println(program.toString());
@@ -179,6 +180,8 @@ private static void run(String input, Options options) {
         try {
             measurement.start("Execution time");
             program.execute();
+        } catch (StoppedException ex) {
+            // skip
         } catch (Exception ex) {
             Console.handleException(Thread.currentThread(), ex);
         } finally {
@@ -220,6 +223,8 @@ private static void repl() {
                 program.execute();
             } catch (LexerException lex) {
                 continue;
+            } catch (StoppedException ex) {
+                // skip
             } catch (Exception ex) {
                 Console.handleException(Thread.currentThread(), ex);
             }

src/com/annimon/ownlang/exceptions/StoppedException.java

@@ -0,0 +1,6 @@
+package com.annimon.ownlang.exceptions;
+
+public class StoppedException extends RuntimeException {
+
+
+}

src/com/annimon/ownlang/lib/Functions.java

@@ -14,7 +14,11 @@ public final class Functions {
     static {
         functions = new HashMap<>();
     }
-    
+
+    public static void clear() {
+        functions.clear();
+    }
+
     public static Map<String, Function> getFunctions() {
         return functions;
     }

src/com/annimon/ownlang/lib/Variables.java

@@ -32,19 +32,19 @@ private static class ScopeFindData {
 
     private static volatile Scope scope;
     static {
-        scope = new Scope();
         Variables.clear();
     }
-    
+
+    public static Map<String, Value> variables() {
+        return scope.variables;
+    }
+
     public static void clear() {
+        scope = new Scope();
         scope.variables.clear();
         scope.variables.put("true", NumberValue.ONE);
         scope.variables.put("false", NumberValue.ZERO);
     }
-
-    public static Map<String, Value> variables() {
-        return scope.variables;
-    }
 
     public static void push() {
         synchronized (lock) {

src/com/annimon/ownlang/parser/Optimizer.java

@@ -13,7 +13,7 @@
 
 public final class Optimizer {
 
-    public static Statement optimize(Statement statement, int level) {
+    public static Statement optimize(Statement statement, int level, boolean showSummary) {
         if (level == 0) return statement;
 
         final Optimizable optimization = new SummaryOptimization(new Optimizable[] {
@@ -32,13 +32,16 @@ public static Statement optimize(Statement statement, int level) {
                 result = optimization.optimize(result);
                 iteration++;
             } while (lastModifications != optimization.optimizationsCount());
-            Console.print("Performs " + iteration + " optimization iterations");
+            if (showSummary)
+                Console.print("Performs " + iteration + " optimization iterations");
         } else {
             for (int i = 0; i < level; i++) {
                 result = optimization.optimize(result);
             }
         }
-        Console.println(optimization.summaryInfo());
+        if (showSummary) {
+            Console.println(optimization.summaryInfo());
+        }
         return (Statement) result;
     }
 }

src/com/annimon/ownlang/parser/ast/AssignmentExpression.java

@@ -6,7 +6,7 @@
  *
  * @author aNNiMON
  */
-public final class AssignmentExpression implements Expression, Statement {
+public final class AssignmentExpression extends InterruptableNode implements Expression, Statement {
 
     public final Accessible target;
     public final BinaryExpression.Operator operation;
@@ -25,6 +25,7 @@ public void execute() {
 
     @Override
     public Value eval() {
+        super.interruptionCheck();
         if (operation == null) {
             // Simple assignment
             return target.set(expression.eval());

src/com/annimon/ownlang/parser/ast/BlockStatement.java

@@ -7,7 +7,7 @@
  *
  * @author aNNiMON
  */
-public final class BlockStatement implements Statement {
+public final class BlockStatement extends InterruptableNode implements Statement {
 
     public final List<Statement> statements;
 
@@ -21,6 +21,7 @@ public void add(Statement statement) {
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         for (Statement statement : statements) {
             statement.execute();
         }

src/com/annimon/ownlang/parser/ast/DestructuringAssignmentStatement.java

@@ -13,7 +13,7 @@
  *
  * @author aNNiMON
  */
-public final class DestructuringAssignmentStatement implements Statement {
+public final class DestructuringAssignmentStatement extends InterruptableNode implements Statement {
 
     public final List<String> variables;
     public final Expression containerExpression;
@@ -25,6 +25,7 @@ public DestructuringAssignmentStatement(List<String> arguments, Expression conta
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         final Value container = containerExpression.eval();
         switch (container.type()) {
             case Types.ARRAY:

src/com/annimon/ownlang/parser/ast/DoWhileStatement.java

@@ -4,7 +4,7 @@
  *
  * @author aNNiMON
  */
-public final class DoWhileStatement implements Statement {
+public final class DoWhileStatement extends InterruptableNode implements Statement {
 
     public final Expression condition;
     public final Statement statement;
@@ -16,6 +16,7 @@ public DoWhileStatement(Expression condition, Statement statement) {
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         do {
             try {
                 statement.execute();

src/com/annimon/ownlang/parser/ast/ExprStatement.java

@@ -7,7 +7,7 @@
  * 
  * @author aNNiMON
  */
-public final class ExprStatement implements Expression, Statement {
+public final class ExprStatement extends InterruptableNode implements Expression, Statement {
 
     public final Expression expr;
 
@@ -17,14 +17,15 @@ public ExprStatement(Expression function) {
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         expr.eval();
     }
-
+    
     @Override
     public Value eval() {
         return expr.eval();
     }
-    
+
     @Override
     public void accept(Visitor visitor) {
         visitor.visit(this);