Remove unused ConcurrentEvaluator and NaiveEvaluator, refactor the ev…

…aluation of expressions
predatorray · Jun 12, 2016 · b265028 · b265028
1 parent 43d953a
commit b265028
Show file tree

Hide file tree

Showing 27 changed files with 106 additions and 482 deletions.
diff --git a/src/main/java/me/predatorray/bud/lisp/BudInterpreter.java b/src/main/java/me/predatorray/bud/lisp/BudInterpreter.java
@@ -25,7 +25,7 @@
 
 import me.predatorray.bud.lisp.builtin.BuiltinsEnvironment;
 import me.predatorray.bud.lisp.evaluator.Evaluator;
-import me.predatorray.bud.lisp.evaluator.NaiveEvaluator;
+import me.predatorray.bud.lisp.evaluator.TcoEvaluator;
 import me.predatorray.bud.lisp.lang.BudObject;
 import me.predatorray.bud.lisp.lang.Environment;
 import me.predatorray.bud.lisp.lexer.Lexer;
@@ -46,7 +46,7 @@ public class BudInterpreter {
     private final Environment initial;
 
     public BudInterpreter() {
-        this(new NaiveEvaluator());
+        this(new TcoEvaluator());
     }
 
     public BudInterpreter(Evaluator evaluator) {

diff --git a/src/main/java/me/predatorray/bud/lisp/BudRepl.java b/src/main/java/me/predatorray/bud/lisp/BudRepl.java
@@ -26,7 +26,7 @@
 import me.predatorray.bud.lisp.builtin.BuiltinsEnvironment;
 import me.predatorray.bud.lisp.evaluator.EvaluatingException;
 import me.predatorray.bud.lisp.evaluator.Evaluator;
-import me.predatorray.bud.lisp.evaluator.NaiveEvaluator;
+import me.predatorray.bud.lisp.evaluator.TcoEvaluator;
 import me.predatorray.bud.lisp.lang.BudObject;
 import me.predatorray.bud.lisp.lang.Environment;
 import me.predatorray.bud.lisp.lexer.Lexer;
@@ -36,14 +36,7 @@
 import me.predatorray.bud.lisp.parser.Parser;
 import me.predatorray.bud.lisp.parser.ParserException;
 
-import java.io.BufferedReader;
-import java.io.Console;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
+import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Iterator;
@@ -60,7 +53,7 @@ public BudRepl() {
     }
 
     public BudRepl(boolean interactive) {
-        this.evaluator = new NaiveEvaluator();
+        this.evaluator = new TcoEvaluator();
         this.initial = BuiltinsEnvironment.INSTANCE;
         this.interactive = interactive;
     }

diff --git a/src/main/java/me/predatorray/bud/lisp/evaluator/ConcurrentEvaluator.java b/src/main/java/me/predatorray/bud/lisp/evaluator/ConcurrentEvaluator.java
diff --git a/src/main/java/me/predatorray/bud/lisp/evaluator/NaiveEvaluator.java b/src/main/java/me/predatorray/bud/lisp/evaluator/NaiveEvaluator.java
diff --git a/src/main/java/me/predatorray/bud/lisp/evaluator/TcoEvaluator.java b/src/main/java/me/predatorray/bud/lisp/evaluator/TcoEvaluator.java
@@ -23,22 +23,22 @@
  */
 package me.predatorray.bud.lisp.evaluator;
 
-import me.predatorray.bud.lisp.lang.BudFuture;
 import me.predatorray.bud.lisp.lang.BudObject;
+import me.predatorray.bud.lisp.lang.Continuous;
 import me.predatorray.bud.lisp.lang.Environment;
 import me.predatorray.bud.lisp.parser.Expression;
 
 public class TcoEvaluator implements Evaluator {
 
     @Override
     public BudObject evaluate(Expression expression, Environment environment) {
-        BudFuture nextCall = expression.evaluateAndGetBudFuture(environment, this);
+        Continuous nextCall = expression.evaluate(environment, this);
         while (true) {
-            BudFuture tailCall = nextCall.getTailCall();
-            if (tailCall == null) {
+            Continuous successor = nextCall.getSuccessor();
+            if (successor == null) {
                 return nextCall.getResult();
             }
-            nextCall = tailCall;
+            nextCall = successor;
         }
     }
 }
diff --git a/.../predatorray/bud/lisp/lang/BudFuture.java → ...predatorray/bud/lisp/lang/Continuous.java b/.../predatorray/bud/lisp/lang/BudFuture.java → ...predatorray/bud/lisp/lang/Continuous.java
@@ -23,9 +23,9 @@
  */
 package me.predatorray.bud.lisp.lang;
 
-public interface BudFuture {
+public interface Continuous {
 
     BudObject getResult();
 
-    BudFuture getTailCall();
+    Continuous getSuccessor();
 }
diff --git a/src/main/java/me/predatorray/bud/lisp/lang/LambdaFunction.java b/src/main/java/me/predatorray/bud/lisp/lang/LambdaFunction.java
@@ -70,9 +70,9 @@ public BudObject apply(List<BudObject> arguments) {
     }
 
     @Override
-    public BudFuture applyAndGetBudFuture(List<BudObject> arguments) {
+    public Continuous applyAndGetBudFuture(List<BudObject> arguments) {
         Environment enclosing = generateEnvForBody(arguments);
-        return new TailExpressionBudFuture(body, enclosing, evaluator);
+        return new TailExpression(body, enclosing, evaluator);
     }
 
     private Environment generateEnvForBody(List<BudObject> arguments) {

diff --git a/...d/lisp/lang/TailApplicationBudFuture.java → ...torray/bud/lisp/lang/TailApplication.java b/...d/lisp/lang/TailApplicationBudFuture.java → ...torray/bud/lisp/lang/TailApplication.java
@@ -27,12 +27,12 @@
 
 import java.util.List;
 
-public final class TailApplicationBudFuture implements BudFuture {
+public final class TailApplication implements Continuous {
 
     private final Function function;
     private final List<BudObject> arguments;
 
-    public TailApplicationBudFuture(Function function, List<BudObject> arguments) {
+    public TailApplication(Function function, List<BudObject> arguments) {
         this.function = Validation.notNull(function);
         this.arguments = Validation.notNull(arguments);
     }
@@ -43,12 +43,12 @@ public BudObject getResult() {
     }
 
     @Override
-    public BudFuture getTailCall() {
+    public Continuous getSuccessor() {
         if (function instanceof TailCallFunction) {
             TailCallFunction tailCallFunction = (TailCallFunction) this.function;
             return tailCallFunction.applyAndGetBudFuture(arguments);
         } else {
-            return new CompletedBudFuture(function.apply(arguments));
+            return new Terminal(function.apply(arguments));
         }
     }
 }
diff --git a/src/main/java/me/predatorray/bud/lisp/lang/TailCallFunction.java b/src/main/java/me/predatorray/bud/lisp/lang/TailCallFunction.java
@@ -27,5 +27,5 @@
 
 public interface TailCallFunction extends Function {
 
-    BudFuture applyAndGetBudFuture(List<BudObject> arguments);
+    Continuous applyAndGetBudFuture(List<BudObject> arguments);
 }
diff --git a/...ud/lisp/lang/TailExpressionBudFuture.java → ...atorray/bud/lisp/lang/TailExpression.java b/...ud/lisp/lang/TailExpressionBudFuture.java → ...atorray/bud/lisp/lang/TailExpression.java
@@ -27,13 +27,13 @@
 import me.predatorray.bud.lisp.parser.Expression;
 import me.predatorray.bud.lisp.util.Validation;
 
-public final class TailExpressionBudFuture implements BudFuture {
+public final class TailExpression implements Continuous {
 
     private final Expression tailExpression;
     private final Environment environment;
     private final Evaluator evaluator;
 
-    public TailExpressionBudFuture(Expression tailExpression, Environment environment, Evaluator evaluator) {
+    public TailExpression(Expression tailExpression, Environment environment, Evaluator evaluator) {
         this.tailExpression = Validation.notNull(tailExpression);
         this.environment = Validation.notNull(environment);
         this.evaluator = Validation.notNull(evaluator);
@@ -45,7 +45,7 @@ public BudObject getResult() {
     }
 
     @Override
-    public BudFuture getTailCall() {
-        return tailExpression.evaluateAndGetBudFuture(environment, evaluator);
+    public Continuous getSuccessor() {
+        return tailExpression.evaluate(environment, evaluator);
     }
 }
diff --git a/...ray/bud/lisp/lang/CompletedBudFuture.java → ...e/predatorray/bud/lisp/lang/Terminal.java b/...ray/bud/lisp/lang/CompletedBudFuture.java → ...e/predatorray/bud/lisp/lang/Terminal.java
@@ -23,11 +23,11 @@
  */
 package me.predatorray.bud.lisp.lang;
 
-public final class CompletedBudFuture implements BudFuture {
+public final class Terminal implements Continuous {
 
     private final BudObject result;
 
-    public CompletedBudFuture(BudObject result) {
+    public Terminal(BudObject result) {
         this.result = result;
     }
 
@@ -37,7 +37,7 @@ public BudObject getResult() {
     }
 
     @Override
-    public BudFuture getTailCall() {
+    public Continuous getSuccessor() {
         return null;
     }
 }