Common Lisp: Add basic completion for toplevel symbols to the REPL

diff --git a/common-lisp/src/env.lisp b/common-lisp/src/env.lisp
index 0a2ff05..771b72c 100644 (file)
--- a/common-lisp/src/env.lisp
+++ b/common-lisp/src/env.lisp
@@ -5,7 +5,8 @@
            :create-mal-env
            :get-env
            :find-env
-           :set-env))
+           :set-env
+           :mal-env-bindings))
 
 (in-package :env)
 

diff --git a/common-lisp/src/step0_repl.lisp b/common-lisp/src/step0_repl.lisp
index 79d1800..17ba161 100644 (file)
--- a/common-lisp/src/step0_repl.lisp
+++ b/common-lisp/src/step0_repl.lisp
@@ -2,6 +2,8 @@
   (:use :common-lisp)
   (:import-from :uiop
                 :getenv)
+  (:import-from :cl-readline
+                :readline)
   (:export :main))
 
 (in-package :mal)
@@ -27,10 +29,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)

diff --git a/common-lisp/src/step1_read_print.lisp b/common-lisp/src/step1_read_print.lisp
index 1c0bd24..871ffbd 100644 (file)
--- a/common-lisp/src/step1_read_print.lisp
+++ b/common-lisp/src/step1_read_print.lisp
@@ -4,6 +4,8 @@
         :printer)
   (:import-from :utils
                 :getenv)
+  (:import-from :cl-readline
+                :readline)
   (:export :main))
 
 (in-package :mal)
@@ -33,10 +35,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)

diff --git a/common-lisp/src/step2_eval.lisp b/common-lisp/src/step2_eval.lisp
index ecfaedb..13723d5 100644 (file)
--- a/common-lisp/src/step2_eval.lisp
+++ b/common-lisp/src/step2_eval.lisp
@@ -4,11 +4,15 @@
         :env
         :reader
         :printer)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -87,6 +91,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of *repl-env*
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -94,10 +110,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -122,6 +135,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (loop do (let ((line (mal-readline "user> ")))
              (if line (mal-writeline (rep line)) (return)))))
 

diff --git a/common-lisp/src/step3_env.lisp b/common-lisp/src/step3_env.lisp
index ff34662..2aa0913 100644 (file)
--- a/common-lisp/src/step3_env.lisp
+++ b/common-lisp/src/step3_env.lisp
@@ -5,11 +5,15 @@
         :reader
         :printer
         :genhash)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -114,6 +118,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -121,10 +137,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -149,6 +162,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (loop do (let ((line (mal-readline "user> ")))
              (if line (mal-writeline (rep line)) (return)))))
 

diff --git a/common-lisp/src/step4_if_fn_do.lisp b/common-lisp/src/step4_if_fn_do.lisp
index 99fca65..0d865a8 100644 (file)
--- a/common-lisp/src/step4_if_fn_do.lisp
+++ b/common-lisp/src/step4_if_fn_do.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -118,6 +122,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -125,10 +141,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -153,6 +166,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (loop do (let ((line (mal-readline "user> ")))
              (if line (mal-writeline (rep line)) (return)))))
 

diff --git a/common-lisp/src/step5_tco.lisp b/common-lisp/src/step5_tco.lisp
index 18150d6..b0d9ece 100644 (file)
--- a/common-lisp/src/step5_tco.lisp
+++ b/common-lisp/src/step5_tco.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -129,6 +133,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -136,10 +152,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -164,6 +177,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (loop do (let ((line (mal-readline "user> ")))
              (if line (mal-writeline (rep line)) (return)))))
 

