Merge optimizers into latest

Author: aNNiMON

src/com/annimon/ownlang/Main.java

@@ -1,15 +1,16 @@
 package com.annimon.ownlang;
 
-import com.annimon.ownlang.utils.TimeMeasurement;
 import com.annimon.ownlang.exceptions.LexerException;
 import com.annimon.ownlang.parser.Beautifier;
 import com.annimon.ownlang.parser.Lexer;
 import com.annimon.ownlang.parser.Linter;
+import com.annimon.ownlang.parser.Optimizer;
 import com.annimon.ownlang.parser.Parser;
 import com.annimon.ownlang.parser.SourceLoader;
 import com.annimon.ownlang.parser.Token;
 import com.annimon.ownlang.parser.ast.Statement;
 import com.annimon.ownlang.parser.visitors.FunctionAdder;
+import com.annimon.ownlang.utils.TimeMeasurement;
 import java.io.IOException;
 import java.util.List;
 import java.util.Scanner;
@@ -35,7 +36,8 @@ public static void main(String[] args) throws IOException {
                 options.showAst = true;
                 options.showTokens = true;
                 options.showMeasurements = true;
-                options.lintMode = true;
+                options.lintMode = false;
+                options.optimizationLevel = 2;
                 run(SourceLoader.readSource("program.own"), options);
             } catch (IOException ioe) {
                 System.out.println("OwnLang version " + VERSION + "\n\n" +
@@ -44,6 +46,7 @@ public static void main(String[] args) throws IOException {
                         "      -f, --file [input]  Run program file. Required.\n" +
                         "      -r, --repl          Enter to a REPL mode\n" +
                         "      -l, --lint          Find bugs in code\n" +
+                        "      -o N, --optimize N  Perform optimization with N passes\n" +
                         "      -b, --beautify      Beautify source code\n" +
                         "      -a, --showast       Show AST of program\n" +
                         "      -t, --showtokens    Show lexical tokens\n" +
@@ -77,6 +80,20 @@ public static void main(String[] args) throws IOException {
                     options.showMeasurements = true;
                     break;
 
+                case "-o":
+                case "--optimize":
+                    if (i + 1 < args.length) {
+                        try {
+                            options.optimizationLevel = Integer.parseInt(args[i + 1]);
+                        } catch (NumberFormatException nfe) {
+                            options.optimizationLevel = 2;
+                        }
+                        i++;
+                    } else {
+                        options.optimizationLevel = 2;
+                    }
+                    return;
+
                 case "-r":
                 case "--repl":
                     repl();
@@ -134,19 +151,30 @@ private static void run(String input, Options options) {
 
         measurement.start("Parse time");
         final Parser parser = new Parser(tokens);
-        final Statement program = parser.parse();
+        final Statement parsedProgram = parser.parse();
         measurement.stop("Parse time");
         if (options.showAst) {
-            System.out.println(program.toString());
+            System.out.println(parsedProgram.toString());
         }
         if (parser.getParseErrors().hasErrors()) {
             System.out.println(parser.getParseErrors());
             return;
         }
         if (options.lintMode) {
-            Linter.lint(program);
+            Linter.lint(parsedProgram);
             return;
         }
+        final Statement program;
+        if (options.optimizationLevel > 0) {
+            measurement.start("Optimization time");
+            program = Optimizer.optimize(parsedProgram, options.optimizationLevel);
+            measurement.stop("Optimization time");
+            if (options.showAst) {
+                System.out.println(program.toString());
+            }
+        } else {
+            program = parsedProgram;
+        }
         program.accept(new FunctionAdder());
         try {
             measurement.start("Execution time");
@@ -203,19 +231,22 @@ private static void repl() {
     private static class Options {
         boolean showTokens, showAst, showMeasurements;
         boolean lintMode;
+        int optimizationLevel;
 
         public Options() {
             showTokens = false;
             showAst = false;
             showMeasurements = false;
             lintMode = false;
+            optimizationLevel = 1;
         }
 
         public void validate() {
             if (lintMode == true) {
                 showTokens = false;
                 showAst = false;
                 showMeasurements = false;
+                optimizationLevel = 0;
             }
         }
     }

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

@@ -0,0 +1,32 @@
+package com.annimon.ownlang.parser;
+
+import com.annimon.ownlang.parser.ast.Statement;
+import com.annimon.ownlang.parser.visitors.ConstantFolding;
+import com.annimon.ownlang.parser.visitors.DeadCodeElimination;
+
+public final class Optimizer {
+
+    public interface Info {
+
+        int optimizationsCount();
+
+        String summaryInfo();
+    }
+
+    public static Statement optimize(Statement statement, int level) {
+        if (level == 0) return statement;
+        
+        final ConstantFolding constantFolding = new ConstantFolding();
+        final DeadCodeElimination deadCodeElimination = new DeadCodeElimination();
+
+        Statement result = statement;
+        for (int i = 0; i < level; i++) {
+            result = (Statement) result.accept(constantFolding, null);
+            result = (Statement) result.accept(deadCodeElimination, null);
+        }
+        System.out.print(constantFolding.summaryInfo());
+        System.out.print(deadCodeElimination.summaryInfo());
+        System.out.println();
+        return result;
+    }
+}

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

@@ -31,6 +31,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return elements.toString();

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

@@ -39,6 +39,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final String op = (operation == null) ? "" : operation.toString();

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

@@ -455,6 +455,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", expr1, operation, expr2);

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

@@ -31,6 +31,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         final StringBuilder result = new StringBuilder();

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

@@ -16,6 +16,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "break";

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

@@ -86,6 +86,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return String.format("%s %s %s", expr1, operation.getName(), expr2);

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

@@ -101,6 +101,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return variable + indices;

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

@@ -16,6 +16,11 @@ public void accept(Visitor visitor) {
         visitor.visit(this);
     }
 
+    @Override
+    public <R, T> R accept(ResultVisitor<R, T> visitor, T t) {
+        return visitor.visit(this, t);
+    }
+
     @Override
     public String toString() {
         return "continue";