Commit c07e2ddf authored by pfdietz's avatar pfdietz

Import QUIT from CL-USER into CL-TEST, if it is present. Add clisp package...

Import QUIT from CL-USER into CL-TEST, if it is present.  Add clisp package locking form (conditionally compiled) to get around a bug preventing the tests from loading.  Add ability to interpret rather than compile the unoptimized lambda form in the random tester, and enable that mode for clisp.
parent 76ae20a0
......@@ -994,8 +994,10 @@
(defparameter *cl-symbols*
(let ((pkg (find-package :common-lisp)))
(mapcar #'(lambda (str) (intern str pkg))
*cl-symbol-names*)))
(#-clisp progn
#+clisp ext:without-package-lock #+clisp ("COMMON-LISP")
(mapcar #'(lambda (str) (intern str pkg))
*cl-symbol-names*))))
;;; Symbols classified by their kind in the spec
(defparameter *cl-function-symbols*
......
......@@ -10,4 +10,6 @@
(:import-from "COMMON-LISP-USER" #:compile-and-load "==>")
(:export #:random-from-seq #:random-case #:coin #:random-permute))
#+cmu (import 'cl::quit :cl-test)
(let ((s (find-symbol "QUIT" "CL-USER")))
(when s (import s :cl-test)))
......@@ -39,6 +39,8 @@
(defvar *maximum-random-int-bits* 45)
(defvar *compile-unoptimized-form* #-clisp t #+clisp nil)
(declaim (special *vars*))
(defstruct var-desc
......@@ -471,7 +473,10 @@
#+:ecl (si:gc t)
))))
(let ((optimized-compiled-fn (%compile optimized-fn-src))
(unoptimized-compiled-fn (%compile unoptimized-fn-src)))
(unoptimized-compiled-fn
(if *compile-unoptimized-form*
(%compile unoptimized-fn-src)
(eval `(function ,unoptimized-fn-src)))))
(declare (type function optimized-compiled-fn unoptimized-compiled-fn))
(dolist (vals vals-list)
(setq *int-form-vals* vals)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment