~ chicken-core (chicken-5) e1a5773f52691c48097ae4f698081fa50f9647f7
commit e1a5773f52691c48097ae4f698081fa50f9647f7
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Oct 4 23:12:48 2012 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Thu Oct 4 23:12:48 2012 +0200
Remove everything marked DEPRECATED and the tests that still used them.
Removed a few type annotations that were forgotten last time
Originally by Peter Bex, with some changes made by felix, to avoid
breaking too much existing code:
* lambdas as syntax-transformers are still available
* kept the 'script feature-identifier (for csi)
Signed-off-by: felix <felix@call-with-current-continuation.org>
diff --git a/batch-driver.scm b/batch-driver.scm
index bad5052f..062bb6b5 100644
--- a/batch-driver.scm
+++ b/batch-driver.scm
@@ -325,17 +325,12 @@
;; Insert postponed initforms:
(set! initforms (append initforms postponed-initforms))
- (let ((se (map string->symbol (collect-options 'static-extension)))) ; DEPRECATED
- ;; Append required extensions to initforms:
- (set! initforms
- (append
- initforms
- (map (lambda (r) `(##core#require-extension (,r) #t))
- (append se (map string->symbol (collect-options 'require-extension))))))
-
- ;; add static-extensions as used units:
- (set! ##sys#explicit-library-modules
- (append ##sys#explicit-library-modules se)))
+ ;; Append required extensions to initforms:
+ (set! initforms
+ (append
+ initforms
+ (map (lambda (r) `(##core#require-extension (,(string->symbol r)) #t))
+ (collect-options 'require-extension))))
(when (memq 'compile-syntax options)
(set! ##sys#enable-runtime-macros #t) )
diff --git a/c-platform.scm b/c-platform.scm
index 32f9b885..facdbe78 100644
--- a/c-platform.scm
+++ b/c-platform.scm
@@ -92,19 +92,16 @@
no-bound-checks no-procedure-checks-for-usual-bindings no-compiler-syntax
no-parentheses-synonyms no-symbol-escape r5rs-syntax emit-all-import-libraries
strict-types clustering
- lambda-lift unboxing ; OBSOLETE
setup-mode no-module-registration) )
(define valid-compiler-options-with-argument
'(debug
output-file include-path heap-size stack-size unit uses keyword-style require-extension
inline-limit profile-name
- disable-warning ; OBSOLETE
parenthesis-synonyms
prelude postlude prologue epilogue nursery extend feature no-feature types
emit-import-library emit-inline-file static-extension consult-inline-file
emit-type-file
- heap-growth heap-shrinkage heap-initial-size ; DEPRECATED
ffi-define ffi-include-path) )
diff --git a/chicken-install.scm b/chicken-install.scm
index b252e1db..32fae4d6 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -915,8 +915,7 @@ EOF
(set! *keep* #t)
(set! *no-install* #t)
(loop (cdr args) eggs))
- ((or (string=? arg "-v") ; DEPRECATED
- (string=? arg "-version"))
+ ((string=? arg "-version")
(print (chicken-version))
(exit 0))
((or (string=? arg "-u") (string=? arg "-update-db"))
diff --git a/chicken-profile.scm b/chicken-profile.scm
index 8785b7bc..6dbb6846 100644
--- a/chicken-profile.scm
+++ b/chicken-profile.scm
@@ -92,8 +92,7 @@ EOF
(if (and n (> n 0)) n (error "invalid argument to option" arg))))
(cond
[(member arg '("-h" "-help" "--help")) (print-usage)]
- [(member arg '("-v" ; DEPRECATED
- "-version"))
+ [(string=? arg "-version")
(print "chicken-profile - Version " (chicken-version))
(exit) ]
[(string=? arg "-release")
diff --git a/chicken-status.scm b/chicken-status.scm
index 72c1342c..8872c1cb 100644
--- a/chicken-status.scm
+++ b/chicken-status.scm
@@ -175,8 +175,7 @@ EOF
((or (string=? arg "-f") (string=? arg "-files"))
(set! files #t)
(loop (cdr args) pats))
- ((or (string=? arg "-v") ; DEPRECATED
- (string=? arg "-version"))
+ ((string=? arg "-version")
(print (chicken-version))
(exit 0))
((and (positive? (string-length arg))
diff --git a/chicken-syntax.scm b/chicken-syntax.scm
index c8f0f632..9b283cc0 100644
--- a/chicken-syntax.scm
+++ b/chicken-syntax.scm
@@ -1089,9 +1089,6 @@
(syntax-rules ()
((_ name)
(##core#define-compiler-syntax name #f))
- ((_ (name . llist) body ...) ; DEPRECATED
- (define-compiler-syntax name
- (##sys#er-transformer (lambda llist body ...) 'name)))
((_ name transformer)
(##core#define-compiler-syntax name transformer))))
diff --git a/chicken-uninstall.scm b/chicken-uninstall.scm
index 335dc566..bdcb55a3 100644
--- a/chicken-uninstall.scm
+++ b/chicken-uninstall.scm
@@ -129,8 +129,7 @@ EOF
(string=? arg "-h")
(string=? arg "--help"))
(usage 0))
- ((or (string=? arg "-v") ; DEPRECATED
- (string=? arg "-version"))
+ ((string=? arg "-version")
(print (chicken-version))
(exit 0))
((string=? arg "-target")
diff --git a/chicken.h b/chicken.h
index 8293f075..8a6fcba4 100644
--- a/chicken.h
+++ b/chicken.h
@@ -325,8 +325,6 @@ void *alloca ();
#define ___byte char
#define ___scheme_value C_word
#define ___scheme_pointer void *
-/* `___byte_vector' is DEPRECATED */
-#define ___byte_vector unsigned char *
#define ___blob void *
#define ___pointer_vector void **
#define ___symbol char *
@@ -1347,10 +1345,6 @@ extern double trunc(double);
#define C_u_i_u32vector_ref(x, i) C_fix(((C_u32 *)C_data_pointer(C_block_item((x), 1)))[ C_unfix(i) ])
#define C_u_i_s32vector_ref(x, i) C_fix(((C_u32 *)C_data_pointer(C_block_item((x), 1)))[ C_unfix(i) ])
-/* DEPRECATED */
-#define C_a_i_u32vector_ref C_a_u_i_u32vector_ref
-#define C_a_i_s32vector_ref C_a_u_i_s32vector_ref
-
#define C_a_u_i_u32vector_ref(ptr, c, x, i) C_unsigned_int_to_num(ptr, ((C_u32 *)C_data_pointer(C_block_item((x), 1)))[ C_unfix(i) ])
#define C_a_u_i_s32vector_ref(ptr, c, x, i) C_int_to_num(ptr, ((C_s32 *)C_data_pointer(C_block_item((x), 1)))[ C_unfix(i) ])
@@ -1485,10 +1479,6 @@ extern double trunc(double);
#define C_a_i_flonum_floor(ptr, n, x) C_flonum(ptr, C_floor(C_flonum_magnitude(x)))
#define C_a_i_flonum_round(ptr, n, x) C_flonum(ptr, C_round(C_flonum_magnitude(x)))
-/* DEPRECATED */
-#define C_a_i_f32vector_ref C_a_u_i_f32vector_ref
-#define C_a_i_f64vector_ref C_a_u_i_f64vector_ref
-
#define C_a_u_i_f32vector_ref(ptr, n, b, i) C_flonum(ptr, ((float *)C_data_pointer(C_block_item((b), 1)))[ C_unfix(i) ])
#define C_a_u_i_f64vector_ref(ptr, n, b, i) C_flonum(ptr, ((double *)C_data_pointer(C_block_item((b), 1)))[ C_unfix(i) ])
#define C_u_i_f32vector_set(v, i, x) ((((float *)C_data_pointer(C_block_item((v), 1)))[ C_unfix(i) ] = C_flonum_magnitude(x)), C_SCHEME_UNDEFINED)
@@ -1654,8 +1644,6 @@ C_fctexport void C_fcall C_trace(C_char *name) C_regparm;
C_fctexport C_word C_fcall C_emit_trace_info2(char *raw, C_word x, C_word y, C_word t) C_regparm;
C_fctexport C_word C_fcall C_u_i_string_hash(C_word str, C_word rnd) C_regparm;
C_fctexport C_word C_fcall C_u_i_string_ci_hash(C_word str, C_word rnd) C_regparm;
-C_fctexport C_word C_fcall C_hash_string(C_word str) C_regparm; /* DEPRECATED, INSECURE */
-C_fctexport C_word C_fcall C_hash_string_ci(C_word str) C_regparm; /* DEPRECATED, INSECURE */
C_fctexport C_word C_halt(C_word msg);
C_fctexport C_word C_message(C_word msg);
C_fctexport C_word C_fcall C_equalp(C_word x, C_word y) C_regparm;
diff --git a/compiler.scm b/compiler.scm
index f6467331..2927b1ff 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -1456,8 +1456,7 @@
(warning
"invalid argument to `inline-limit' declaration"
spec) ) ) )
- ((constant ; DEPRECATED
- pure)
+ ((pure)
(let ((syms (cdr spec)))
(if (every symbol? syms)
(for-each
diff --git a/csc.scm b/csc.scm
index 0ced1e4f..b0a94b42 100644
--- a/csc.scm
+++ b/csc.scm
@@ -145,7 +145,6 @@
-emit-all-import-libraries -setup-mode -no-elevation -no-module-registration
-no-procedure-checks-for-usual-bindings -module
-specialize -strict-types -clustering
- -lambda-lift -unboxing ; OBSOLETE
-no-procedure-checks-for-toplevel-bindings))
(define-constant complex-options
@@ -154,7 +153,6 @@
-inline-limit -profile-name
-emit-inline-file -types -emit-type-file
-feature -debug-level
- -heap-growth -heap-shrinkage -heap-initial-size ; DEPRECATED
-consult-inline-file
-emit-import-library
-no-feature))
@@ -165,7 +163,6 @@
(-S "-scrutinize")
(-M "-module")
(|-P| "-check-syntax")
- (|-V| "-version") ; DEPRECATED
(-f "-fixnum-arithmetic")
(|-D| "-feature")
(-i "-case-insensitive")
diff --git a/csi.scm b/csi.scm
index 8afcd79a..b7538e65 100644
--- a/csi.scm
+++ b/csi.scm
@@ -990,6 +990,7 @@ EOF
(##sys#error "missing or invalid script argument"))
(program-name (cadr script))
(command-line-arguments (cddr script))
+ ;; 2012-10-04 (felix) left 'script activated to avoid breaking too much code
(register-feature! 'script) ; DEPRECATED
(register-feature! 'chicken-script)
(set-cdr! (cdr script) '())
@@ -1032,9 +1033,7 @@ EOF
(when (member* '("-h" "-help" "--help") args)
(print-usage)
(exit 0) )
- (when (member* '("-v" ; DEPRECATED
- "-version")
- args)
+ (when (member "-version" args)
(print-banner)
(exit 0) )
(when (member "-setup-mode" args)
diff --git a/data-structures.import.scm b/data-structures.import.scm
index 7332141a..729c0f48 100644
--- a/data-structures.import.scm
+++ b/data-structures.import.scm
@@ -30,7 +30,6 @@
alist-ref
alist-update!
alist-update
- always? ; DEPRECATED
any?
atom?
binary-search
@@ -54,8 +53,6 @@
make-queue
merge
merge!
- never? ; DEPRECATED
- none? ; DEPRECATED
o
queue->list
queue-add!
@@ -69,7 +66,6 @@
queue?
rassoc
reverse-string-append
- shuffle ; DEPRECATED
sort
sort!
sorted?
diff --git a/data-structures.scm b/data-structures.scm
index 2ed9102a..0ef3c5f7 100644
--- a/data-structures.scm
+++ b/data-structures.scm
@@ -110,10 +110,6 @@
(define (any? x) #t)
-(define (none? x) #f) ; DEPRECATED
-(define (always? . _) #t) ; DEPRECATED
-(define (never? . _) #f) ; DEPRECATED
-
;;; List operators:
@@ -198,13 +194,6 @@
(cons (##sys#slot lst 0) (loop (##sys#slot blst 1) (##sys#slot lst 1)))]
[else (loop (##sys#slot blst 1) (##sys#slot lst 1))] ) ) ) ) )
-(define shuffle ; DEPRECATED
- (lambda (l random)
- (let ((len (length l)))
- (map cdr
- (sort! (map (lambda (x) (cons (random len) x)) l)
- (lambda (x y) (< (car x) (car y)))) ) ) ) )
-
;;; Alists:
diff --git a/library.scm b/library.scm
index b17041f9..0ee3378a 100644
--- a/library.scm
+++ b/library.scm
@@ -3616,8 +3616,6 @@ EOF
(let ([sym (string->symbol ((##core#primitive "C_build_platform")))])
(lambda () sym) ) )
-(define (c-runtime) 'unknown) ; DEPRECATED
-
(define ##sys#windows-platform
(and (eq? 'windows (software-type))
;; Still windows even if 'Linux-like'
diff --git a/lolevel.import.scm b/lolevel.import.scm
index bd0236ca..b6f5bf8a 100644
--- a/lolevel.import.scm
+++ b/lolevel.import.scm
@@ -43,10 +43,8 @@
make-pointer-vector
make-weak-locative
move-memory!
- mutate-procedure ; DEPRECATED
mutate-procedure!
null-pointer
- null-pointer? ; DEPRECATED
number-of-bytes
number-of-slots
object->pointer
@@ -60,7 +58,6 @@
object-unevict
pointer->address
pointer-like?
- pointer-offset ; DEPRECATED
pointer->object
pointer-f32-ref
pointer-f32-set!
diff --git a/lolevel.scm b/lolevel.scm
index b7e58fb5..52b4318e 100644
--- a/lolevel.scm
+++ b/lolevel.scm
@@ -222,12 +222,6 @@ EOF
(##sys#check-special ptr 'pointer->address)
(##sys#pointer->address ptr) )
-(define null-pointer ##sys#null-pointer) ; DEPRECATED
-
-(define (null-pointer? ptr) ; DEPRECATED
- (##sys#check-special ptr 'null-pointer?)
- (##core#inline "C_null_pointerp" ptr))
-
(define (object->pointer x)
(and (##core#inline "C_blockp" x)
((foreign-lambda* nonnull-c-pointer ((scheme-object x)) "C_return((void *)x);") x) ) )
@@ -623,8 +617,6 @@ EOF
(##sys#become! (list (cons old (proc new))))
new ) )
-(define mutate-procedure mutate-procedure!) ; DEPRECATED
-
;;; pointer vectors
diff --git a/runtime.c b/runtime.c
index 2673d815..c03294bd 100644
--- a/runtime.c
+++ b/runtime.c
@@ -3765,18 +3765,6 @@ C_regparm C_word C_fcall C_u_i_string_ci_hash(C_word str, C_word rnd)
return C_fix(hash_string(len, ptr, C_MOST_POSITIVE_FIXNUM, C_unfix(rnd), 1));
}
-/* DEPRECATED, INSECURE */
-C_regparm C_word C_fcall C_hash_string(C_word str)
-{
- return C_u_i_string_hash(str, C_fix(0));
-}
-
-/* DEPRECATED, INSECURE */
-C_regparm C_word C_fcall C_hash_string_ci(C_word str)
-{
- return C_u_i_string_ci_hash(str, C_fix(0));
-}
-
C_regparm void C_fcall C_toplevel_entry(C_char *name)
{
if(debug_mode)
@@ -7455,13 +7443,12 @@ C_regparm C_word C_fcall convert_string_to_number(C_char *str, int radix, C_word
int len = C_strlen(str);
if(radix == 10) {
- if (len >= 4 && len <= 6) { /* DEPRECATED, TODO: Change to (len == 4) */
+ if (len == 6) {
if((*str == '+' || *str == '-') &&
C_strchr("inIN", *(str+1)) != NULL &&
C_strchr("naNA", *(str+2)) != NULL &&
C_strchr("fnFN", *(str+3)) != NULL &&
- /* DEPRECATED, TODO: Rip out len checks */
- (len == 4 || *(str+4) == '.') && (len == 5 || (*(str+5) == '0'))) {
+ *(str+4) == '.' && *(str+5) == '0') {
if (*(str+1) == 'i' || *(str+1) == 'I') /* Inf */
*flo = 1.0/0.0;
else /* NaN */
@@ -7471,15 +7458,11 @@ C_regparm C_word C_fcall convert_string_to_number(C_char *str, int radix, C_word
return 2;
}
}
- /* DEPRECATED (enable in next release) */
-#if 0
- /* This is disabled during the deprecation period of "+nan" syntax */
/* Prevent C parser from accepting things like "-inf" on its own... */
for(n = 0; n < len; ++n) {
if (C_strchr("+-0123456789e.", *(str+n)) == NULL)
return 0;
}
-#endif
}
if(C_strpbrk(str, "xX\0") != NULL) return 0;
diff --git a/setup-api.scm b/setup-api.scm
index 50ab4842..956e7b28 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -39,7 +39,6 @@
((run execute)
compile
standard-extension
- make make/proc ; DEPRECATED
host-extension
install-extension install-program install-script
setup-verbose-mode setup-install-mode deployment-mode
@@ -54,7 +53,6 @@
test-compile try-compile run-verbose
extra-features extra-nonfeatures
copy-file move-file
- required-chicken-version required-extension-version ;DEPRECATED
sudo-install keep-intermediates
version>=?
extension-name-and-version
@@ -261,12 +259,6 @@
(shellpath (substring prg 2)))
(else (find-program prg))))
-(define (fixmaketarget file)
- (if (and (equal? "so" (pathname-extension file))
- (not (string=? "so" ##sys#load-dynamic-extension)) )
- (pathname-replace-extension file ##sys#load-dynamic-extension)
- file) )
-
(define (execute explist)
(define (smooth lst)
(let ((slst (map ->string lst)))
@@ -288,168 +280,6 @@
(run (csc exp ...)))))
-;;; "make" functionality
-
-;;; DEPRECATED
-;;; vvv
-
-(define (make:find-matching-line str spec)
- (let ((match? (lambda (s) (string=? s str))))
- (let loop ((lines spec))
- (cond
- ((null? lines) #f)
- (else (let* ((line (car lines))
- (names (if (string? (car line))
- (list (car line))
- (car line))))
- (if (any match? names)
- line
- (loop (cdr lines)))))))))
-
-(define (make:form-error s p) (error (sprintf "~a: ~s" s p)))
-(define (make:line-error s p n) (error (sprintf "~a: ~s for line: ~a" s p n)))
-
-(define (make:check-spec spec)
- (and (or (list? spec) (make:form-error "specification is not a list" spec))
- (or (pair? spec) (make:form-error "specification is an empty list" spec))
- (every
- (lambda (line)
- (and (or (and (list? line) (<= 2 (length line) 3))
- (make:form-error "list is not a list with 2 or 3 parts" line))
- (or (or (string? (car line))
- (and (list? (car line))
- (every string? (car line))))
- (make:form-error "line does not start with a string or list of strings" line))
- (let ((name (car line)))
- (or (list? (cadr line))
- (make:line-error "second part of line is not a list" (cadr line) name)
- (every (lambda (dep)
- (or (string? dep)
- (make:form-error "dependency item is not a string" dep)))
- (cadr line)))
- (or (null? (cddr line))
- (procedure? (caddr line))
- (make:line-error "command part of line is not a thunk" (caddr line) name)))))
- spec)))
-
-(define (make:check-argv argv)
- (or (string? argv)
- (every string? argv)
- (error "argument-list to `make' is not a string or string list" argv)))
-
-(define (make:make/proc/helper spec argv)
- (when (vector? argv) (set! argv (vector->list argv)))
- (make:check-spec spec)
- (make:check-argv argv)
- (letrec ((made '())
- (exn? (condition-predicate 'exn))
- (exn-message (condition-property-accessor 'exn 'message))
- (make-file
- (lambda (s indent)
- (let* ((line (make:find-matching-line s spec))
- (s2 (fixmaketarget s))
- (date (and (file-exists? s2)
- (file-modification-time s2))))
- (when (setup-verbose-mode)
- (printf "make: ~achecking ~a~%" indent s2))
- (if line
- (let ((deps (cadr line)))
- (for-each (let ((new-indent (string-append " " indent)))
- (lambda (d) (make-file d new-indent)))
- deps)
- (let ((reason
- (or (not date)
- (any (lambda (dep)
- (let ((dep2 (fixmaketarget dep)))
- (unless (file-exists? dep2)
- ;;XXX internal error?
- (error
- (sprintf
- "(make) dependency ~a was not made~%"
- dep2)))
- (and (> (file-modification-time dep2) date)
- dep2)) )
- deps))))
- (when reason
- (let ((l (cddr line)))
- (unless (null? l)
- (set! made (cons s made))
- (when (setup-verbose-mode)
- (printf "make: ~amaking ~a~a~%"
- indent
- s2
- (cond
- ((not date)
- (string-append " because " s2 " does not exist"))
- ((string? reason)
- (string-append " because " reason " changed"))
- (else
- (sprintf " just because (reason: ~a date: ~a)"
- reason date)))) )
- (handle-exceptions exn
- (begin
- (printf "make: Failed to make ~a: ~a~%"
- (car line)
- (if (exn? exn)
- (exn-message exn)
- exn))
- (signal exn) )
- ((car l))))))))
- (unless date
- (error (sprintf "(make) don't know how to make ~a" s2))))))))
- (cond
- ((string? argv) (make-file argv ""))
- ((null? argv) (make-file (caar spec) ""))
- (else (for-each (lambda (f) (make-file f "")) argv)))
- (when (setup-verbose-mode)
- (for-each (lambda (item)
- (printf "make: made ~a~%" item))
- (reverse made)))) )
-
-(define make/proc
- (case-lambda
- ((spec) (make:make/proc/helper spec '()))
- ((spec argv)
- (make:make/proc/helper
- spec
- (if (vector? argv)
- (vector->list argv)
- argv) ) ) ) )
-
-(define-syntax make
- (lambda (form r c)
- (##sys#check-syntax 'make form '(_ _ . #(_ 0 1)))
- (let ((spec (cadr form))
- (%list (r 'list))
- (%lambda (r 'lambda)))
- (let ((form-error (lambda (s . p) (apply error s spec p))))
- (and (or (list? spec) (form-error "illegal specification (not a sequence)"))
- (or (pair? spec) (form-error "empty specification"))
- (every
- (lambda (line)
- (and (or (and (list? line) (>= (length line) 2))
- (form-error "clause does not have at least 2 parts" line))
- (let ((name (car line)))
- (or (list? (cadr line))
- (make:line-error "second part of clause is not a sequence" (cadr line) name)))))
- spec))
- `(,(r 'make/proc)
- (list ,@(map (lambda (line)
- `(,%list ,(car line)
- (,%list ,@(cadr line))
- ,@(let ((l (cddr line)))
- (if (null? l)
- '()
- `((,%lambda () ,@l))))))
- spec))
- ,@(if (null? (cddr form))
- '('())
- (cddr form)))))))
-
-;;;^^^
-;;; DEPRECATED
-
-
;;; Processing setup scripts
(define (make-setup-info-pathname fn #!optional (rpath (repository-path)))
@@ -710,40 +540,6 @@
(ignore-errors ($system (sprintf "~A ~A" *remove-command* (shellpath fname))))
(zero? r) ) )
-(define (required-chicken-version v) ;DEPRECATED
- (when (version>=? v (chicken-version) )
- (error (sprintf "CHICKEN version ~a or higher is required" v)) ) )
-
-(define (upgrade-message ext msg #!optional version)
- (error
- (sprintf
- "the currently installed extension `~s' ~a - please run~%~% chicken-install ~a~a~%~%and repeat the current installation operation."
- ext msg ext (if version (conc ":" version) "")) ) )
-
-(define (required-extension-version . args) ;DEPRECATED
- (let loop ((args args))
- (cond ((null? args) #f)
- ((and (list? args) (>= (length args) 2))
- (let* ((ext (car args))
- (version (cadr args))
- (more (cddr args))
- (info (extension-information ext)))
- (if info
- (let ((ver (and (assq 'version info) (cadr (assq 'version info)))))
- (cond ((not ver) (upgrade-message ext "has no associated version information"))
- ((and (version>=? version ver)
- (not (string=? (->string version) (->string ver))))
- (upgrade-message
- ext
- (sprintf
- "is older than ~a, which is the minimum version that this extension requires"
- version)
- version) )
- (else (loop more)) ) )
- (upgrade-message ext "is not installed") ) ) )
- (else
- (error 'required-extension-information "bad argument format" args)) ) ) )
-
(define test-compile try-compile)
(define (find-library name proc)
diff --git a/tests/lolevel-tests.scm b/tests/lolevel-tests.scm
index 298f0a2f..3a1dc70e 100644
--- a/tests/lolevel-tests.scm
+++ b/tests/lolevel-tests.scm
@@ -40,13 +40,6 @@
; pointer->address
-; null-pointer
-
-; null-pointer?
-
-(assert (null-pointer? (null-pointer)))
-(assert (null-pointer? (address->pointer #x0)))
-
; object->pointer
; pointer->object
@@ -242,11 +235,12 @@
(assert (vector? some-bar))
-; mutate-procedure
+; mutate-procedure!
(assert (equal? '(1 2) (foo 1 2)))
-(define new-foo (mutate-procedure foo (lambda (new) (lambda args (cons 'hello (apply new args))))))
+(define new-foo
+ (mutate-procedure! foo (lambda (new) (lambda args (cons 'hello (apply new args))))))
(assert (not (eq? foo new-foo)))
diff --git a/tests/numbers-string-conversion-tests.scm b/tests/numbers-string-conversion-tests.scm
index e02341d9..33731172 100644
--- a/tests/numbers-string-conversion-tests.scm
+++ b/tests/numbers-string-conversion-tests.scm
@@ -193,14 +193,12 @@
("#i+nan.0" the-nan "+nan.0" "+NaN.0")
("#i+inf.0" pos-inf "+inf.0" "+Inf.0")
("#i-inf.0" neg-inf "-inf.0" "-Inf.0")
-#|
- ;; DEPRECATED (Disabled during deprecation period of "[+-]nan", "[+-]inf")
+ ;; These used to be accepted but are invalid
("+nan" #f)
("+inf" #f)
("-inf" #f)
("nan.0" #f)
("inf.0" #f)
-|#
"Fractions"
("1/2" (/ 1 2) "0.5" ".5" "500.0e-3")
diff --git a/types.db b/types.db
index cda90f82..9ee8ef8f 100644
--- a/types.db
+++ b/types.db
@@ -1169,8 +1169,6 @@
(alist-update! (#(procedure #:enforce) alist-update! (* * (list-of pair) #!optional (procedure (* *) *)) *))
(alist-update (#(procedure #:clean #:enforce) alist-update (* * (list-of pair) #!optional (procedure (* *) *) *) *))
-(always? deprecated)
-
(any? (#(procedure #:pure) any? (*) boolean)
((*) (let ((#(tmp) #(1))) '#t)))
@@ -1206,8 +1204,6 @@
(forall (e)
(#(procedure #:enforce) merge! ((list-of e) (list-of e) (procedure (e e) *)) (list-of e))))
-(never? deprecated)
-(none? deprecated)
(o (#(procedure #:clean #:enforce) o (#!rest (procedure (*) *)) (procedure (*) *)))
(queue->list (#(procedure #:clean #:enforce) queue->list ((struct queue)) list))
(queue-add! (#(procedure #:clean #:enforce) queue-add! ((struct queue) *) undefined))
@@ -1228,7 +1224,6 @@
(rassoc (#(procedure #:clean #:enforce) rassoc (* (list-of pair) #!optional (procedure (* *) *)) *))
(reverse-string-append (#(procedure #:clean #:enforce) reverse-string-append ((list-of string)) string))
-(shuffle deprecated)
(sort
(forall (e (s (or (vector-of e) (list-of e))))
@@ -1449,10 +1444,6 @@
(mutate-procedure!
(#(procedure #:enforce) mutate-procedure! (procedure (procedure (procedure) . *)) procedure))
-(mutate-procedure (deprecated mutate-procedure!))
-(null-pointer deprecated)
-(null-pointer? deprecated)
-
(number-of-bytes (#(procedure #:clean) number-of-bytes (*) fixnum)
(((or blob string)) (##sys#size #(1)))
(((or port procedure symbol pair vector locative float pointer-vector))
Trap