suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reformat some

Browse Source 
svn: r14435
This commit is contained in:
Eli Barzilay 2009-04-06 11:17:15 +00:00
parent b2959e3308
commit 2cc94cbf02
1 changed files with 65 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
collects/scheme/private/kw.ss
View File

@ -750,41 +750,32 @@
;; Ok:
(keyword-procedure-proc p)
;; Not ok, so far:
(let ([p2 (if (keyword-procedure? p)
#f
(if (procedure? p)
(let ([p2 (and (not (keyword-procedure? p))
(procedure? p)
(or (procedure-extract-target p)
(and (new-procedure? p)
'method))
#f))])
(and (new-procedure? p) 'method)))])
(if p2
;; Maybe the target is ok:
(if (eq? p2 'method)
;; Build wrapper method:
(let ([p3 (keyword-procedure-extract/method kws (add1 n)
(new-procedure-ref p)
(add1 method-n))])
(let ([p3 (keyword-procedure-extract/method
kws (add1 n) (new-procedure-ref p) (add1 method-n))])
(lambda (kws kw-args . args)
(apply p3 kws kw-args (cons p args))))
;; Recur:
(keyword-procedure-extract/method kws n p2 method-n))
;; Not ok, period:
(lambda (kws kw-args . args)
(let-values ([(missing-kw extra-kw)
(define-values (missing-kw extra-kw)
(if (keyword-procedure? p)
(check-kw-args p kws)
(values #f (car kws)))]
[(n) (let ([method-n (+ method-n
(if (or (keyword-method? p)
(okm? p))
1
0))])
(if (n . >= . method-n)
(- n method-n)
n))])
(let ([args-str
(if (and (null? args)
(null? kws))
(values #f (car kws))))
(let ([n (let ([method-n
(+ method-n
(if (or (keyword-method? p) (okm? p)) 1 0))])
(if (n . >= . method-n) (- n method-n) n))]
[args-str
(if (and (null? args) (null? kws))
"no arguments supplied"
;; Hack to format arguments:
(with-handlers ([exn:fail?
@ -793,9 +784,9 @@
(cadr (regexp-match
#rx"other arguments were: (.*)$"
(exn-message exn)))))])
(apply raise-type-error 'x "x" 0 'x
(append args
(apply append (map list kws kw-args))))))])
(apply
raise-type-error 'x "x" 0 'x
(append args (apply append (map list kws kw-args))))))])
(raise
(make-exn:fail:contract
(if extra-kw
@ -804,32 +795,24 @@
(string-append
"procedure application: procedure: ~e;"
" does not expect an argument with keyword ~a; ~a")
p
extra-kw
args-str)
p extra-kw args-str)
(format
(string-append
"procedure application: expected a procedure that"
" accepts keyword arguments, given ~e; ~a")
p
args-str))
p args-str))
(if missing-kw
(format
(string-append
"procedure application: procedure: ~e; requires"
" an argument with keyword ~a, not supplied; ~a")
p
missing-kw
args-str)
p missing-kw args-str)
(format
(string-append
"procedure application: no case matching ~a non-keyword"
" argument~a for: ~e; ~a")
(- n 2)
(if (= 1 (- n 2)) "" "s")
p
args-str)))
(current-continuation-marks))))))))))
(- n 2) (if (= 1 (- n 2)) "" "s") p args-str)))
(current-continuation-marks)))))))))
(define (keyword-procedure-extract kws n p)
(keyword-procedure-extract/method kws n p 0))