diff --git a/common-lisp/src/step6_file.lisp b/common-lisp/src/step6_file.lisp
index 152a9af..361305c 100644 (file)
--- a/common-lisp/src/step6_file.lisp
+++ b/common-lisp/src/step6_file.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -135,6 +139,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -142,10 +158,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -178,6 +191,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (let ((args (if argv-provided-p
                   argv
                   (cdr (utils:raw-command-line-arguments)))))

diff --git a/common-lisp/src/step7_quote.lisp b/common-lisp/src/step7_quote.lisp
index 956b0bc..ea7d53d 100644 (file)
--- a/common-lisp/src/step7_quote.lisp
+++ b/common-lisp/src/step7_quote.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -171,6 +175,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -178,10 +194,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -214,6 +227,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (let ((args (if argv-provided-p
                   argv
                   (cdr (utils:raw-command-line-arguments)))))

diff --git a/common-lisp/src/step8_macros.lisp b/common-lisp/src/step8_macros.lisp
index 0c2c214..cbf47eb 100644 (file)
--- a/common-lisp/src/step8_macros.lisp
+++ b/common-lisp/src/step8_macros.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -228,6 +232,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -235,10 +251,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -271,6 +284,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (let ((args (if argv-provided-p
                   argv
                   (cdr (utils:raw-command-line-arguments)))))

diff --git a/common-lisp/src/step9_try.lisp b/common-lisp/src/step9_try.lisp
index bc36001..18e0060 100644 (file)
--- a/common-lisp/src/step9_try.lisp
+++ b/common-lisp/src/step9_try.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -252,6 +256,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -259,10 +275,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -295,6 +308,11 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
+
   (let ((args (if argv-provided-p
                   argv
                   (cdr (utils:raw-command-line-arguments)))))

diff --git a/common-lisp/src/stepA_mal.lisp b/common-lisp/src/stepA_mal.lisp
index 82c6c7f..046dd9f 100644 (file)
--- a/common-lisp/src/stepA_mal.lisp
+++ b/common-lisp/src/stepA_mal.lisp
@@ -5,12 +5,16 @@
         :reader
         :printer
         :core)
+  (:import-from :cl-readline
+                :readline
+                :register-function)
   (:import-from :genhash
                 :hashref
                 :hashmap)
   (:import-from :utils
                 :listify
-                :getenv)
+                :getenv
+                :common-prefix)
   (:export :main))
 
 (in-package :mal)
@@ -262,6 +266,18 @@
 
 (defvar *use-readline-p* nil)
 
+(defun complete-toplevel-symbols (input &rest ignored)
+  (declare (ignorable ignored))
+
+  (let (candidates)
+    (loop for key being the hash-keys of (env:mal-env-bindings *repl-env*)
+       when (let ((pos (search input key))) (and pos (zerop pos)))
+       do (push key candidates))
+
+    (if (= 1 (length candidates))
+        (cons (car candidates) candidates)
+        (cons (apply #'utils:common-prefix candidates) candidates))))
+
 (defun raw-input (prompt)
   (format *standard-output* prompt)
   (force-output *standard-output*)
@@ -269,10 +285,7 @@
 
 (defun mal-readline (prompt)
   (if *use-readline-p*
-      (rl:readline :prompt prompt
-                            :add-history t
-                            :novelty-check (lambda (old new)
-                                             (not (string= old new))))
+      (rl:readline :prompt prompt :add-history t :novelty-check #'string/=)
       (raw-input prompt)))
 
 (defun mal-writeline (string)
@@ -306,6 +319,10 @@
                 *standard-output* (ext:make-stream :output :buffered t)
                 *error-output* (ext:make-stream :error :buffered t))
 
+  ;; CCL fails with a error while registering completion function
+  ;; See also https://github.com/mrkkrp/cl-readline/issues/5
+  #-ccl (rl:register-function :complete #'complete-toplevel-symbols)
+
   (let ((args (if argv-provided-p
                   argv
                   (cdr (utils:raw-command-line-arguments)))))

diff --git a/common-lisp/src/utils.lisp b/common-lisp/src/utils.lisp
index 8845f20..95eadf5 100644 (file)
--- a/common-lisp/src/utils.lisp
+++ b/common-lisp/src/utils.lisp
@@ -5,7 +5,8 @@
            :getenv
            :read-file-string
            :raw-command-line-arguments
-           :listify))
+           :listify
+           :common-prefix))
 
 (in-package :utils)
 
@@ -27,3 +28,15 @@ is replaced with replacement."
 (defun listify (sequence)
   "Convert a sequence to a list"
   (map 'list #'identity sequence))
+
+(defun common-prefix (&rest strings)
+  (if (not strings)
+      ""
+      (let* ((char-lists (mapcar (lambda (string) (coerce string 'list)) strings))
+             (char-tuples (apply #'mapcar #'list char-lists))
+             (count 0))
+        (loop for char-tuple in char-tuples
+           while (every (lambda (char) (equal char (car char-tuple))) char-tuple)
+           do (incf count))
+
+        (subseq (car strings) 0 count))))