Fix tests on Allegro

syntax.lisp

@@ -1,21 +1,4 @@
 (in-package :aoc)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun opening-braket-reader (stream char)
-    (declare (ignore char))
-    (let ((arg (intern "_")))
-      `(lambda (&optional ,arg)
-         (declare (ignorable ,arg))
-         (,@(read-delimited-list #\] stream t)))))
-  (set-macro-character #\[ #'opening-braket-reader)
-  ; Using #\) messes up with the editor -,-
-  (set-macro-character #\] (get-macro-character #.(char ")" 0))))
-
-#+#:excluded (read (make-string-input-stream "[format t \"Hello, ~a!\" _]"))
-
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun sharp-semicolon-reader (stream sub-char numarg)
-    (declare (ignore sub-char numarg))
-    (loop :while (read-line stream nil nil))
-    (values))
-  (set-dispatch-macro-character #\# #\; #'sharp-semicolon-reader))
+(handler-bind ((named-readtables:reader-macro-conflict 'continue))
+  (named-readtables:merge-readtables-into :current :mlutils-syntax))

vendor/cl-classified/vendor/ml/ml.asd

@@ -2,7 +2,7 @@
   :author "Matteo Landi <[email protected]>"
   :license  "MIT"
   :serial t
-  :depends-on ()
+  :depends-on (#:named-readtables)
   :components
   (
    (:file "mlutils-package")

vendor/cl-classified/vendor/ml/mlsyntax.lisp

@@ -1,12 +1,25 @@
 (in-package "MLUTILS")
 
+
 (eval-when (:compile-toplevel :load-toplevel :execute)
+
   (defun opening-braket-reader (stream char)
     (declare (ignore char))
     (let ((arg (intern "_")))
       `(lambda (&optional ,arg)
          (declare (ignorable ,arg))
          (,@(read-delimited-list #\] stream t)))))
-  (set-macro-character #\[ #'opening-braket-reader)
-  ; Using #\) messes up with the editor -,-
-  (set-macro-character #\] (get-macro-character #.(char ")" 0))))
+
+  (defun sharp-semicolon-reader (stream sub-char numarg)
+    (declare (ignore sub-char numarg))
+    (loop :while (read-line stream nil nil))
+    (values))
+
+
+  (named-readtables:defreadtable :mlutils-syntax
+    (:merge :standard)
+    (:macro-char #\[ #'opening-braket-reader)
+    (:macro-char #\] (get-macro-character #\)))
+    (:dispatch-macro-char #\# #\; #'sharp-semicolon-reader))
+
+  )