~ chicken-core (chicken-5) e02aae34c13f67184dcdae2121573eaeb3b3cc0e
commit e02aae34c13f67184dcdae2121573eaeb3b3cc0e
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Dec 29 00:04:44 2009 +0100
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Tue Dec 29 00:04:44 2009 +0100
- removed deprecated chicken option `-quiet'
- removed deprecated csc options `-v2' and `-v3'
- removed some deprecated runtime functions (`C_callback_adjust_stack_limits'
and `C_rereclaim')
- removed deprecated declaration `run-time-macros'
- removed deprecated function `list-of' from data-structures unit
- removed deprecated `stat-...' functions from posix unit
- removed deprecated functions `for-each-line' and `for-each-argv-line'
diff --git a/c-platform.scm b/c-platform.scm
index 915137dc..95bba506 100644
--- a/c-platform.scm
+++ b/c-platform.scm
@@ -79,7 +79,6 @@
(define valid-compiler-options
'(-help
h help version verbose explicit-use
- quiet ; DEPRECATED
no-trace no-warnings unsafe block
check-syntax to-stdout no-usual-integrations case-insensitive no-lambda-info
profile inline keep-shadowed-macros ignore-repository
diff --git a/chicken.h b/chicken.h
index 7b3b3129..e3f164da 100644
--- a/chicken.h
+++ b/chicken.h
@@ -1411,7 +1411,6 @@ C_fctexport C_word C_fcall C_restore_callback_continuation(void);
C_fctexport C_word C_fcall C_restore_callback_continuation2(int level);
C_fctexport C_word C_fcall C_callback(C_word closure, int argc);
C_fctexport C_word C_fcall C_callback_wrapper(void *proc, int argc);
-C_fctexport void C_fcall C_callback_adjust_stack_limits(C_word *base); /* DEPRECATED */
C_fctexport void C_fcall C_callback_adjust_stack(C_word *base, int size);
C_fctexport void CHICKEN_parse_command_line(int argc, char *argv[], C_word *heap, C_word *stack, C_word *symbols);
C_fctexport void C_fcall C_toplevel_entry(C_char *name) C_regparm;
@@ -1472,7 +1471,6 @@ C_fctexport C_word C_h_structure(int n, ...);
C_fctexport C_word C_fcall C_mutate(C_word *slot, C_word val) C_regparm;
C_fctexport void C_fcall C_reclaim(void *trampoline, void *proc) C_regparm C_noret;
C_fctexport void C_save_and_reclaim(void *trampoline, void *proc, int n, ...) C_noret;
-C_fctexport void C_fcall C_rereclaim(long size) C_regparm; /* deprecated */
C_fctexport void C_fcall C_rereclaim2(C_uword size, int double_plus) C_regparm;
C_fctexport C_word C_fcall C_retrieve(C_word sym) C_regparm;
C_fctexport C_word C_fcall C_retrieve2(C_word val, char *name) C_regparm;
diff --git a/compiler.scm b/compiler.scm
index 5a938965..8dd0eff8 100644
--- a/compiler.scm
+++ b/compiler.scm
@@ -1379,8 +1379,7 @@
[(interrupts-enabled) (set! insert-timer-checks #f)]
[(safe) (set! unsafe #t)]
[else (compiler-warning 'syntax "illegal declaration specifier `~s'" id)]))]))
- ((compile-syntax
- run-time-macros) ; DEPRECATED
+ ((compile-syntax )
(set! ##sys#enable-runtime-macros #t))
((block-global hide)
(let ([syms (stripa (cdr spec))])
diff --git a/csc.scm b/csc.scm
index 5e46f5b9..7352b73b 100644
--- a/csc.scm
+++ b/csc.scm
@@ -577,15 +577,6 @@ EOF
(t-options "-verbose")
(set! verbose 2))
(else (set! verbose #t))) ]
- [(-v2 -verbose) ; DEPRECATED
- (set! verbose #t)
- (t-options "-verbose") ]
- [(-v3) ; DEPRECATED
- (set! verbose #t)
- (t-options "-verbose")
- (if (not msvc)
- (set! compile-options (cons* "-v" "-Q" compile-options)))
- (set! link-options (cons (if msvc "-VERBOSE" "-v") link-options)) ]
[(-w -no-warnings)
(set! compile-options (cons "-w" compile-options))
(t-options "-no-warnings") ]
diff --git a/data-structures.scm b/data-structures.scm
index eab96f5b..e6cb6f3b 100644
--- a/data-structures.scm
+++ b/data-structures.scm
@@ -136,8 +136,6 @@ EOF
[(pred (##sys#slot lst 0)) (loop (##sys#slot lst 1))]
[else #f] ) ) ) )
-(define list-of list-of?) ; DEPRECATED
-
(define (noop . _) (void))
(define (each . procs)
diff --git a/posix.import.scm b/posix.import.scm
index b66a7dff..cf152881 100644
--- a/posix.import.scm
+++ b/posix.import.scm
@@ -239,17 +239,10 @@
signal/xfsz
signals-list
sleep
- stat-block-device? ; DEPRECATED
block-device?
character-device?
- stat-char-device? ; DEPRECATED
- stat-directory? ; DEPRECATED
- stat-fifo? ; DEPRECATED
fifo?
- stat-regular? ; DEPRECATED
- stat-socket? ; DEPRECATED
socket?
- stat-symlink? ; DEPRECATED
string->time
symbolic-link?
system-information
diff --git a/posixunix.scm b/posixunix.scm
index b403f6c3..e51202bf 100644
--- a/posixunix.scm
+++ b/posixunix.scm
@@ -796,45 +796,26 @@ EOF
(##sys#stat fname #t 'symbolic-link?)
(foreign-value "C_islink" bool) )
-(define (stat-regular? fname) ; DEPRECATED
- (##sys#check-string fname 'stat-regular?)
- (##sys#stat fname #f 'stat-regular?)
- (foreign-value "C_isreg" bool))
-
-(define (stat-directory? fname) ; DEPRECATED
- (##sys#check-string fname 'stat-directory?)
- (##sys#stat fname #f 'stat-directory?)
- (foreign-value "C_isdir" bool))
-
(define (character-device? fname)
(##sys#check-string fname 'character-device?)
(##sys#stat fname #f 'character-device?)
(foreign-value "C_ischr" bool))
-(define stat-char-device? character-device?) ; DEPRECATED
-
(define (block-device? fname)
(##sys#check-string fname 'block-device?)
(##sys#stat fname #f 'block-device?)
(foreign-value "C_isblk" bool))
-(define stat-block-device? block-device?) ; DEPRECATED
-
(define (fifo? fname)
(##sys#check-string fname 'stat-fifo?)
(##sys#stat fname #f 'stat-fifo?)
(foreign-value "C_isfifo" bool))
-(define stat-fifo? fifo?) ; DEPRECATED
-(define stat-symlink? symbolic-link?) ; DEPRECATED
-
(define (socket? fname)
(##sys#check-string fname 'socket?)
(##sys#stat fname #f 'socket?)
(foreign-value "C_issock" bool))
-(define stat-socket? socket?) ; DEPRECATED
-
(define set-file-position!
(lambda (port pos . whence)
(let ((whence (if (pair? whence) (car whence) _seek_set)))
diff --git a/posixwin.scm b/posixwin.scm
index 096b720f..da4f41e5 100644
--- a/posixwin.scm
+++ b/posixwin.scm
@@ -1113,17 +1113,10 @@ EOF
(lambda (fname)
(##sys#check-string fname name)
#f))))
- (set! stat-regular? regular-file?) ; DEPRECATED
- (set! stat-directory? (stat-type 'stat-directory?)) ; DEPRECATED
- (set! stat-device? (stat-type 'stat-char-device?)) ; DEPRECATED
(set! character-device? (stat-type 'character-device?))
(set! block-device? (stat-type 'block-device?))
- (set! stat-block-device? (stat-type 'stat-block-device?)) ; DEPRECATED
- (set! stat-fifo? (stat-type 'stat-fifo?)) ; DEPRECATED
(set! fifo? (stat-type 'fifo?))
- (set! stat-symlink? (stat-type 'stat-symlink?)) ; DEPRECATED
- (set! socket? (stat-type 'socket?))
- (set! stat-socket? (stat-type 'stat-socket?))) ; DEPRECATED
+ (set! socket? (stat-type 'socket?)))
(define set-file-position!
(lambda (port pos . whence)
diff --git a/runtime.c b/runtime.c
index 3d21a2f6..1adf53a9 100644
--- a/runtime.c
+++ b/runtime.c
@@ -1757,29 +1757,6 @@ void C_fcall C_callback_adjust_stack(C_word *a, int size)
}
-void C_fcall C_callback_adjust_stack_limits(C_word *a) /* DEPRECATED */
-{
- if(!chicken_is_running && !C_in_stackp((C_word)a)) {
- if(debug_mode)
- C_printf(C_text("[debug] callback invoked in lower stack region - adjusting limits:\n"
- "[debug] current: \t%p\n"
- "[debug] previous: \t%p (bottom) - %p (limit)\n"),
- a, stack_bottom, C_stack_limit);
-
-#if C_STACK_GROWS_DOWNWARD
- C_stack_limit = (C_word *)((C_byte *)a - stack_size);
-#else
- C_stack_limit = (C_word *)((C_byte *)a + stack_size);
-#endif
- stack_bottom = a;
-
- if(debug_mode)
- C_printf(C_text("[debug] new: \t%p (bottom) - %p (limit)\n"),
- stack_bottom, C_stack_limit);
- }
-}
-
-
C_word C_fcall C_callback_wrapper(void *proc, int argc)
{
C_word
@@ -3062,12 +3039,6 @@ C_regparm void C_fcall mark(C_word *x)
/* Do a major GC into a freshly allocated heap: */
-C_regparm void C_fcall C_rereclaim(long size)
-{
- C_rereclaim2(size < 0 ? -size : size, size < 0);
-}
-
-
C_regparm void C_fcall C_rereclaim2(C_uword size, int double_plus)
{
int i, j;
diff --git a/types.db b/types.db
index 73b97aaf..dac9fb0d 100644
--- a/types.db
+++ b/types.db
@@ -598,6 +598,7 @@
(pointer->address (procedure pointer->address (pointer) number))
(pointer-like? (procedure pointer-like? (*) boolean))
(pointer->object (procedure pointer->object (pointer) *))
+(pointer-offset deprecated)
(pointer-f32-ref (procedure pointer-f32-ref (pointer) number))
(pointer-f32-set! (procedure pointer-f32-set! (pointer number) undefined))
(pointer-f64-ref (procedure pointer-f64-ref (pointer) number))
@@ -869,16 +870,9 @@
(signals-list list)
(sleep (procedure sleep (fixnum) fixnum))
(block-device? (procedure block-device? (string) boolean))
-(stat-block-device? deprecated)
(character-device? (procedure character-device? (string) boolean))
-(stat-char-device? deprecated)
-(stat-fifo? deprecated)
-(stat-directory? deprecated)
(fifo? (procedure fifo? (string) boolean))
-(stat-regular? deprecated)
-(stat-socket? deprecated)
(socket? (procedure socket? (string) boolean))
-(stat-symlink? deprecated)
(string->time (procedure string->time (string #!optional string) vector))
(symbolic-link? (procedure symbolic-link? (string) boolean))
(system-information (procedure system-information () list))
diff --git a/utils.scm b/utils.scm
index 4cb17309..4bb82bda 100644
--- a/utils.scm
+++ b/utils.scm
@@ -64,35 +64,6 @@
(##sys#error "shell invocation failed with non-zero return status" str n) ) ) ) ) )
-;;; Handy I/O procedures:
-
-(define for-each-line ; DEPRECATED
- (let ([read-line read-line])
- (lambda (proc . port)
- (let ([port (if (pair? port) (car port) ##sys#standard-input)])
- (##sys#check-port port 'for-each-line)
- (let loop ()
- (let ([ln (read-line port)])
- (unless (eof-object? ln)
- (proc ln)
- (loop) ) ) ) ) ) ) )
-
-
-;; This one is from William Annis:
-
-(define (for-each-argv-line thunk) ; DEPRECATED
- (define (file-iterator file thunk)
- (if (string=? file "-")
- (for-each-line thunk)
- (with-input-from-file file (cut for-each-line thunk) ) ) )
- (let ((args (command-line-arguments)))
- (if (null? args)
- ;; If no arguments, take from stdin,
- (for-each-line thunk)
- ;; otherwise, hit each file named in argv.
- (for-each (lambda (arg) (file-iterator arg thunk)) args))))
-
-
;;; Read file as string from given filename or port:
(define (read-all . file)
Trap