[ compatibility with 0.3.6-pre changes to readline ]

jbr · Jan 27, 2011 · 8a569ca · 8a569ca
1 parent f207b10
commit 8a569ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/lib/repl.js b/lib/repl.js
@@ -1,6 +1,7 @@
-var stream = process.openStdin(),
+var input = process.openStdin(),
+    output = process.stdout,
     script = (process.binding("evals"))["Script"],
-    readline = require("readline").createInterface(stream),
+    readline = require("readline").createInterface(input, output),
     sibilant = require((__dirname + "/sibilant")),
     context = undefined,
     cmdBuffer = "",
@@ -19,11 +20,7 @@ var createContext = (function() {
 });
 
 context = createContext();
-stream.on("data", (function(data) {
-  // data:required
-  return readline.write(data);
-}));
-
+//(stream.on 'data (lambda (data) (readline.write data)))
 var displayPrompt = (function() {
   readline.setPrompt(((function() {
     if ((cmdBuffer.length > 10)) {
@@ -55,7 +52,7 @@ readline.on("line", (function(cmd) {
       (readline.history)[0] = cmdBuffer;;
       (function() {
         if (typeof(result) !== 'undefined') {
-          return stream.write(("result: " + sys.inspect(result) + "\n"));
+          return output.write(("result: " + sys.inspect(result) + "\n"));
         };
       })();
       (context)["_"] = result;;
@@ -67,7 +64,7 @@ readline.on("line", (function(cmd) {
           return readline.history.shift();;
         } else {
           (readline.history)[0] = cmdBuffer;;
-          stream.write((e.stack + "\n"));
+          output.write((e.stack + "\n"));
           return cmdBuffer = "";;;
         };
       })();;
@@ -76,7 +73,8 @@ readline.on("line", (function(cmd) {
   return displayPrompt();
 }));
 
-readline.on("close", stream.destroy);
+readline.on("close", input.destroy);
 
 displayPrompt();
 
+
diff --git a/src/repl.lisp b/src/repl.lisp
@@ -1,6 +1,7 @@
-(defvar stream     (process.open-stdin)
+(defvar input      (process.open-stdin)
+        output     process.stdout
         script     (get (process.binding 'evals) "Script")
-        readline   (send (require 'readline) create-interface stream)
+        readline   (send (require 'readline) create-interface input output)
 	sibilant   (require (concat **dirname "/sibilant"))
 	context    undefined
 	cmd-buffer ""
@@ -16,7 +17,7 @@
 
 (setf context (create-context))
 
-(stream.on 'data (lambda (data) (readline.write data)))
+;(stream.on 'data (lambda (data) (readline.write data)))
 
 (defun display-prompt ()
   (readline.set-prompt
@@ -39,7 +40,7 @@
 	  (defvar result (script.run-in-context js-line context "sibilant-repl"))
 	  (set readline.history 0 cmd-buffer)
 	  (when (defined? result)
-	    (stream.write (concat "result: "
+	    (output.write (concat "result: "
 				  (sys.inspect result) "\n")))
 	  (set context "_" result)
 	  (setf cmd-buffer ""))
@@ -48,10 +49,10 @@
 	      (progn (setf cmd-buffer (concat cmd-buffer " "))
 		     (readline.history.shift))
 	    (progn (set readline.history 0 cmd-buffer)
-		   (stream.write (concat e.stack "\n"))
+		   (output.write (concat e.stack "\n"))
 		   (setf  cmd-buffer "")))))
        (display-prompt)))
 
-(readline.on 'close stream.destroy)
+(readline.on 'close input.destroy)
 
 (display-prompt)