guile: fixed readline bug

diff --git a/guile/core.scm b/guile/core.scm
index 64638fc..a5b87b3 100644 (file)
--- a/guile/core.scm
+++ b/guile/core.scm
@@ -215,7 +215,7 @@
     (vals        ,_vals)
     (contains?   ,_contains?)
     (sequential? ,_sequential?)
-    (readline    ,readline)
+    (readline    ,_readline)
     (meta        ,_meta)
     (with-meta   ,_with-meta)
     (atom        ,make-atom)

diff --git a/guile/readline.scm b/guile/readline.scm
index 7845887..f4f0305 100644 (file)
--- a/guile/readline.scm
+++ b/guile/readline.scm
@@ -16,16 +16,17 @@
 ;;(use-modules (ice-9 readline))
 
 (library (readline)
-  (export readline add-history)
+  (export _readline)
   (import (guile) (ice-9 readline)))
 
 (define mal-history
   (format #f "~a/.mal-history" (getenv "HOME")))
 
 (setenv "GUILE_HISTORY" mal-history)
-
+(readline-set! bounce-parens 0)
 (activate-readline)
 
-;;(define (readline prompt)
-;;  (display prompt)
-;;  ((@ (ice-9 rdelim) read-line) (current-input-port)))
+(define (_readline prompt)
+  (let ((str (readline prompt)))
+    (add-history str)
+    str))

diff --git a/guile/step0_repl.scm b/guile/step0_repl.scm
index dc1bcda..dd598b6 100644 (file)
--- a/guile/step0_repl.scm
+++ b/guile/step0_repl.scm
@@ -15,13 +15,12 @@
 
 (import (readline))
 
-(define (READ) (readline "user> "))
+(define (READ) (_readline "user> "))
 
 (define (EVAL ast env) ast)
 
 (define (PRINT str)
   (and (not (eof-object? str))
-       ;;(add-history str)
        (format #t "~a~%" str)))
 
 (define (LOOP continue?)

diff --git a/guile/step1_read_print.scm b/guile/step1_read_print.scm
index 1f82340..3517f7b 100644 (file)
--- a/guile/step1_read_print.scm
+++ b/guile/step1_read_print.scm
@@ -16,13 +16,12 @@
 (import (readline) (reader) (printer))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (EVAL ast env) ast)
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step2_eval.scm b/guile/step2_eval.scm
index 44387b5..7783185 100644 (file)
--- a/guile/step2_eval.scm
+++ b/guile/step2_eval.scm
@@ -22,7 +22,7 @@
     (/ . ,/)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -51,7 +51,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step3_env.scm b/guile/step3_env.scm
index 3655ffe..88e4eea 100644 (file)
--- a/guile/step3_env.scm
+++ b/guile/step3_env.scm
@@ -27,7 +27,7 @@
     (make-Env #:binds b #:exprs e)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -69,7 +69,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step4_if_fn_do.scm b/guile/step4_if_fn_do.scm
index bfdd377..8f7fadd 100644 (file)
--- a/guile/step4_if_fn_do.scm
+++ b/guile/step4_if_fn_do.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs e)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -83,7 +83,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step5_tco.scm b/guile/step5_tco.scm
index 4450699..8517a6b 100644 (file)
--- a/guile/step5_tco.scm
+++ b/guile/step5_tco.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs e)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -107,7 +107,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step6_file.scm b/guile/step6_file.scm
index 2bbe450..c94ff62 100644 (file)
--- a/guile/step6_file.scm
+++ b/guile/step6_file.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs e)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -110,7 +110,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step7_quote.scm b/guile/step7_quote.scm
index 6cbd248..704d0e8 100644 (file)
--- a/guile/step7_quote.scm
+++ b/guile/step7_quote.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs (map (lambda (x) (make-func x)) e))))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -128,7 +128,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step8_macros.scm b/guile/step8_macros.scm
index 169fb06..f191d7c 100644 (file)
--- a/guile/step8_macros.scm
+++ b/guile/step8_macros.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs (map (lambda (x) (make-func x)) e))))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -140,7 +140,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/step9_try.scm b/guile/step9_try.scm
index 2dd0fa5..0d57711 100644 (file)
--- a/guile/step9_try.scm
+++ b/guile/step9_try.scm
@@ -21,7 +21,7 @@
     (make-Env #:binds b #:exprs (map (lambda (x) (make-func x)) e))))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -151,7 +151,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       ;;(add-history str)
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)

diff --git a/guile/stepA_mal.scm b/guile/stepA_mal.scm
index cb4c77d..0b0eb6d 100644 (file)
--- a/guile/stepA_mal.scm
+++ b/guile/stepA_mal.scm
@@ -23,7 +23,7 @@
       env)))
 
 (define (READ)
-  (read_str (readline "user> ")))
+  (read_str (_readline "user> ")))
 
 (define (eval_ast ast env)
   (define (_eval x) (EVAL x env))
@@ -160,7 +160,6 @@
 
 (define (PRINT exp)
   (and (not (eof-object? exp))
-       (add-history (object->string exp))
        (format #t "~a~%" (pr_str exp #t))))
 
 (define (LOOP continue?)