From 8209fc021e0feb974f0d3419953156933d8bc929 Mon Sep 17 00:00:00 2001 From: jjgarcia Date: Tue, 17 Dec 2002 09:53:52 +0000 Subject: [PATCH] Write FTYPE declarations correctly. --- src/clos/macros.lsp | 4 +- src/lsp/proclaim.lsp | 288 +++++++++++++++++++++---------------------- src/lsp/seqlib.lsp | 8 +- 3 files changed, 150 insertions(+), 150 deletions(-) diff --git a/src/clos/macros.lsp b/src/clos/macros.lsp index 4b75994b0..0e781ba9b 100644 --- a/src/clos/macros.lsp +++ b/src/clos/macros.lsp @@ -68,8 +68,8 @@ ;;; ECL implementation: -(declaim (ftype si:instance-ref (t fixnum) t)) -(declaim (ftype si:instance-set (t fixnum t) t)) +(declaim (ftype (function (t fixnum) t) si:instance-ref)) +(declaim (ftype (function (t fixnum t) t) si:instance-set)) ;;; ---------------------------------------------------------------------- ;;; Class CLASS diff --git a/src/lsp/proclaim.lsp b/src/lsp/proclaim.lsp index b550f9382..ec760ec1e 100644 --- a/src/lsp/proclaim.lsp +++ b/src/lsp/proclaim.lsp @@ -1,145 +1,145 @@ (in-package "SYSTEM") -(proclaim '(FTYPE DEFMACRO* (T T T) T)) -(proclaim '(FTYPE DM-VL (T T T) T)) -(proclaim '(FTYPE DM-V (T T) T)) -(proclaim '(FTYPE DM-NTH (T T) T)) -(proclaim '(FTYPE DM-NTH-CDR (T T) T)) -(proclaim '(FTYPE DM-BAD-KEY (T) T)) -(proclaim '(FTYPE DM-KEY-NOT-ALLOWED (T) T)) -;(proclaim '(FTYPE FIND-DOC (T T) T)) -;(proclaim '(FTYPE FIND-DECLARATIONS (T) T)) -(proclaim '(FTYPE CLEAR-COMPILER-PROPERTIES (T) T)) -(proclaim '(FTYPE TERMINAL-INTERRUPT (T) T)) -(proclaim '(FTYPE BREAK-LEVEL (T T) T)) -(proclaim '(FTYPE TPL-MAKE-COMMAND (T T) T)) -(proclaim '(FTYPE TPL-PARSE-STRINGS (T) T)) -(proclaim '(FTYPE TPL-PRINT (T) T)) -(proclaim '(FTYPE TPL-UNKNOWN-COMMAND (T) T)) -(proclaim '(FTYPE TPL-GO (T) T)) -(proclaim '(FTYPE PRINT-IHS (T) T)) -(proclaim '(FTYPE PRINT-FRS (T) T)) -(proclaim '(FTYPE FRS-KIND (T) T)) -(proclaim '(FTYPE TPL-HIDE (T) T)) -(proclaim '(FTYPE TPL-UNHIDE (T) T)) -(proclaim '(FTYPE TPL-UNHIDE-PACKAGE (T) T)) -(proclaim '(FTYPE TPL-HIDE-PACKAGE (T) T)) -(proclaim '(FTYPE IHS-VISIBLE (T) T)) -(proclaim '(FTYPE IHS-FNAME (T) T)) -(proclaim '(FTYPE IHS-COMPILED-P (T) T)) -(proclaim '(FTYPE SUPER-GO (T T) T)) -(proclaim '(FTYPE TPL-BACKWARD-SEARCH (T) T)) -(proclaim '(FTYPE TPL-FORWARD-SEARCH (T) T)) -(proclaim '(FTYPE PROVIDE (T) T)) -(proclaim '(FTYPE DOCUMENTATION (T T) T)) -(proclaim '(FTYPE FIND-DOCUMENTATION (T) T)) -(proclaim '(FTYPE SIMPLE-ARRAY-P (T) T)) -(proclaim '(FTYPE TYPEP (T T) T)) -(proclaim '(FTYPE SUBCLASSP (T T) T)) -(proclaim '(FTYPE NORMALIZE-TYPE (T) T)) -(proclaim '(FTYPE KNOWN-TYPE-P (T) T)) -(proclaim '(FTYPE SUBTYPEP (T T) T)) -(proclaim '(FTYPE SUB-INTERVAL-P (T T) T)) -(proclaim '(FTYPE IN-INTERVAL-P (T T) T)) -(proclaim '(FTYPE MATCH-DIMENSIONS (T T) T)) -(proclaim '(FTYPE COERCE (T T) T)) -(proclaim '(FTYPE CLEAR-COMPILER-PROPERTIES (T) T)) -(proclaim '(FTYPE GET-SETF-METHOD (T) T)) -(proclaim '(FTYPE GET-SETF-METHOD-MULTIPLE-VALUE (T) T)) -(proclaim '(FTYPE SETF-EXPAND-1 (T T T) T)) -(proclaim '(FTYPE SETF-EXPAND (T T) T)) -(proclaim '(FTYPE INCREMENT-CURSOR (T T) T)) -(proclaim '(FTYPE SEQUENCE-CURSOR (T T) T)) -(proclaim '(FTYPE ARRAY-DIMENSIONS (T) T)) -(proclaim '(FTYPE VECTOR-PUSH (T T) T)) -(proclaim '(FTYPE VECTOR-POP (T) T)) -(proclaim '(FTYPE ASK-FOR-FORM (T) T)) -(proclaim '(FTYPE TYPECASE-ERROR-STRING (T T T) T)) -(proclaim '(FTYPE TYPECASE-ERROR-STRINGS (T) T)) -(proclaim '(FTYPE BOIN-P (T) T)) -(proclaim '(FTYPE MAKE-ACCESS-FUNCTION (T T T T T T T T T) T)) -(proclaim '(FTYPE MAKE-CONSTRUCTOR (T T T T T) T)) -(proclaim '(FTYPE MAKE-COPIER (T T T T) T)) -(proclaim '(FTYPE MAKE-PREDICATE (T T T T T) T)) -(proclaim '(FTYPE PARSE-SLOT-DESCRIPTION (T T) T)) -(proclaim '(FTYPE OVERWRITE-SLOT-DESCRIPTIONS (T T) T)) -(proclaim '(FTYPE SHARP-S-READER (T T T) T)) -(proclaim '(FTYPE READ-INSPECT-COMMAND (T T T) T)) -(proclaim '(FTYPE INSPECT-SYMBOL (T) T)) -(proclaim '(FTYPE INSPECT-PACKAGE (T) T)) -(proclaim '(FTYPE INSPECT-CHARACTER (T) T)) -(proclaim '(FTYPE INSPECT-NUMBER (T) T)) -(proclaim '(FTYPE INSPECT-CONS (T) T)) -(proclaim '(FTYPE INSPECT-STRING (T) T)) -(proclaim '(FTYPE INSPECT-VECTOR (T) T)) -(proclaim '(FTYPE INSPECT-ARRAY (T) T)) -(proclaim '(FTYPE INSPECT-OBJECT (T) T)) -(proclaim '(FTYPE DESCRIBE (T) T)) -(proclaim '(FTYPE INSPECT (T) T)) -(proclaim '(FTYPE ARG-LIST (T) T)) -(proclaim '(FTYPE PRIN1-TO-STRING (T) T)) -(proclaim '(FTYPE PRINC-TO-STRING (T) T)) -(proclaim '(FTYPE SHARP-A-READER (T T T) T)) -(proclaim '(FTYPE SHARP-S-READER-SI (T T T) T)) -(proclaim '(FTYPE LEAP-YEAR-P (T) T)) -(proclaim '(FTYPE NUMBER-OF-DAYS-FROM-1900 (T) T)) -(proclaim '(FTYPE ISQRT (T) T)) -(proclaim '(FTYPE ABS (T) T)) -(proclaim '(FTYPE PHASE (T) T)) -(proclaim '(FTYPE SIGNUM (T) T)) -(proclaim '(FTYPE CIS (T) T)) -(proclaim '(FTYPE ASIN (T) T)) -(proclaim '(FTYPE ACOS (T) T)) -(proclaim '(FTYPE SINH (T) T)) -(proclaim '(FTYPE COSH (T) T)) -(proclaim '(FTYPE TANH (T) T)) -(proclaim '(FTYPE ASINH (T) T)) -(proclaim '(FTYPE ACOSH (T) T)) -(proclaim '(FTYPE ATANH (T) T)) -(proclaim '(FTYPE RATIONAL (T) T)) -(proclaim '(FTYPE RATIONALIZE (T) T)) -(proclaim '(FTYPE RATIONALIZE-FLOAT (T T) T)) -(proclaim '(FTYPE LOGNAND (T T) T)) -(proclaim '(FTYPE LOGNOR (T T) T)) -(proclaim '(FTYPE LOGANDC1 (T T) T)) -(proclaim '(FTYPE LOGANDC2 (T T) T)) -(proclaim '(FTYPE LOGORC1 (T T) T)) -(proclaim '(FTYPE LOGORC2 (T T) T)) -(proclaim '(FTYPE LOGNOT (T) T)) -(proclaim '(FTYPE LOGTEST (T T) T)) -(proclaim '(FTYPE BYTE (T T) T)) -(proclaim '(FTYPE BYTE-SIZE (T) T)) -(proclaim '(FTYPE BYTE-POSITION (T) T)) -(proclaim '(FTYPE LDB (T T) T)) -(proclaim '(FTYPE LDB-TEST (T T) T)) -(proclaim '(FTYPE MASK-FIELD (T T) T)) -(proclaim '(FTYPE DPB (T T T) T)) -(proclaim '(FTYPE DEPOSIT-FIELD (T T T) T)) -(proclaim '(FTYPE FIND-ALL-SYMBOLS (T) T)) -(proclaim '(FTYPE SUBSTRINGP (T T) T)) -(proclaim '(FTYPE PRINT-SYMBOL-APROPOS (T) T)) -(proclaim '(FTYPE SEQTYPE (T) T)) -(proclaim '(FTYPE CALL-TEST (T T T T) T)) -(proclaim '(FTYPE CHECK-SEQ-TEST (T T) T)) -(proclaim '(FTYPE CHECK-SEQ-START-END (T T) T)) -(proclaim '(FTYPE CHECK-SEQ-ARGS (T T T T) T)) -(proclaim '(FTYPE LIST-MERGE-SORT (T T T) T)) -(proclaim '(FTYPE QUICK-SORT (T FIXNUM FIXNUM T T) T)) -(proclaim '(FTYPE TRACE* (T) T)) -(proclaim '(FTYPE UNTRACE* (T) T)) -(proclaim '(FTYPE TRACE-ONE (T) T)) -(proclaim '(FTYPE UNTRACE-ONE (T) T)) -(proclaim '(FTYPE TRACING-BODY (T) T)) -(proclaim '(FTYPE STEP* (T) T)) -(proclaim '(FTYPE LOOP-TEQUAL (T T) T)) -(proclaim '(FTYPE LOOP-TMEMBER (T T) T)) -(proclaim '(FTYPE LOOP-TASSOC (T T) T)) -(proclaim '(FTYPE LOOP-NAMED-VARIABLE (T) T)) -(proclaim '(FTYPE PARSE-TYPE (T) T)) -(proclaim '(FTYPE LV-BIND (T T T) T)) -(proclaim '(FTYPE LV-SET (T) T)) -(proclaim '(FTYPE MERGE-INF (T T) T)) -(proclaim '(FTYPE SET-ITERATION (T) T)) -(proclaim '(FTYPE PARSE-FOR1 (T T T T T T) T)) -(proclaim '(FTYPE PARSE-LOOP-PATH (T) T)) -(proclaim '(FTYPE GET-ACC (T) T)) -(proclaim '(FTYPE PARSE-WHEN (T) T)) +(proclaim '(FTYPE (FUNCTION (T T T) T) DEFMACRO*)) +(proclaim '(FTYPE (FUNCTION (T T T) T) DM-VL)) +(proclaim '(FTYPE (FUNCTION (T T) T) DM-V)) +(proclaim '(FTYPE (FUNCTION (T T) T) DM-NTH)) +(proclaim '(FTYPE (FUNCTION (T T) T) DM-NTH-CDR)) +(proclaim '(FTYPE (FUNCTION (T) T) DM-BAD-KEY)) +(proclaim '(FTYPE (FUNCTION (T) T) DM-KEY-NOT-ALLOWED)) +;(proclaim '(FTYPE (FUNCTION (T T) T) FIND-DOC)) +;(proclaim '(FTYPE (FUNCTION (T) T) FIND-DECLARATIONS)) +(proclaim '(FTYPE (FUNCTION (T) T) CLEAR-COMPILER-PROPERTIES)) +(proclaim '(FTYPE (FUNCTION (T) T) TERMINAL-INTERRUPT)) +(proclaim '(FTYPE (FUNCTION (T T) T) BREAK-LEVEL)) +(proclaim '(FTYPE (FUNCTION (T T) T) TPL-MAKE-COMMAND)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-PARSE-STRINGS)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-PRINT)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-UNKNOWN-COMMAND)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-GO)) +(proclaim '(FTYPE (FUNCTION (T) T) PRINT-IHS)) +(proclaim '(FTYPE (FUNCTION (T) T) PRINT-FRS)) +(proclaim '(FTYPE (FUNCTION (T) T) FRS-KIND)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-HIDE)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-UNHIDE)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-UNHIDE-PACKAGE)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-HIDE-PACKAGE)) +(proclaim '(FTYPE (FUNCTION (T) T) IHS-VISIBLE)) +(proclaim '(FTYPE (FUNCTION (T) T) IHS-FNAME)) +(proclaim '(FTYPE (FUNCTION (T) T) IHS-COMPILED-P)) +(proclaim '(FTYPE (FUNCTION (T T) T) SUPER-GO)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-BACKWARD-SEARCH)) +(proclaim '(FTYPE (FUNCTION (T) T) TPL-FORWARD-SEARCH)) +(proclaim '(FTYPE (FUNCTION (T) T) PROVIDE)) +(proclaim '(FTYPE (FUNCTION (T T) T) DOCUMENTATION)) +(proclaim '(FTYPE (FUNCTION (T) T) FIND-DOCUMENTATION)) +(proclaim '(FTYPE (FUNCTION (T) T) SIMPLE-ARRAY-P)) +(proclaim '(FTYPE (FUNCTION (T T) T) TYPEP)) +(proclaim '(FTYPE (FUNCTION (T T) T) SUBCLASSP)) +(proclaim '(FTYPE (FUNCTION (T) T) NORMALIZE-TYPE)) +(proclaim '(FTYPE (FUNCTION (T) T) KNOWN-TYPE-P)) +(proclaim '(FTYPE (FUNCTION (T T) T) SUBTYPEP)) +(proclaim '(FTYPE (FUNCTION (T T) T) SUB-INTERVAL-P)) +(proclaim '(FTYPE (FUNCTION (T T) T) IN-INTERVAL-P)) +(proclaim '(FTYPE (FUNCTION (T T) T) MATCH-DIMENSIONS)) +(proclaim '(FTYPE (FUNCTION (T T) T) COERCE)) +(proclaim '(FTYPE (FUNCTION (T) T) CLEAR-COMPILER-PROPERTIES)) +(proclaim '(FTYPE (FUNCTION (T) T) GET-SETF-METHOD)) +(proclaim '(FTYPE (FUNCTION (T) T) GET-SETF-METHOD-MULTIPLE-VALUE)) +(proclaim '(FTYPE (FUNCTION (T T T) T) SETF-EXPAND-1)) +(proclaim '(FTYPE (FUNCTION (T T) T) SETF-EXPAND)) +(proclaim '(FTYPE (FUNCTION (T T) T) INCREMENT-CURSOR)) +(proclaim '(FTYPE (FUNCTION (T T) T) SEQUENCE-CURSOR)) +(proclaim '(FTYPE (FUNCTION (T) T) ARRAY-DIMENSIONS)) +(proclaim '(FTYPE (FUNCTION (T T) T) VECTOR-PUSH)) +(proclaim '(FTYPE (FUNCTION (T) T) VECTOR-POP)) +(proclaim '(FTYPE (FUNCTION (T) T) ASK-FOR-FORM)) +(proclaim '(FTYPE (FUNCTION (T T T) T) TYPECASE-ERROR-STRING)) +(proclaim '(FTYPE (FUNCTION (T) T) TYPECASE-ERROR-STRINGS)) +(proclaim '(FTYPE (FUNCTION (T) T) BOIN-P)) +(proclaim '(FTYPE (FUNCTION (T T T T T T T T T) T) MAKE-ACCESS-FUNCTION)) +(proclaim '(FTYPE (FUNCTION (T T T T T) T) MAKE-CONSTRUCTOR)) +(proclaim '(FTYPE (FUNCTION (T T T T) T) MAKE-COPIER)) +(proclaim '(FTYPE (FUNCTION (T T T T T) T) MAKE-PREDICATE)) +(proclaim '(FTYPE (FUNCTION (T T) T) PARSE-SLOT-DESCRIPTION)) +(proclaim '(FTYPE (FUNCTION (T T) T) OVERWRITE-SLOT-DESCRIPTIONS)) +(proclaim '(FTYPE (FUNCTION (T T T) T) SHARP-S-READER)) +(proclaim '(FTYPE (FUNCTION (T T T) T) READ-INSPECT-COMMAND)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-SYMBOL)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-PACKAGE)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-CHARACTER)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-NUMBER)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-CONS)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-STRING)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-VECTOR)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-ARRAY)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT-OBJECT)) +(proclaim '(FTYPE (FUNCTION (T) T) DESCRIBE)) +(proclaim '(FTYPE (FUNCTION (T) T) INSPECT)) +(proclaim '(FTYPE (FUNCTION (T) T) ARG-LIST)) +(proclaim '(FTYPE (FUNCTION (T) T) PRIN1-TO-STRING)) +(proclaim '(FTYPE (FUNCTION (T) T) PRINC-TO-STRING)) +(proclaim '(FTYPE (FUNCTION (T T T) T) SHARP-A-READER)) +(proclaim '(FTYPE (FUNCTION (T T T) T) SHARP-S-READER-SI)) +(proclaim '(FTYPE (FUNCTION (T) T) LEAP-YEAR-P)) +(proclaim '(FTYPE (FUNCTION (T) T) NUMBER-OF-DAYS-FROM-1900)) +(proclaim '(FTYPE (FUNCTION (T) T) ISQRT)) +(proclaim '(FTYPE (FUNCTION (T) T) ABS)) +(proclaim '(FTYPE (FUNCTION (T) T) PHASE)) +(proclaim '(FTYPE (FUNCTION (T) T) SIGNUM)) +(proclaim '(FTYPE (FUNCTION (T) T) CIS)) +(proclaim '(FTYPE (FUNCTION (T) T) ASIN)) +(proclaim '(FTYPE (FUNCTION (T) T) ACOS)) +(proclaim '(FTYPE (FUNCTION (T) T) SINH)) +(proclaim '(FTYPE (FUNCTION (T) T) COSH)) +(proclaim '(FTYPE (FUNCTION (T) T) TANH)) +(proclaim '(FTYPE (FUNCTION (T) T) ASINH)) +(proclaim '(FTYPE (FUNCTION (T) T) ACOSH)) +(proclaim '(FTYPE (FUNCTION (T) T) ATANH)) +(proclaim '(FTYPE (FUNCTION (T) T) RATIONAL)) +(proclaim '(FTYPE (FUNCTION (T) T) RATIONALIZE)) +(proclaim '(FTYPE (FUNCTION (T T) T) RATIONALIZE-FLOAT)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGNAND)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGNOR)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGANDC1)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGANDC2)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGORC1)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGORC2)) +(proclaim '(FTYPE (FUNCTION (T) T) LOGNOT)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOGTEST)) +(proclaim '(FTYPE (FUNCTION (T T) T) BYTE)) +(proclaim '(FTYPE (FUNCTION (T) T) BYTE-SIZE)) +(proclaim '(FTYPE (FUNCTION (T) T) BYTE-POSITION)) +(proclaim '(FTYPE (FUNCTION (T T) T) LDB)) +(proclaim '(FTYPE (FUNCTION (T T) T) LDB-TEST)) +(proclaim '(FTYPE (FUNCTION (T T) T) MASK-FIELD)) +(proclaim '(FTYPE (FUNCTION (T T T) T) DPB)) +(proclaim '(FTYPE (FUNCTION (T T T) T) DEPOSIT-FIELD)) +(proclaim '(FTYPE (FUNCTION (T) T) FIND-ALL-SYMBOLS)) +(proclaim '(FTYPE (FUNCTION (T T) T) SUBSTRINGP)) +(proclaim '(FTYPE (FUNCTION (T) T) PRINT-SYMBOL-APROPOS)) +(proclaim '(FTYPE (FUNCTION (T) T) SEQTYPE)) +(proclaim '(FTYPE (FUNCTION (T T T T) T) CALL-TEST)) +(proclaim '(FTYPE (FUNCTION (T T) T) CHECK-SEQ-TEST)) +(proclaim '(FTYPE (FUNCTION (T T) T) CHECK-SEQ-START-END)) +(proclaim '(FTYPE (FUNCTION (T T T T) T) CHECK-SEQ-ARGS)) +(proclaim '(FTYPE (FUNCTION (T T T) T) LIST-MERGE-SORT)) +(proclaim '(FTYPE (FUNCTION (T FIXNUM FIXNUM T T) T) QUICK-SORT)) +(proclaim '(FTYPE (FUNCTION (T) T) TRACE*)) +(proclaim '(FTYPE (FUNCTION (T) T) UNTRACE*)) +(proclaim '(FTYPE (FUNCTION (T) T) TRACE-ONE)) +(proclaim '(FTYPE (FUNCTION (T) T) UNTRACE-ONE)) +(proclaim '(FTYPE (FUNCTION (T) T) TRACING-BODY)) +(proclaim '(FTYPE (FUNCTION (T) T) STEP*)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOOP-TEQUAL)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOOP-TMEMBER)) +(proclaim '(FTYPE (FUNCTION (T T) T) LOOP-TASSOC)) +(proclaim '(FTYPE (FUNCTION (T) T) LOOP-NAMED-VARIABLE)) +(proclaim '(FTYPE (FUNCTION (T) T) PARSE-TYPE)) +(proclaim '(FTYPE (FUNCTION (T T T) T) LV-BIND)) +(proclaim '(FTYPE (FUNCTION (T) T) LV-SET)) +(proclaim '(FTYPE (FUNCTION (T T) T) MERGE-INF)) +(proclaim '(FTYPE (FUNCTION (T) T) SET-ITERATION)) +(proclaim '(FTYPE (FUNCTION (T T T T T T) T) PARSE-FOR1)) +(proclaim '(FTYPE (FUNCTION (T) T) PARSE-LOOP-PATH)) +(proclaim '(FTYPE (FUNCTION (T) T) GET-ACC)) +(proclaim '(FTYPE (FUNCTION (T) T) PARSE-WHEN)) diff --git a/src/lsp/seqlib.lsp b/src/lsp/seqlib.lsp index 81b969b17..70d542f73 100644 --- a/src/lsp/seqlib.lsp +++ b/src/lsp/seqlib.lsp @@ -13,7 +13,7 @@ (in-package "SYSTEM") -(declaim (ftype seqtype (t) t)) +(declaim (ftype (function (t) t) seqtype)) (defun seqtype (sequence) (declare (si::c-local)) (cond ((listp sequence) 'list) @@ -22,14 +22,14 @@ ((vectorp sequence) (list 'array (array-element-type sequence))) (t (error "~S is not a sequence." sequence)))) -(declaim (ftype call-test (t t t t) t)) +(declaim (ftype (function (t t t t) t) call-test)) (defun call-test (test test-not item keyx) (declare (si::c-local)) (cond (test (funcall test item keyx)) (test-not (not (funcall test-not item keyx))) (t (eql item keyx)))) -(declaim (ftype test-error() t)) +(declaim (ftype (function () t) test-error)) (defun test-error() (declare (si::c-local)) (error "both test and test are supplied")) @@ -618,7 +618,7 @@ evaluates to NIL. See STABLE-SORT." (sort l))) -(declaim (ftype quick-sort (t fixnum fixnum t t) t)) +(declaim (ftype (function (t fixnum fixnum t t) t) quick-sort)) (defun quick-sort (seq start end pred key) (declare (fixnum start end))