GH-518 Fix REPL console

panda-lang · May 18, 2020 · 146696b · 146696b
1 parent efdb5f3
commit 146696b
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 22 deletions.
diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/Repl.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/Repl.java
@@ -17,7 +17,6 @@
 package org.panda_lang.panda.shell.repl;
 
 import io.vavr.control.Option;
-import org.panda_lang.framework.FrameworkController;
 import org.panda_lang.framework.PandaFrameworkException;
 import org.panda_lang.framework.design.architecture.dynamic.Frame;
 import org.panda_lang.framework.design.architecture.expression.Expression;
@@ -52,6 +51,7 @@
  */
 public final class Repl {
 
+    private final ReplConsole console;
     private final Context context;
     private final ExpressionParser expressionParser;
     private final Supplier<Process> processSupplier;
@@ -63,6 +63,7 @@ public final class Repl {
     private StringBuilder history;
 
     Repl(ReplCreator creator) throws Exception {
+        this.console = creator.console;
         this.context = creator.context;
         this.expressionParser = context.getComponent(Components.EXPRESSION);
         this.processSupplier = creator.processSupplier;
@@ -105,7 +106,7 @@ public Collection<ReplResult> evaluate(String source) {
     }
 
     private Option<ReplResult> evaluateCommand(String command) {
-        String content = command.substring(1).toLowerCase().trim();
+        String content = command.toLowerCase().trim();
 
         if (content.isEmpty()) {
             content = "help";
@@ -128,6 +129,10 @@ private Option<ReplResult> evaluateCommand(String command) {
                 result += history.toString();
                 break;
             }
+            case "exit": {
+                console.interrupt();
+                break;
+            }
             case "?":
             case "help": {
                 result += "Default help page of REPL. All the available commands: \n";
@@ -199,11 +204,11 @@ private ReplResult evaluateExpression(Snippet expressionSource) {
     /**
      * Initiate REPL creator
      *
-     * @param frameworkController the framework controller that contains required resources
+     * @param
      * @return a REPL creator instance
      */
-    public static ReplCreator creator(FrameworkController frameworkController) {
-        return new ReplCreator(frameworkController);
+    public static ReplCreator creator(ReplConsole console) {
+        return new ReplCreator(console);
     }
 
 }
diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplConsole.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplConsole.java
@@ -16,6 +16,7 @@
 
 package org.panda_lang.panda.shell.repl;
 
+import org.panda_lang.framework.FrameworkController;
 import org.panda_lang.panda.Panda;
 import org.panda_lang.panda.PandaConstants;
 
@@ -25,31 +26,40 @@
 
 public final class ReplConsole {
 
-    private final Panda panda;
+    private final FrameworkController controller;
     private final InputStream input;
     private final boolean simplified;
+    private boolean interrupted;
 
-    public ReplConsole(Panda panda, InputStream input, boolean simplified) {
-        this.panda = panda;
+    public ReplConsole(Panda controller, InputStream input, boolean simplified) {
+        this.controller = controller;
         this.input = input;
         this.simplified = simplified;
     }
 
     public void launch() throws Exception {
         Scanner scanner = new Scanner(input);
-        panda.getLogger().info("Panda " + PandaConstants.VERSION + " REPL");
-        panda.getLogger().info("Type 'help' for more information.");
+        controller.getLogger().info("Panda " + PandaConstants.VERSION + " REPL");
+        controller.getLogger().info("Type 'help' for more information.");
 
-        Repl repl = Repl.creator(panda)
-                .withCustomExceptionListener(simplified ? (exception, runtime) -> panda.getLogger().error(exception.getMessage()) : null)
+        Repl repl = Repl.creator(this)
+                .withCustomExceptionListener(simplified ? (exception, runtime) -> controller.getLogger().error(exception.getMessage()) : null)
                 .create();
 
-        while (scanner.hasNextLine()) {
+        while (!interrupted && scanner.hasNextLine()) {
             Collection<ReplResult> results = repl.evaluate(scanner.nextLine());
-            ReplUtils.print(panda, results);
+            ReplUtils.print(controller, results);
         }
 
-        panda.getLogger().info("REPL has been terminated");
+        controller.getLogger().info("REPL has been terminated");
+    }
+
+    public void interrupt() {
+        this.interrupted = true;
+    }
+
+    public FrameworkController getFrameworkController() {
+        return controller;
     }
 
 }
diff --git a/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplCreator.java b/panda/src/main/java/org/panda_lang/panda/shell/repl/ReplCreator.java
@@ -17,7 +17,6 @@
 package org.panda_lang.panda.shell.repl;
 
 import org.jetbrains.annotations.Nullable;
-import org.panda_lang.framework.FrameworkController;
 import org.panda_lang.framework.design.architecture.module.Module;
 import org.panda_lang.framework.design.architecture.type.State;
 import org.panda_lang.framework.design.architecture.type.Type;
@@ -45,15 +44,17 @@
  */
 public final class ReplCreator {
 
+    protected final ReplConsole console;
     protected final Context context;
     protected final TypeScope typeScope;
     protected final ReplScope replScope;
     protected ReplExceptionListener exceptionListener;
     protected Supplier<Process> processSupplier;
     protected ThrowingFunction<ProcessStack, Object, Exception> instanceSupplier;
 
-    ReplCreator(FrameworkController frameworkController) {
-        this.context = PandaContextUtils.createStubContext(frameworkController);
+    ReplCreator(ReplConsole console) {
+        this.console = console;
+        this.context = PandaContextUtils.createStubContext(console.getFrameworkController());
 
         Module module = context.getComponent(Components.SCRIPT).getModule();
         Type type = PandaType.builder()

diff --git a/panda/src/test/java/org/panda_lang/panda/shell/repl/ReplTest.java b/panda/src/test/java/org/panda_lang/panda/shell/repl/ReplTest.java
@@ -34,7 +34,8 @@ void test() throws Exception {
         PandaFactory pandaFactory = new PandaFactory();
         Panda panda = pandaFactory.createPanda(LoggerFactory.getLogger(ReplTest.class));
 
-        ReplCreator creator = Repl.creator(panda);
+        ReplConsole console = new ReplConsole(panda, System.in, true);
+        ReplCreator creator = Repl.creator(console);
         Context context = creator.getContext();
 
         Repl repl = creator
@@ -55,11 +56,12 @@ void test() throws Exception {
         ReplUtils.print(panda, repl.evaluate("i = 4"));
 
         repl.regenerate();
+
         ReplUtils.print(panda, repl.evaluate("i"));
         ReplUtils.print(panda, repl.evaluate("String text = 'hello'; 'second expression'"));
 
-        ReplUtils.print(panda, repl.evaluate("? vars"));
-        ReplUtils.print(panda, repl.evaluate("? source"));
+        ReplUtils.print(panda, repl.evaluate("vars"));
+        ReplUtils.print(panda, repl.evaluate("history"));
 
         ReplUtils.print(panda, repl.evaluate("Double double = 9.86960440109"));
         ReplUtils.print(panda, repl.evaluate("sqrt(double)"));

diff --git a/pom.xml b/pom.xml
@@ -242,7 +242,7 @@
                     <version>3.2.0</version>
                     <executions>
                         <execution>
-                            <id>attach-javadocs</id>
+                            <!-- <id>attach-javadocs</id> -->
                             <goals>
                                 <goal>jar</goal>
                             </goals>