atlas-engineer · Ambrevar · May 23, 2023 · Apr 27, 2023 · Apr 27, 2023 · Apr 28, 2023
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -15,8 +15,14 @@ jobs:
     name: ${{ matrix.lisp }} on ${{ matrix.os }}
     strategy:
       matrix:
-        lisp: [sbcl-bin]
-        os: [ubuntu-latest]
+        # Use ccl-bin/1.12.1 instead of 'ccl' because of
+        # https://github.com/roswell/roswell/issues/534.
+        # TODO: Revert when Roswell is functional again.
+        lisp: [sbcl-bin, ccl-bin/1.12.1, ecl/21.2.1]
+        rosargs: [dynamic-space-size=3072]
+        os: [ubuntu-latest, macos-latest] # try windows-latest when we understand commands to install Roswell on it
+
+    # run the job on every combination of "lisp" and "os" above
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/.gitmodules b/.gitmodules
@@ -10,14 +10,6 @@
 	path = _build/symbol-munger
 	url = https://github.com/AccelerationNet/symbol-munger
 	shallow = true
-[submodule "_build/calispel"]
-	path = _build/calispel
-	url = https://github.com/hawkir/calispel
-	shallow = true
-[submodule "_build/cl-jpl-util"]
-	path = _build/cl-jpl-util
-	url = https://github.com/hawkir/cl-jpl-util
-	shallow = true
 [submodule "_build/cl-containers"]
 	path = _build/cl-containers
 	url = https://github.com/gwkkwg/cl-containers
@@ -170,11 +162,11 @@
 	path = _build/trivial-package-local-nicknames
 	url = https://github.com/phoe/trivial-package-local-nicknames
 	shallow = true
-[submodule "_build/jpl-queues"]
-	path = _build/jpl-queues
-	url = https://gitlab.common-lisp.net/nyxt/jpl-queues.git
-	shallow = true
 [submodule "_build/mt19937"]
 	path = _build/mt19937
 	url = https://gitlab.common-lisp.net/nyxt/mt19937
 	shallow = true
+[submodule "_build/nhooks"]
+	path = _build/nhooks
+	url = https://github.com/atlas-engineer/nhooks
+	shallow = true
diff --git a/README.org b/README.org
@@ -56,3 +56,8 @@ Non-exhaustive list of features:
 - Marks actions (event-driven on marks change).
 - Current suggestion actions (event-driven on current suggestion change).
 - Automatically return the prompt when narrowed down to a single suggestion.
+
+* Roadmap
+
+- Benchmark.
+  See if setting task priorities with Lparallel helps performance.
diff --git a/_build/calispel b/_build/calispel
diff --git a/_build/cl-jpl-util b/_build/cl-jpl-util
diff --git a/_build/jpl-queues b/_build/jpl-queues
diff --git a/_build/nhooks b/_build/nhooks
diff --git a/package.lisp b/package.lisp
@@ -3,13 +3,15 @@
 
 (uiop:define-package :prompter
   (:use :common-lisp)
-  (:import-from :nclasses #:define-class)
+  (:import-from :nclasses #:define-class #:define-generic)
   (:import-from :serapeum #:export-always))
 (in-package prompter)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (trivial-package-local-nicknames:add-package-local-nickname :alex :alexandria)
-  (trivial-package-local-nicknames:add-package-local-nickname :sera :serapeum))
+  (trivial-package-local-nicknames:add-package-local-nickname :sera :serapeum)
+  (trivial-package-local-nicknames:add-package-local-nickname :lpara :lparallel)
+  (trivial-package-local-nicknames:add-package-local-nickname :lpara.queue :lparallel.queue))
 
 (defmacro define-function (name args &body body)
   "Eval ARGS then define function over the resulting lambda list.
@@ -21,6 +23,13 @@ All ARGS are declared as `ignorable'."
                                              lambda-list-keywords)))
        ,@body)))
 
+(defun slot-names (class-specifier)
+  ;; TODO: `slot-names' or `direct-slot-names'?
+  #-ecl
+  (mopu:slot-names class-specifier)
+  #+ecl
+  (mapcar #'c2mop:slot-definition-name (c2mop:class-slots (find-class class-specifier))))
+
 (defun initargs (class-specifier)
   "Return CLASS-SPECIFIER initargs as symbols (not keywords)."
   (delete nil
@@ -29,11 +38,7 @@ All ARGS are declared as `ignorable'."
                      (symbol-name
                       (first (getf (mopu:slot-properties class-specifier slot) :initargs)))
                      (symbol-package class-specifier)))
-                  ;; TODO: `slot-names' or `direct-slot-names'?
-                  #-ecl
-                  (mopu:slot-names class-specifier)
-                  #+ecl
-                  (mapcar #'c2mop:slot-definition-name (c2mop:class-slots (find-class 'prompter))))))
+                  (slot-names class-specifier))))
 
 (defun exported-p (sym)
   (eq :external
@@ -46,4 +51,4 @@ All ARGS are declared as `ignorable'."
 (export-always '*debug-on-error*)
 (defvar *debug-on-error* nil
   "When non-nil, the Lisp debugger is invoked when a condition is raised.
-Otherwise all errors occuring in threads are demoted to warnings.")
+Otherwise all errors occurring in threads are demoted to warnings.")