Skip to content
Snippets Groups Projects
Commit c5dfebd6 authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'master' into rtoy-unix-core

parents 16f35f1a ea775196
No related branches found
No related tags found
No related merge requests found
...@@ -126,11 +126,11 @@ do ...@@ -126,11 +126,11 @@ do
install ${GROUP} ${OWNER} -m 0644 $f $DESTDIR/lib/cmucl/lib/ext-formats/ install ${GROUP} ${OWNER} -m 0644 $f $DESTDIR/lib/cmucl/lib/ext-formats/
done done
# Create the directories and install the fasl files for asdf and defsystem # set -x
for f in asdf defsystem # Create the directories for asdf and defsystem
for f in asdf defsystem asdf/doc
do do
install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/contrib/$f install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/contrib/$f
install ${GROUP} ${OWNER} -m 0644 $TARGET/contrib/$f/$f.$FASL $DESTDIR/lib/cmucl/lib/contrib/$f
done done
set -x set -x
...@@ -148,6 +148,19 @@ do ...@@ -148,6 +148,19 @@ do
install ${GROUP} ${OWNER} -m 0644 src/$f $DESTDIR/lib/cmucl/lib/$f install ${GROUP} ${OWNER} -m 0644 src/$f $DESTDIR/lib/cmucl/lib/$f
done done
# Install the fasl files for asdf and defsystem
for f in asdf defsystem
do
install ${GROUP} ${OWNER} -m 0644 $TARGET/contrib/$f/$f.$FASL $DESTDIR/lib/cmucl/lib/contrib/$f
done
# Install the docs for asdf
for f in src/contrib/asdf/doc/*
do
base=`basename $f`
install ${GROUP} ${OWNER} -m 0644 $f $DESTDIR/lib/cmucl/lib/contrib/asdf/doc/$base
done
install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \ install ${GROUP} ${OWNER} -m 0644 src/general-info/cmucl.1 \
$DESTDIR/${MANDIR}/ $DESTDIR/${MANDIR}/
install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \ install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \
......
...@@ -151,7 +151,12 @@ ...@@ -151,7 +151,12 @@
(not (and (listp ,arg-list-name) (not (and (listp ,arg-list-name)
(eq 'funcall (car ,arg-list-name))))) (eq 'funcall (car ,arg-list-name)))))
`(progn `(progn
(setf ,arg-list-name (cdr ,arg-list-name))))) (setf ,arg-list-name
;; Handle the case (funcall #'foo args)
(if (consp (second ,arg-list-name))
(list* (second (second ,arg-list-name))
(cddr ,arg-list-name))
(cdr ,arg-list-name))))))
(push-let-binding (car rest-of-args) arg-list-name nil)) (push-let-binding (car rest-of-args) arg-list-name nil))
((and (cdr rest-of-args) (consp (cadr rest-of-args))) ((and (cdr rest-of-args) (consp (cadr rest-of-args)))
(pop rest-of-args) (pop rest-of-args)
......
Source diff could not be displayed: it is too large. Options to address this: view the blob.
This diff is collapsed.
File added
;;; Tests from gitlab issues
(defpackage :issues-tests
(:use :cl :lisp-unit))
(in-package "ISSUES-TESTS")
(defun square (x)
(expt x 2))
(define-compiler-macro square (&whole form arg)
(declare (ignore arg))
form)
(define-test issue.1.a
(:tag :issues)
(assert-equal
'(square x)
(funcall (compiler-macro-function 'square) '(square x) nil)))
(define-test issue.1.b
(:tag :issues)
(assert-equal
'(square x)
(funcall (compiler-macro-function 'square) '(funcall #'square x) nil)))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment