diff --git a/data-structures.scm b/data-structures.scm index fd12a7a..9a4bcec 100644 --- a/data-structures.scm +++ b/data-structures.scm @@ -43,7 +43,7 @@ EOF (bound-to-procedure ##sys#check-char ##sys#check-exact ##sys#check-port ##sys#check-string ##sys#substring ##sys#for-each ##sys#map ##sys#setslot - ##sys#allocate-vector ##sys#check-pair ##sys#not-a-proper-list-error + ##sys#allocate-vector ##sys#check-pair ##sys#error-not-a-proper-list ##sys#member ##sys#assoc ##sys#error ##sys#signal-hook ##sys#read-string! ##sys#check-symbol ##sys#check-vector ##sys#floor ##sys#ceiling ##sys#truncate ##sys#round ##sys#check-number ##sys#cons-flonum @@ -242,7 +242,7 @@ EOF (let loop ([lsts lsts]) (cond [(null? lsts) '()] [(cond-expand [unsafe #f] [else (not (pair? lsts))]) - (##sys#not-a-proper-list-error lsts) ] + (##sys#error-not-a-proper-list lsts) ] [else (let ([l (##sys#slot lsts 0)] [r (##sys#slot lsts 1)] ) @@ -516,7 +516,7 @@ EOF (##sys#check-string stri 'string-intersperse) (loop1 (##sys#slot ss 1) (fx+ (##sys#size stri) (fx+ dslen n)) ) ) ) - (else (##sys#not-a-proper-list-error strs)) ) ) ) ) + (else (##sys#error-not-a-proper-list strs)) ) ) ) ) ;;; Translate elements of a string: @@ -882,7 +882,7 @@ EOF ((eq? (##sys#slot lst 1) '()) lst) (if (or (not (##core#inline "C_blockp" lst)) (not (##core#inline "C_pairp" lst)) ) - (##sys#not-a-proper-list-error lst0 'list->queue) ) ) ) ) ) + (##sys#error-not-a-proper-list lst0 'list->queue) ) ) ) ) ) ; (queue-push-back! queue item) diff --git a/eval.scm b/eval.scm index fad4abe..bbb0c71 100644 --- a/eval.scm +++ b/eval.scm @@ -62,7 +62,7 @@ (no-procedure-checks-for-usual-bindings) (bound-to-procedure ##sys#check-char ##sys#check-exact ##sys#check-port ##sys#check-string ##sys#load-library - ##sys#for-each ##sys#map ##sys#setslot ##sys#allocate-vector ##sys#check-pair ##sys#not-a-proper-list-error + ##sys#for-each ##sys#map ##sys#setslot ##sys#allocate-vector ##sys#check-pair ##sys#error-not-a-proper-list ##sys#check-symbol ##sys#check-vector ##sys#floor ##sys#ceiling ##sys#truncate ##sys#round ##sys#check-number ##sys#cons-flonum ##sys#copy-env-table ##sys#flonum-fraction ##sys#make-port ##sys#fetch-and-check-port-arg ##sys#print ##sys#check-structure diff --git a/extras.scm b/extras.scm index 97eb03d..3ae80da 100644 --- a/extras.scm +++ b/extras.scm @@ -45,7 +45,7 @@ EOF (bound-to-procedure ##sys#check-char ##sys#check-exact ##sys#check-port ##sys#check-string ##sys#substring ##sys#for-each ##sys#map ##sys#setslot - ##sys#allocate-vector ##sys#check-pair ##sys#not-a-proper-list-error + ##sys#allocate-vector ##sys#check-pair ##sys#error-not-a-proper-list ##sys#member ##sys#assoc ##sys#error ##sys#signal-hook ##sys#read-string! ##sys#check-symbol ##sys#check-vector ##sys#floor ##sys#ceiling ##sys#truncate ##sys#round ##sys#check-number ##sys#cons-flonum diff --git a/library.scm b/library.scm index adb10bc..9aa55ce 100644 --- a/library.scm +++ b/library.scm @@ -130,7 +130,7 @@ EOF (bound-to-procedure ##sys#check-char ##sys#check-exact ##sys#check-port ##sys#check-port* ##sys#check-string ##sys#substring ##sys#check-port-mode ##sys#for-each ##sys#map ##sys#setslot ##sys#allocate-vector ##sys#check-pair - ##sys#not-a-proper-list-error ##sys#error ##sys#warn ##sys#signal-hook + ##sys#error-not-a-proper-list ##sys#error ##sys#warn ##sys#signal-hook ##sys#check-symbol ##sys#check-vector ##sys#floor ##sys#ceiling ##sys#truncate ##sys#round ##sys#check-number ##sys#cons-flonum ##sys#check-integer ##sys#check-special ##sys#flonum-fraction ##sys#make-port ##sys#print @@ -433,9 +433,10 @@ EOF ((eq? x (##sys#slot lst 0)) (##sys#slot lst 1)) (else (cons (##sys#slot lst 0) (loop (##sys#slot lst 1)))) ) ) ) -(define (##sys#not-a-proper-list-error arg . loc) - (##sys#error-hook (foreign-value "C_NOT_A_PROPER_LIST_ERROR" int) - (and (pair? loc) (car loc)) arg) ) +(define (##sys#error-not-a-proper-list arg . loc) + (##sys#error-hook (foreign-value "C_NOT_A_PROPER_LIST_ERROR" int) (and (pair? loc) (car loc)) arg) ) + +(define ##sys#not-a-proper-list-error ##sys#error-not-a-proper-list) ;DEPRECATED (define (append . lsts) (if (eq? lsts '()) @@ -453,7 +454,7 @@ EOF (cond ((eq? node '()) (loop (##sys#slot lsts 1))) ((pair? node) (cons (##sys#slot node 0) (copy (##sys#slot node 1))) ) - (else (##sys#not-a-proper-list-error (##sys#slot lsts 0) 'append)) ) ] ) ) ) ) ) ) + (else (##sys#error-not-a-proper-list (##sys#slot lsts 0) 'append)) ) ] ) ) ) ) ) ) (define (reverse lst0) (let loop ((lst lst0) (rest '())) @@ -466,7 +467,7 @@ EOF (cond ((eq? lst '()) rest) ((pair? lst) (loop (##sys#slot lst 1) (cons (##sys#slot lst 0) rest)) ) - (else (##sys#not-a-proper-list-error lst0 'reverse)) ) ] ) ) ) + (else (##sys#error-not-a-proper-list lst0 'reverse)) ) ] ) ) ) (define (memq x lst) (##core#inline "C_i_memq" x lst)) (define (memv x lst) (##core#inline "C_i_memv" x lst)) @@ -526,7 +527,7 @@ EOF (##core#inline "C_setsubchar" s i (##sys#slot lst 0)) ) )] [else (if (not (list? lst0)) - (##sys#not-a-proper-list-error lst0 'list->string) + (##sys#error-not-a-proper-list lst0 'list->string) (let* ([len (length lst0)] [s (##sys#make-string len)] ) (do ([i 0 (fx+ i 1)] @@ -562,7 +563,7 @@ EOF (##core#inline "C_setsubchar" s n2 c) ) (iter (##sys#slot l2 1) (fx- n2 1)) ) ) ) s ) - (##sys#not-a-proper-list-error l 'reverse-list->string) ) ] + (##sys#error-not-a-proper-list l 'reverse-list->string) ) ] ) ) (define reverse-list->string ##sys#reverse-list->string) @@ -1288,7 +1289,7 @@ EOF (loop (##sys#slot lst 1) (fx+ i 1)) ) ) ) )] [else (if (not (list? lst0)) - (##sys#not-a-proper-list-error lst0 'list->vector) + (##sys#error-not-a-proper-list lst0 'list->vector) (let* ([len (length lst0)] [v (##sys#make-vector len)] ) (let loop ([lst lst0] @@ -1507,7 +1508,7 @@ EOF ((pair? lst) (p (##sys#slot lst 0)) (loop (##sys#slot lst 1)) ) - (else (##sys#not-a-proper-list-error lst0 'for-each)) ) ] ) ) ) + (else (##sys#error-not-a-proper-list lst0 'for-each)) ) ] ) ) ) (define (##sys#map p lst0) (let loop ((lst lst0)) @@ -1520,7 +1521,7 @@ EOF (cond ((eq? lst '()) lst) ((pair? lst) (cons (p (##sys#slot lst 0)) (loop (##sys#slot lst 1))) ) - (else (##sys#not-a-proper-list-error lst0 'map)) ) ] ) ) ) + (else (##sys#error-not-a-proper-list lst0 'map)) ) ] ) ) ) (define for-each) (define map) @@ -1537,7 +1538,7 @@ EOF [else (check lsts start loc)] ) ) ((pair? item) (cons (p item) (mapsafe p (##sys#slot lsts 1) #f loc)) ) - (else (##sys#not-a-proper-list-error item loc)) ) ) ) ) ) + (else (##sys#error-not-a-proper-list item loc)) ) ) ) ) ) (check (lambda (lsts start loc) (if (or (not start) diff --git a/lolevel.scm b/lolevel.scm index aba98d7..7c14dd9 100644 --- a/lolevel.scm +++ b/lolevel.scm @@ -56,7 +56,7 @@ EOF ##sys#make-locative ##sys#become! ##sys#make-string make-property-condition make-composite-condition signal ##sys#set-pointer-address! ##sys#make-vector - ##sys#make-pointer make-string make-byte-vector ##sys#not-a-proper-list-error ##sys#check-pointer + ##sys#make-pointer make-string make-byte-vector ##sys#error-not-a-proper-list ##sys#check-pointer ##sys#locative? ##sys#bytevector? extend-procedure ##sys#lambda-decoration ##sys#decorate-lambda ##sys#make-tagged-pointer ##sys#check-special ##sys#vector->closure! ##sys#error ##sys#signal-hook ##sys#address->pointer ##sys#pointer->address) ) ] ) diff --git a/ports.scm b/ports.scm index a574eb9..6a19a96 100644 --- a/ports.scm +++ b/ports.scm @@ -53,7 +53,7 @@ EOF (bound-to-procedure ##sys#check-char ##sys#check-exact ##sys#check-port ##sys#check-string ##sys#substring ##sys#for-each ##sys#map ##sys#setslot - ##sys#allocate-vector ##sys#check-pair ##sys#not-a-proper-list-error + ##sys#allocate-vector ##sys#check-pair ##sys#error-not-a-proper-list ##sys#member ##sys#assoc ##sys#error ##sys#signal-hook ##sys#read-string! ##sys#check-symbol ##sys#check-vector ##sys#floor ##sys#ceiling ##sys#truncate ##sys#round ##sys#check-number ##sys#cons-flonum diff --git a/srfi-4.scm b/srfi-4.scm index 52154a5..52bf13b 100644 --- a/srfi-4.scm +++ b/srfi-4.scm @@ -77,7 +77,7 @@ EOF ##sys#f32vector-ref ##sys#f32vector-set! ##sys#f64vector-ref ##sys#f64vector-set! ##sys#check-exact-interval ##sys#check-inexact-interval ##sys#check-number ##sys#check-structure ##sys#cons-flonum ##sys#check-list ##sys#check-range ##sys#error ##sys#signal-hook - ##sys#not-a-proper-list-error ##sys#print ##sys#allocate-vector) ) ] ) + ##sys#error-not-a-proper-list ##sys#print ##sys#allocate-vector) ) ] ) (include "unsafe-declarations.scm") @@ -392,7 +392,7 @@ EOF ((##core#inline "C_eqp" p '()) v) (if (and (##core#inline "C_blockp" p) (##core#inline "C_pairp" p)) (set v i (##core#inline "C_slot" p 0)) - (##sys#not-a-proper-list-error lst) ) ) ) ) ) + (##sys#error-not-a-proper-list lst) ) ) ) ) ) (set! list->u8vector (init make-u8vector u8vector-set! 'list->u8vector)) (set! list->s8vector (init make-s8vector s8vector-set! 'list->s8vector))