Merge branch 'repl' of https://github.com/donaldh/nqp into rak-jvm-support

Author: jnthn

3rdparty/jline/LICENSE.txt

@@ -0,0 +1,33 @@
+Copyright (c) 2002-2006, Marc Prud'hommeaux <mwp1@cornell.edu>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with
+the distribution.
+
+Neither the name of JLine nor the names of its contributors
+may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+

3rdparty/jline/jline-1.0.jar

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar nqp "$@"
+exec java -Xbootclasspath/a:.:nqp-runtime.jar:3rdparty/asm/asm-4.1.jar:3rdparty/jline/jline-1.0.jar nqp "$@"

src/vm/jvm/runners/nqp

@@ -22,14 +22,16 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.EnumSet;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 
+import jline.ConsoleReader;
+
 import org.perl6.nqp.jast2bc.JASTToJVMBytecode;
 import org.perl6.nqp.sixmodel.BoolificationSpec;
 import org.perl6.nqp.sixmodel.InvocationSpec;
@@ -402,13 +404,10 @@ public static String readlineintfh(SixModelObject obj, String prompt, ThreadCont
             if (h.is == null)
                 die_s("File handle is not opened for read", tc);
             try {
-                if (h.isr == null)
-                    h.isr = new InputStreamReader(h.is, "UTF-8");
-                if (h.br == null)
-                    h.br = new BufferedReader(h.isr);
-                System.out.print(prompt);
-                System.out.flush();
-                String line = h.br.readLine();
+            	if (h.cr == null) {
+            		h.cr = new ConsoleReader(h.is, new OutputStreamWriter(System.out));
+            	}
+            	String line = h.cr.readLine(prompt);
                 if (line == null) {
                 	h.eof = true;
                 }

src/vm/jvm/runtime/org/perl6/nqp/runtime/Ops.java

@@ -6,6 +6,8 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 
+import jline.ConsoleReader;
+
 import org.perl6.nqp.sixmodel.SixModelObject;
 
 public class IOHandleInstance extends SixModelObject {
@@ -29,5 +31,8 @@ public class IOHandleInstance extends SixModelObject {
      * This further wraps the input stream reader for the case of doing
      * line-based I/O.
      */
-    public BufferedReader br;    
+    public BufferedReader br;
+    
+    /* This wraps the input stream for interactive readline */
+    public ConsoleReader cr;
 }

src/vm/jvm/runtime/org/perl6/nqp/sixmodel/reprs/IOHandleInstance.java

@@ -19,12 +19,13 @@ RUNTIME_JAVAS = \
 
 RUNTIME_JAR = nqp-runtime.jar
 
+THIRDPARTY_JARS = 3rdparty/asm/asm-4.1.jar@cpsep@3rdparty/jline/jline-1.0.jar
 STAGE0 = src/vm/jvm/stage0
 STAGE1 = src/stage1
 STAGE2 = src/stage2
 
-STAGE0_NQP = $(JAVA) -cp $(STAGE0) -Xbootclasspath/a:$(STAGE0)@cpsep@nqp-runtime.jar@cpsep@3rdparty/asm/asm-4.1.jar nqp --bootstrap
-STAGE1_NQP = $(JAVA) -cp $(STAGE1) -Xbootclasspath/a:$(STAGE1)@cpsep@nqp-runtime.jar@cpsep@3rdparty/asm/asm-4.1.jar nqp --bootstrap
+STAGE0_NQP = $(JAVA) -cp $(STAGE0) -Xbootclasspath/a:$(STAGE0)@cpsep@nqp-runtime.jar@cpsep@$(THIRDPARTY_JARS) nqp --bootstrap
+STAGE1_NQP = $(JAVA) -cp $(STAGE1) -Xbootclasspath/a:$(STAGE1)@cpsep@nqp-runtime.jar@cpsep@$(THIRDPARTY_JARS) nqp --bootstrap
 
 NQP_MO_CLASS    = nqpmo.class
 NQP_MO_COMBINED = gen/nqpmo.nqp
@@ -148,6 +149,7 @@ all: $(ALL_OUTPUT) $(RUNNER) $(P5QREGEX_CLASS)
 install: all
 	$(MKPATH) $(PREFIX)
 	$(CP) 3rdparty/asm/asm-4.1.jar $(PREFIX)
+	$(CP) 3rdparty/jline/jline-1.0.jar $(PREFIX)
 	$(CP) $(RUNTIME_JAR) $(PREFIX)
 	$(CP) $(NQP_MO_CLASS) $(PREFIX)
 	$(CP) $(MODULE_LOADER_CLASS) $(PREFIX)
@@ -164,7 +166,7 @@ install: all
 
 $(RUNTIME_JAR): $(RUNTIME_JAVAS)
 	$(PERL) -MExtUtils::Command -e mkpath bin
-	$(JAVAC) -source 1.7 -cp 3rdparty/asm/asm-4.1.jar -g -d bin $(RUNTIME_JAVAS)
+	$(JAVAC) -source 1.7 -cp $(THIRDPARTY_JARS) -g -d bin $(RUNTIME_JAVAS)
 	$(JAR) cf0 nqp-runtime.jar -C bin/ .
 
 clean:

tools/build/Makefile-JVM.in

@@ -16,15 +16,15 @@
     my $install_to = File::Spec->catfile($prefix, 'nqp.bat');
     open my $fh, ">", $install_to;
     print $fh '@java -Xbootclasspath/a:' . $prefix . ';' . $prefix . '\\nqp-runtime.jar;' .
-              $prefix . '\\asm-4.1.jar -cp ' . $prefix . ' nqp %*' . "\n";
+              $prefix . '\\asm-4.1.jar;' . $prefix . '\\jline-1.0.jar -cp ' . $prefix . ' nqp %*' . "\n";
     close $fh;
 }
 else {
     my $install_to = File::Spec->catfile($prefix, 'nqp');
     open my $fh, ">", $install_to;
     print $fh "#!/bin/sh\n";
     print $fh 'exec java -Xbootclasspath/a:' . $prefix . ':' . $prefix . '/nqp-runtime.jar:' .
-              $prefix . '/asm-4.1.jar -cp ' . $prefix . ' nqp "$@"' . "\n";
+              $prefix . '/asm-4.1.jar:' . $prefix . '/jline-1.0.jar -cp ' . $prefix . ' nqp "$@"' . "\n";
     close $fh;
     chmod 0755, $install_to;
 }