Add more ECL support

s-expressionists · Jun 21, 2023 · d3febee · d3febee
1 parent 634632f
commit d3febee
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/code/interface.lisp b/code/interface.lisp
@@ -216,10 +216,12 @@
        (defvar ,standard-pprint-dispatch-var)
        (defvar ,print-pprint-dispatch-var)
        (defun ,(intern "COPY-PPRINT-DISPATCH" intrinsic-pkg) (&optional (table ,print-pprint-dispatch-var))
+         #+ecl ,@(when intrinsic '((declare (ext:check-arguments-type nil))))
          (check-type table (or null inravina::dispatch-table))
          (inravina:copy-pprint-dispatch ,client-var table))
        (defun ,(intern "SET-PPRINT-DISPATCH" intrinsic-pkg)
            (type-specifier function &optional (priority 0) (table ,print-pprint-dispatch-var))
+         #+ecl ,@(when intrinsic '((declare (ext:check-arguments-type nil))))
          (check-type priority real)
          (check-type table inravina::dispatch-table)
          (check-type function (or symbol function))
@@ -252,6 +254,7 @@
                               kind colnum colinc)
          nil)
        (defun ,(intern "PPRINT-DISPATCH" intrinsic-pkg) (object &optional (table ,print-pprint-dispatch-var))
+         #+ecl ,@(when intrinsic '((declare (ext:check-arguments-type nil))))
          (check-type table (or null inravina::dispatch-table))
          (inravina:pprint-dispatch ,client-var (or table ,initial-pprint-dispatch-var) object))
        (defmacro ,(intern "PPRINT-LOGICAL-BLOCK" intrinsic-pkg) ((stream-symbol object

diff --git a/code/shim/test/expected-failures-clasp.sexp → code/shim/test/expected-failures/clasp.sexp b/code/shim/test/expected-failures-clasp.sexp → code/shim/test/expected-failures/clasp.sexp
diff --git a/code/shim/test/expected-failures-cmucl.sexp → code/shim/test/expected-failures/cmucl.sexp b/code/shim/test/expected-failures-cmucl.sexp → code/shim/test/expected-failures/cmucl.sexp
diff --git a/code/shim/test/expected-failures.sexp → .../shim/test/expected-failures/default.sexp b/code/shim/test/expected-failures.sexp → .../shim/test/expected-failures/default.sexp
diff --git a/code/shim/test/expected-failures/ecl.sexp b/code/shim/test/expected-failures/ecl.sexp
@@ -0,0 +1,6 @@
+:NIL-VECTORS-ARE-STRINGS
+:ALLOW-NIL-ARRAYS
+:MAKE-CONDITION-WITH-COMPOUND-NAME
+:NO-FLOATING-POINT-UNDERFLOW-BY-DEFAULT
+
+PPRINT-NEWLINE.FILL.7
diff --git a/code/shim/test/test.lisp b/code/shim/test/test.lisp
@@ -38,10 +38,11 @@
 
 (defun test (&rest args &key skip-sync &allow-other-keys)
   (let* ((system (asdf:find-system :inravina-shim/test))
-         (expected-failures (asdf:component-pathname (asdf:find-component system '("code"
-                                                                                   #+clasp "expected-failures-clasp.sexp"
-                                                                                   #+cmucl "expected-failures-cmucl.sexp"
-                                                                                   #-(or clasp cmucl) "expected-failures.sexp"))))
+         (expected-failures (asdf:component-pathname (asdf:find-component system '("expected-failures"
+                                                                                   #+clasp "clasp.sexp"
+                                                                                   #+cmucl "cmucl.sexp"
+                                                                                   #+ecl "ecl.sexp"
+                                                                                   #-(or clasp cmucl ecl) "default.sexp"))))
          (*default-pathname-defaults* (merge-pathnames (make-pathname :directory '(:relative "dependencies" "ansi-test"))
                                                        (asdf:component-pathname system))))
     (if skip-sync

diff --git a/inravina-shim.asd b/inravina-shim.asd
@@ -26,7 +26,10 @@
                 :pathname "code/shim/test/"
                 :serial t
                 :components ((:file "packages")
-                             (:file "test")
-                             (:static-file "expected-failures.sexp")
-                             (:static-file "expected-failures-clasp.sexp")
-                             (:static-file "expected-failures-cmucl.sexp")))))
+                             (:file "test")))
+               (:module "expected-failures"
+                :pathname "code/shim/test/expected-failures"
+                :components ((:static-file "default.sexp")
+                             (:static-file "clasp.sexp")
+                             (:static-file "cmucl.sexp")
+                             (:static-file "ecl.sexp")))))