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

procedure-rename: don't convert procs into methods or methods into procs

Browse Source
This commit is contained in:
AlexKnauth 2016-09-03 11:27:02 -04:00 committed by Robby Findler
parent 5b1658c6b4
commit 95e8ade091
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/racket-test-core/tests/racket/procs.rktl
View File

@ -363,8 +363,8 @@
;; ----------------------------------------
;; Check error for non-procedures
(err/rt-test (1 2 3) (lambda (x) (regexp-match? "not a procedure" (exn-message))))
(err/rt-test (1 #:x 2 #:y 3) (lambda (x) (regexp-match? "not a procedure" (exn-message))))
(err/rt-test (1 2 3) (lambda (x) (regexp-match? "not a procedure" (exn-message x))))
(err/rt-test (1 #:x 2 #:y 3) (lambda (x) (regexp-match? "not a procedure" (exn-message x))))
;; ----------------------------------------
;; Check error reporting of `procedure-reduce-keyword-arity'
@ -456,6 +456,36 @@
(test 8 (lambda () (ba))))
;; ----------------------------------------
;; Test that procedure-rename doesn't accidentally convert procedures
;; into methods or methods into procedures.
(let ()
(define (f a b c d e #:x [x 5]) a)
(err/rt-test (f)
(lambda (exn)
(regexp-match? #rx"expected: 5 plus an optional argument with keyword #:x"
(exn-message exn))))
;; procedure-rename shouldn't change this arity string
(define f* (procedure-rename f 'f))
(err/rt-test (f*)
(lambda (exn)
(regexp-match? #rx"expected: 5 plus an optional argument with keyword #:x"
(exn-message exn))))
;; but procedure->method should
(define fm (procedure->method f))
(define fm* (procedure-rename fm 'fm))
(err/rt-test (fm)
(lambda (exn)
(regexp-match? #rx"expected: 4 plus an optional argument with keyword #:x"
(exn-message exn))))
(err/rt-test (fm*)
(lambda (exn)
(regexp-match? #rx"expected: 4 plus an optional argument with keyword #:x"
(exn-message exn)))))
;; ----------------------------------------
(report-errs)

4
racket/collects/racket/private/kw.rkt
View File

@ -1559,8 +1559,8 @@
(cond
[(okp? proc)
((if (okm? proc)
make-optional-keyword-procedure
make-optional-keyword-method)
make-optional-keyword-method
make-optional-keyword-procedure)
(keyword-procedure-checker proc)
(keyword-procedure-proc proc)
(keyword-procedure-required proc)