Commit d22817cb authored by Raymond Toy's avatar Raymond Toy
Browse files

Merge branch 'master' into issue-240-subsetp-with-hash-table

parents 27f80806 9d593e3a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
;;; math.lisp -- various numerical operations
;;
;; Time-stamp: <2004-01-05 emarsden>
;; Time-stamp: <2023-08-12 07:34:28 toy>
;;
;; some basic mathematical benchmarks

@@ -56,7 +56,7 @@
;; calculate the "level" of a point in the Mandebrot Set, which is the
;; number of iterations taken to escape to "infinity" (points that
;; don't escape are included in the Mandelbrot Set). This version is
;; intended to test performance when programming in nave math-style. 
;; intended to test performance when programming in naive math-style. 
(defun mset-level/complex (c)
  (declare (type complex c))
  (loop :for z = #c(0 0) :then (+ (* z z) c)
+2 −2
Original line number Diff line number Diff line
@@ -48,10 +48,10 @@ CORE='-o -name "*.core"'

if [ -n "$KEEP" ]; then
    case $KEEP in
      lib) GREP='egrep -v'
      lib) GREP='grep -Ev'
	   PATTERN='(gray-streams|gray-compat|simple-streams|iodefs|external-formats|clx|hemlock|clm)-library' ;;
      core) CORE='' ;;
      all) GREP='egrep -v'
      all) GREP='grep -Ev'
	   PATTERN='(gray-streams|gray-compat|simple-streams|iodefs|external-formats|clx|hemlock|clm)-library|(asdf|defsystem)'
	   CORE='' ;;
    esac
+5 −5
Original line number Diff line number Diff line
@@ -94,12 +94,12 @@ install ${GROUP} ${OWNER} -m 0755 $TARGET/motif/server/motifd \

# Install the contrib stuff.  Create the directories and then copy the files.

for d in `(cd src; find contrib -type d -print | egrep -v "CVS|asdf|defsystem")`
for d in `(cd src; find contrib -type d -print | grep -E -v "CVS|asdf|defsystem")`
do
    install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d
done

for f in `(cd src/contrib; find . -type f -print | egrep -v "CVS|asdf|defsystem|unix")`
for f in `(cd src/contrib; find . -type f -print | grep -E -v "CVS|asdf|defsystem|unix")`
do
    FILE=`basename $f`
    DIR=`dirname $f`
@@ -108,13 +108,13 @@ done

# Install all the locale data.

for d in `(cd src/i18n/; find locale -type d -print | egrep -v CVS)`
for d in `(cd src/i18n/; find locale -type d -print | grep -E -v CVS)`
do
    install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/$d
done

# Install mo files.
for f in `(cd $TARGET/i18n; find locale -type f -print | egrep -v 'CVS|~.*~|.*~')`
for f in `(cd $TARGET/i18n; find locale -type f -print | grep -E -v 'CVS|~.*~|.*~')`
do
    FILE=`basename $f`
    DIR=`dirname $f`
@@ -122,7 +122,7 @@ do
done

# Install po files.  (Do we really need to distribute the po files?)
#for f in `(cd $TARGET/i18n; find locale -type f -print | egrep -v 'CVS|~.*~|.*~')`
#for f in `(cd $TARGET/i18n; find locale -type f -print | grep -E -v 'CVS|~.*~|.*~')`
#do
#    FILE=`basename $f`
#    DIR=`dirname $f`
+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@

(intl:textdomain "cmucl")

(export '(char short int long long-long unsigned-char unsigned-short unsigned-int
(export '(char short int long long-long signed-char unsigned-char unsigned-short unsigned-int
	  unsigned-long unsigned-long-long float double c-string void))
	       

@@ -30,6 +30,8 @@
(def-alien-type int (integer 32))
(def-alien-type long (integer #-alpha 32 #+alpha 64))
(def-alien-type long-long (integer 64))
;; The same as c-call:char, for convenience with C signed-char.
(def-alien-type signed-char (integer 8))

(def-alien-type unsigned-char (unsigned 8))
(def-alien-type unsigned-short (unsigned 16))
+4 −7
Original line number Diff line number Diff line
@@ -749,15 +749,9 @@
(defparameter *min-list-length-for-hashtable*
  15)

(defparameter *allow-hashtable-for-set-functions*
  nil)

;; Convert a list to a hashtable.  The hashtable does not handle
;; duplicated values in the list.  Returns the hashtable.
(defun list-to-hashtable (list key test test-not)
  (unless *allow-hashtable-for-set-functions*
    (return-from list-to-hashtable nil))

  ;; Don't currently support test-not when converting a list to a hashtable
  (unless test-not
    (let ((hash-test (let ((test-fn (if (and (symbolp test)
@@ -1110,7 +1104,10 @@
	(setf (car l) (cdar l)))
      (setq res (apply function (nreverse args)))
      (case accumulate
	(:nconc (setq temp (last (nconc temp res))))
	(:nconc (when res
		  (let ((next-temp (last res)))
		    (rplacd temp res)
		    (setq temp next-temp))))
	(:list (rplacd temp (list res))
	       (setq temp (cdr temp)))))))

Loading