traditional benchmarks: more consistent error calls

Avoid Chez Scheme warnings due to `error` calls that don't match its
calling convention.
This commit is contained in:
Matthew Flatt 2019-05-10 13:23:22 -06:00
parent 35e98675b6
commit deb5e43fab
4 changed files with 10 additions and 10 deletions

View File

@ -41,7 +41,7 @@
((vector? obj)
(sort! (vector-copy obj) pred))
(else
(error "sort: argument should be a list or vector" obj))))
(error 'sort "argument should be a list or vector ~s" obj))))
;; This merge sort is stable for partial orders (for predicates like
;; <=, rather than like <).
@ -68,7 +68,7 @@
(loop (+ p 1) p1 (+ p2 1)))))))))
(if (not (vector? v))
(error "sort!: argument not a vector" v))
(error 'sort! "argument not a vector ~s" v))
(sort-internal! v
(vector-copy v)
@ -140,7 +140,7 @@
(define (make-edge-getter selector)
(lambda (node)
(if (or (none-node? node) (any-node? node))
(error "Can't get edges from the ANY or NONE nodes")
(error 'getter "Can't get edges from the ANY or NONE nodes")
(selector node))))
(define red-edges (make-edge-getter internal-node-red-edges))
(define green-edges (make-edge-getter internal-node-green-edges))
@ -150,7 +150,7 @@
(define (make-edge-setter mutator!)
(lambda (node value)
(cond ((any-node? node) (error "Can't set edges from the ANY node"))
(cond ((any-node? node) (error 'setter "Can't set edges from the ANY node"))
((none-node? node) 'OK)
(else (mutator! node value)))))
(define set-red-edges! (make-edge-setter set-internal-node-red-edges!))
@ -421,7 +421,7 @@
(define (find-canonical-representative element classification)
(let loop ((classes classification))
(cond ((null? classes) (error "Can't classify" element))
(cond ((null? classes) (error 'canonical "Can't classify ~s" element))
((memq element (car classes)) (car (car classes)))
(else (loop (cdr classes))))))

View File

@ -55,7 +55,7 @@
(loop))
#t))
(cond ((not (= n (expt 2 m)))
(error "array size not a power of two.")))
(error 'init "array size not a power of two.")))
;; interchange elements in bit-reversed order
(set! j 1)
(set! i 1)

View File

@ -72,7 +72,7 @@
((null? (cddr parms)) (if term gen-prc2* gen-prc2 ))
((symbol? (cddr parms)) (if term gen-prc3/rest* gen-prc3/rest))
((null? (cdddr parms)) (if term gen-prc3* gen-prc3 ))
(else (error "too many parameters")))
(else (error 'prc "too many parameters")))
body))
(define (app vals glo term)
@ -85,7 +85,7 @@
(if term gen-ap2* gen-ap2)))
((4) (if glo (if term gen-ap3-glo* gen-ap3-glo)
(if term gen-ap3* gen-ap3)))
(else (error "too many arguments")))
(else (error 'app "too many arguments")))
vals))
;- -- code generation procedures for non-terminal evaluations ---

View File

@ -33,7 +33,7 @@
((null? (cdddr p))
(int-prc3 (caddr expr) (car p) (cadr p) (caddr p) env))
(else
(error "too many parameters")))))
(error 'int "too many parameters")))))
((null? (cdr expr))
(int-ap0 (car expr) env))
((null? (cddr expr))
@ -43,7 +43,7 @@
((null? (cddddr expr))
(int-ap3 (car expr) (cadr expr) (caddr expr) (cadddr expr) env))
(else
(error "too many arguments"))))
(error 'int "too many arguments"))))
;- -- interpretation of constants ---