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

aNNiMON · aNNiMON · commit acd14495db6d · 2016-06-30T11:25:49.000+03:00
diff --git a/src/com/annimon/ownlang/Main.java b/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);
             }
diff --git a/src/com/annimon/ownlang/exceptions/StoppedException.java b/src/com/annimon/ownlang/exceptions/StoppedException.java
@@ -0,0 +1,6 @@
+package com.annimon.ownlang.exceptions;
+
+public class StoppedException extends RuntimeException {
+
+
+}
diff --git a/src/com/annimon/ownlang/lib/Functions.java b/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;
     }
diff --git a/src/com/annimon/ownlang/lib/Variables.java b/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) {
diff --git a/src/com/annimon/ownlang/parser/Optimizer.java b/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;
     }
 }
diff --git a/src/com/annimon/ownlang/parser/ast/AssignmentExpression.java b/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());
diff --git a/src/com/annimon/ownlang/parser/ast/BlockStatement.java b/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();
         }
diff --git a/src/com/annimon/ownlang/parser/ast/DestructuringAssignmentStatement.java b/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:
diff --git a/src/com/annimon/ownlang/parser/ast/DoWhileStatement.java b/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();
diff --git a/src/com/annimon/ownlang/parser/ast/ExprStatement.java b/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);
diff --git a/src/com/annimon/ownlang/parser/ast/ForStatement.java b/src/com/annimon/ownlang/parser/ast/ForStatement.java
@@ -4,7 +4,7 @@
  *
  * @author aNNiMON
  */
