From c872a37fe2dfc961f38832e1e2ddeab2f8c2fbae Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 19 Feb 2021 11:10:53 +0100 Subject: [PATCH] ambrevar/syntax: Rename readtable to "syntax" to avoid clashes with default readtable. Indeed, if multiple named readtables are called "readtable" (even with a package prefix), the last one to be defined seems to override the currently loaded 'readtable'. --- .emacs.d/lisp/init-sly.el | 2 +- .local/share/common-lisp/source/ambrevar/syntax.lisp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.emacs.d/lisp/init-sly.el b/.emacs.d/lisp/init-sly.el index bfd13e39..67b2d65a 100644 --- a/.emacs.d/lisp/init-sly.el +++ b/.emacs.d/lisp/init-sly.el @@ -81,7 +81,7 @@ GUIX-COMMAND is the command to the guix executable, e.g. '(\"~/projects/guix/pre ;; packages remain loadable? `((sbcl-ambrevar ("lisp-repl-core-dumper" "-p" "ambrevar sb-sprof" "sbcl" "--eval" "(in-package :ambrevar/all)" - "--eval" "(named-readtables:in-readtable ambrevar/syntax:readtable)")) + "--eval" "(named-readtables:in-readtable ambrevar/syntax:syntax)")) (sbcl (,@maybe-core-dumper "sbcl")) (sbcl-failsafe ("sbcl")) (sbcl-nyxt (lambda () (ambrevar/sbcl-for-nyxt :no-grafts? t))) diff --git a/.local/share/common-lisp/source/ambrevar/syntax.lisp b/.local/share/common-lisp/source/ambrevar/syntax.lisp index 099fcd44..817d4521 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 'readtable) -(named-readtables:defreadtable readtable +(export-always 'syntax) +(named-readtables:defreadtable ambrevar/syntax::syntax (:merge :standard) (:dispatch-macro-char #\# #\# #'sh-reader) (:dispatch-macro-char #\# #\$ #'$cmd-reader)