diff --git a/.local/share/common-lisp/source/ambrevar/all.lisp b/.local/share/common-lisp/source/ambrevar/all.lisp index 9b0716b0..8ab523b7 100644 --- a/.local/share/common-lisp/source/ambrevar/all.lisp +++ b/.local/share/common-lisp/source/ambrevar/all.lisp @@ -1,7 +1,8 @@ (uiop:define-package ambrevar/all (:nicknames #:$) (:use #:common-lisp) - (:use #:trivia) + (:use #:trivia #:glyphs) + ;; TODO: Use alexandria and serapeum? cmd? fset? ;; Packages we want available at all times: (:import-from #:alexandria) (:import-from #:bordeaux-threads) @@ -47,9 +48,10 @@ #:ambrevar/file #:ambrevar/guix #:ambrevar/shell - #:ambrevar/syntax #:ambrevar/syspack - #:ambrevar/patches/cmd)) + #:ambrevar/patches/cmd) + ;; No need to `use' this the readtable: + (:import-from #:ambrevar/syntax)) (in-package ambrevar/all) (eval-when (:compile-toplevel :load-toplevel :execute) diff --git a/.local/share/common-lisp/source/ambrevar/syntax.lisp b/.local/share/common-lisp/source/ambrevar/syntax.lisp index 702c5154..099fcd44 100644 --- a/.local/share/common-lisp/source/ambrevar/syntax.lisp +++ b/.local/share/common-lisp/source/ambrevar/syntax.lisp @@ -45,8 +45,8 @@ (read-until stream #\") (ambrevar/file:file (read-until stream #\"))) -(export-always 'syntax) -(named-readtables:defreadtable syntax +(export-always 'readtable) +(named-readtables:defreadtable readtable (:merge :standard) (:dispatch-macro-char #\# #\# #'sh-reader) (:dispatch-macro-char #\# #\$ #'$cmd-reader)