-public final class ForStatement implements Statement {
+public final class ForStatement extends InterruptableNode implements Statement {
     
     public final Statement initialization;
     public final Expression termination;
@@ -20,6 +20,7 @@ public ForStatement(Statement initialization, Expression termination, Statement
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         for (initialization.execute(); termination.eval().asInt() != 0; increment.execute()) {
             try {
                 statement.execute();
diff --git a/src/com/annimon/ownlang/parser/ast/ForeachArrayStatement.java b/src/com/annimon/ownlang/parser/ast/ForeachArrayStatement.java
@@ -7,7 +7,7 @@
  *
  * @author aNNiMON
  */
-public final class ForeachArrayStatement implements Statement {
+public final class ForeachArrayStatement extends InterruptableNode implements Statement {
     
     public final String variable;
     public final Expression container;
@@ -21,6 +21,7 @@ public ForeachArrayStatement(String variable, Expression container, Statement bo
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         final Value previousVariableValue = Variables.isExists(variable) ? Variables.get(variable) : null;
         final Iterable<Value> iterator = (Iterable<Value>) container.eval();
         for (Value value : iterator) {
diff --git a/src/com/annimon/ownlang/parser/ast/ForeachMapStatement.java b/src/com/annimon/ownlang/parser/ast/ForeachMapStatement.java
@@ -8,7 +8,7 @@
  *
  * @author aNNiMON
  */
-public final class ForeachMapStatement implements Statement {
+public final class ForeachMapStatement extends InterruptableNode implements Statement {
     
     public final String key, value;
     public final Expression container;
@@ -23,6 +23,7 @@ public ForeachMapStatement(String key, String value, Expression container, State
 
     @Override
     public void execute() {
+        super.interruptionCheck();
         final Value previousVariableValue1 = Variables.isExists(key) ? Variables.get(key) : null;
         final Value previousVariableValue2 = Variables.isExists(value) ? Variables.get(value) : null;
         final Iterable<Map.Entry<Value, Value>> iterator = (Iterable<Map.Entry<Value, Value>>) container.eval();
diff --git a/src/com/annimon/ownlang/parser/ast/FunctionReferenceExpression.java b/src/com/annimon/ownlang/parser/ast/FunctionReferenceExpression.java
@@ -6,7 +6,7 @@
  *
  * @author aNNiMON
  */
-public final class FunctionReferenceExpression implements Expression {
+public final class FunctionReferenceExpression extends InterruptableNode implements Expression {
 
     public final String name;
 
@@ -16,6 +16,7 @@ public FunctionReferenceExpression(String name) {
 
     @Override
     public FunctionValue eval() {
+        super.interruptionCheck();
         return new FunctionValue(Functions.get(name));
     }
     
diff --git a/src/com/annimon/ownlang/parser/ast/FunctionalExpression.java b/src/com/annimon/ownlang/parser/ast/FunctionalExpression.java
@@ -11,7 +11,7 @@
  *
  * @author aNNiMON
  */
-public final class FunctionalExpression implements Expression, Statement {
+public final class FunctionalExpression extends InterruptableNode implements Expression, Statement {
     
     public final Expression functionExpr;
     public final List<Expression> arguments;
@@ -32,6 +32,7 @@ public void execute() {
     
     @Override
     public Value eval() {
+        super.interruptionCheck();
         final int size = arguments.size();
         final Value[] values = new Value[size];
         for (int i = 0; i < size; i++) {
diff --git a/src/com/annimon/ownlang/parser/ast/IfStatement.java b/src/com/annimon/ownlang/parser/ast/IfStatement.java
@@ -4,7 +4,7 @@
  *
  * @author aNNiMON
  */
-public final class IfStatement implements Statement {
+public final class IfStatement extends InterruptableNode implements Statement {
     
     public final Expression expression;
     public final Statement ifStatement, elseStatement;
@@ -17,6 +17,7 @@ public IfStatement(Expression expression, Statement ifStatement, Statement elseS
     
     @Override
     public void execute() {
+        super.interruptionCheck();
         final int result = expression.eval().asInt();
         if (result != 0) {
             ifStatement.execute();
diff --git a/src/com/annimon/ownlang/parser/ast/IncludeStatement.java b/src/com/annimon/ownlang/parser/ast/IncludeStatement.java
@@ -12,16 +12,17 @@
  *
  * @author aNNiMON
  */
-public final class IncludeStatement implements Statement {
+public final class IncludeStatement extends InterruptableNode implements Statement {
 
     public final Expression expression;
     
     public IncludeStatement(Expression expression) {
         this.expression = expression;
     }
-    
+
     @Override
     public void execute() {
+        super.interruptionCheck();
         try {
             final Statement program = loadProgram(expression.eval().asString());
             if (program != null) {
diff --git a/src/com/annimon/ownlang/parser/ast/InterruptableNode.java b/src/com/annimon/ownlang/parser/ast/InterruptableNode.java
@@ -0,0 +1,36 @@
+package com.annimon.ownlang.parser.ast;
+
+import com.annimon.ownlang.exceptions.StoppedException;
+
+public abstract class InterruptableNode implements Node {
+
+    public static final int RUNNIMG = 0, PAUSED = 1, STOPPED = 2;
+
+    private static volatile int state;
+
+    public static void run() {
+        state = RUNNIMG;
+    }
+
+    public static void pause() {
+        state = PAUSED;
+    }
+
+    public static void stop() {
+        state = STOPPED;
+    }
+
+    protected void interruptionCheck() {
+        if (state == RUNNIMG) return;
+        if (state == STOPPED) {
+            throw new StoppedException();
+        }
+        try {
+            while (state == PAUSED) {
+                Thread.sleep(1000);
+            }
+        } catch (InterruptedException ioe) {
+            Thread.currentThread().interrupt();
+        }
+    }
+}
diff --git a/src/com/annimon/ownlang/parser/ast/MatchExpression.java b/src/com/annimon/ownlang/parser/ast/MatchExpression.java
@@ -14,7 +14,7 @@
  *
  * @author aNNiMON
  */
-public final class MatchExpression implements Expression, Statement {
+public final class MatchExpression extends InterruptableNode implements Expression, Statement {
 
     public final Expression expression;
     public final List<Pattern> patterns;
@@ -31,6 +31,7 @@ public void execute() {
 
     @Override
     public Value eval() {
+        super.interruptionCheck();
         final Value value = expression.eval();
         for (Pattern p : patterns) {
             if (p instanceof ConstantPattern) {
@@ -239,7 +240,7 @@ public static class ListPattern extends Pattern {
         public List<String> parts;
 
         public ListPattern() {
-            this(new ArrayList<String>());
+            this(new ArrayList<>());
         }
 
         public ListPattern(List<String> parts) {
diff --git a/src/com/annimon/ownlang/parser/ast/PrintStatement.java b/src/com/annimon/ownlang/parser/ast/PrintStatement.java
diff --git a/src/com/annimon/ownlang/parser/ast/PrintlnStatement.java b/src/com/annimon/ownlang/parser/ast/PrintlnStatement.java
diff --git a/src/com/annimon/ownlang/parser/ast/UseStatement.java b/src/com/annimon/ownlang/parser/ast/UseStatement.java
diff --git a/src/com/annimon/ownlang/parser/ast/ValueExpression.java b/src/com/annimon/ownlang/parser/ast/ValueExpression.java
diff --git a/src/com/annimon/ownlang/parser/ast/VariableExpression.java b/src/com/annimon/ownlang/parser/ast/VariableExpression.java
diff --git a/src/com/annimon/ownlang/parser/ast/WhileStatement.java b/src/com/annimon/ownlang/parser/ast/WhileStatement.java
diff --git a/test/com/annimon/ownlang/parser/ProgramsTest.java b/test/com/annimon/ownlang/parser/ProgramsTest.java

-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package com.annimon.ownlang.exceptions;
++
 +public class StoppedException extends RuntimeException {
++
++
 +}
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,11 @@ public final class Functions {`
`14`	`14`	`static {`
`15`	`15`	`functions = new HashMap<>();`
`16`	`16`	`}`
`17`		`-`
	`17`	`+`
	`18`	`+ public static void clear() {`
	`19`	`+ functions.clear();`
	`20`	`+ }`
	`21`	`+`
`18`	`22`	`public static Map<String, Function> getFunctions() {`
`19`	`23`	`return functions;`
`20`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`public final class Optimizer {`
`15`	`15`
`16`		`- public static Statement optimize(Statement statement, int level) {`
	`16`	`+ public static Statement optimize(Statement statement, int level, boolean showSummary) {`
`17`	`17`	`if (level == 0) return statement;`
`18`	`18`
`19`	`19`	`final Optimizable optimization = new SummaryOptimization(new Optimizable[] {`
`@@ -32,13 +32,16 @@ public static Statement optimize(Statement statement, int level) {`
`32`	`32`	`result = optimization.optimize(result);`
`33`	`33`	`iteration++;`
`34`	`34`	`} while (lastModifications != optimization.optimizationsCount());`
`35`		`- Console.print("Performs " + iteration + " optimization iterations");`
	`35`	`+ if (showSummary)`
	`36`	`+ Console.print("Performs " + iteration + " optimization iterations");`
`36`	`37`	`} else {`
`37`	`38`	`for (int i = 0; i < level; i++) {`
`38`	`39`	`result = optimization.optimize(result);`
`39`	`40`	`}`
`40`	`41`	`}`
`41`		`- Console.println(optimization.summaryInfo());`
	`42`	`+ if (showSummary) {`
	`43`	`+ Console.println(optimization.summaryInfo());`
	`44`	`+ }`
`42`	`45`	`return (Statement) result;`
`43`	`46`	`}`
`44`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @author aNNiMON`
`9`	`9`	`*/`
`10`		`-public final class BlockStatement implements Statement {`
	`10`	`+public final class BlockStatement extends InterruptableNode implements Statement {`
`11`	`11`
`12`	`12`	`public final List<Statement> statements;`
`13`	`13`
`@@ -21,6 +21,7 @@ public void add(Statement statement) {`
`21`	`21`
`22`	`22`	`@Override`
`23`	`23`	`public void execute() {`
	`24`	`+ super.interruptionCheck();`
`24`	`25`	`for (Statement statement : statements) {`
`25`	`26`	`statement.execute();`
`26`	`27`	`}`