Commit add8f3d6 authored by pfdietz's avatar pfdietz
Browse files

Make VALUES n-ary, and prevent abcl from generating macrolet forms (for now)

parent b5139fe4
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
(1 `(cl:handler-bind nil ,(make-random-integer-form (1- size)))) (1 `(cl:handler-bind nil ,(make-random-integer-form (1- size))))
(1 `(restart-bind nil ,(make-random-integer-form (1- size)))) (1 `(restart-bind nil ,(make-random-integer-form (1- size))))
(1 `(macrolet () ,(make-random-integer-form (1- size)))) #-armedbear (1 `(macrolet () ,(make-random-integer-form (1- size))))
;; dotimes ;; dotimes
#-allegro #-allegro
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
;; n-ary ops ;; n-ary ops
(30 (30
(let* ((op (random-from-seq #(+ - * logand min max logior (let* ((op (random-from-seq #(+ - * logand min max logior
lcm gcd logxor))) values lcm gcd logxor)))
(nargs (1+ (min (random 10) (random 10) (random 10)))) (nargs (1+ (min (random 10) (random 10) (random 10))))
(sizes (random-partition (1- size) nargs)) (sizes (random-partition (1- size) nargs))
(args (mapcar #'make-random-integer-form sizes))) (args (mapcar #'make-random-integer-form sizes)))
...@@ -1314,7 +1314,7 @@ ...@@ -1314,7 +1314,7 @@
(mapc try-fn args) (mapc try-fn args)
(prune-fn form try-fn)) (prune-fn form try-fn))
((identity values ignore-errors cl:handler-case restart-case locally) ((identity ignore-errors cl:handler-case restart-case locally)
(unless (and (consp args) (unless (and (consp args)
(consp (car args)) (consp (car args))
(eql (caar args) 'tagbody)) (eql (caar args) 'tagbody))
...@@ -1414,7 +1414,7 @@ ...@@ -1414,7 +1414,7 @@
(prune-nary-fn form try-fn) (prune-nary-fn form try-fn)
(prune-fn form try-fn)) (prune-fn form try-fn))
((- + * min max logand logior logxor logeqv gcd lcm) ((- + * min max logand logior logxor logeqv gcd lcm values)
(when (every #'constantp args) (when (every #'constantp args)
(try (eval form))) (try (eval form)))
(try 0) (try 0)
......
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