[GR-12307] Support the "input" builtin

PullRequest: graalpython/258

Author: cosminbasca

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/ConsoleHandler.java

@@ -63,7 +63,11 @@ public abstract class ConsoleHandler {
     /**
      * Read a line of input, newline is <b>NOT</b> included in result.
      */
-    public abstract String readLine();
+    public final String readLine() {
+        return readLine(true);
+    }
+
+    public abstract String readLine(boolean prompt);
 
     public abstract void setPrompt(String prompt);
 
@@ -90,7 +94,7 @@ public InputStream createInputStream() {
             public int read() throws IOException {
                 if (buffer == null) {
                     pos = 0;
-                    String line = readLine();
+                    String line = readLine(false);
                     if (line == null) {
                         return -1;
                     }

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/DefaultConsoleHandler.java

@@ -59,9 +59,9 @@ public DefaultConsoleHandler(InputStream in, OutputStream out) {
     }
 
     @Override
-    public String readLine() {
+    public String readLine(boolean showPrompt) {
         try {
-            if (prompt != null) {
+            if (prompt != null && showPrompt) {
                 out.print(prompt);
             }
             return in.readLine();

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/JLineConsoleHandler.java

@@ -237,10 +237,10 @@ public void setContext(Context context) {
     }
 
     @Override
-    public String readLine() {
+    public String readLine(boolean showPrompt) {
         try {
             console.getTerminal().init();
-            return console.readLine();
+            return console.readLine(showPrompt ? console.getPrompt() : "");
         } catch (UserInterruptException e) {
             throw e;
         } catch (Exception ex) {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinFunctions.java

@@ -68,14 +68,18 @@
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.math.BigInteger;
+import java.nio.CharBuffer;
 import java.util.List;
 import java.util.function.Supplier;
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
+import com.oracle.graal.python.builtins.PythonBuiltinClassType;
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory.GetAttrNodeFactory;
 import com.oracle.graal.python.builtins.modules.BuiltinFunctionsFactory.NextNodeFactory;
@@ -1535,4 +1539,44 @@ public Object doit(Object object) {
             return "truffle ast dump not supported for " + object.toString();
         }
     }
+
+    @Builtin(name = "input", keywordArguments = {"prompt"})
+    @GenerateNodeFactory
+    abstract static class InputNode extends PythonUnaryBuiltinNode {
+        @Specialization
+        @TruffleBoundary
+        String input(@SuppressWarnings("unused") PNone prompt) {
+            CharBuffer buf = CharBuffer.allocate(1000);
+            try {
+                InputStream stdin = getContext().getStandardIn();
+                int read = stdin.read();
+                while (read != -1 && read != '\n') {
+                    if (buf.remaining() == 0) {
+                        CharBuffer newBuf = CharBuffer.allocate(buf.capacity() * 2);
+                        newBuf.put(buf);
+                        buf = newBuf;
+                    }
+                    buf.put((char) read);
+                    read = stdin.read();
+                }
+                buf.limit(buf.position());
+                buf.rewind();
+                return buf.toString();
+            } catch (IOException e) {
+                throw raise(PythonBuiltinClassType.EOFError, e.getMessage());
+            }
+        }
+
+        @Specialization
+        String inputPrompt(PString prompt) {
+            return inputPrompt(prompt.getValue());
+        }
+
+        @Specialization
+        @TruffleBoundary
+        String inputPrompt(String prompt) {
+            new PrintStream(getContext().getStandardOut()).println(prompt);
+            return input(null);
+        }
+    }
 }

mx.graalpython/mx_graalpython.py

@@ -432,6 +432,7 @@ def graalpython_gate_runner(args, tasks):
                 version="1fc0e86a54cbe090d36f262c062d8f4eee8f2e6d",
                 urlinfos=[mx.SuiteImportURLInfo(mx_urlrewrites.rewriteurl(apprepo), "git", mx.vc_system("git"))]
             )
+            mx.log(" ".join(["Running", "mx"] + ["-p", _apptest_suite.dir, "graalpython-apptests"]))
             mx.run_mx(["-p", _apptest_suite.dir, "graalpython-apptests"])
 
     with Task('GraalPython license header update', tasks, tags=[GraalPythonTags.license]) as task: