fix require for-label ordering; add tests
This commit is contained in:
parent
29ba45bb8d
commit
503f43a3f2
|
@ -4,6 +4,10 @@
|
|||
|
||||
(define test-cases
|
||||
'(
|
||||
;; proper doc linking
|
||||
"2425" ; 2htdp/image image? doc link
|
||||
"3233" ; htdp/bsl image? doc link
|
||||
"6998" ; matrix mult (example of require id, perm, that's also in #lang)
|
||||
;; path permissions
|
||||
"7449" ; delete file
|
||||
"4749" ; list root
|
||||
|
|
|
@ -96,11 +96,18 @@
|
|||
(++ "(except-in typed/racket " TR-bad-ids ")\n"
|
||||
"(only-meta-in 0 (only-in typed/racket " TR-bad-ids "))\n")]
|
||||
[else ""])
|
||||
;; when required id is also in lang, favor require
|
||||
(cond
|
||||
[(htdp-lang? lang)
|
||||
(++ (car lang-lst) " (subtract-in (combine-in "
|
||||
(string-join reqs) ") " (car lang-lst) ")")]
|
||||
[else (string-join (append lang-lst reqs))])
|
||||
(++ (string-join reqs) " "
|
||||
"(subtract-in " (car lang-lst)
|
||||
" (combine-in " (string-join reqs) "))")]
|
||||
;; (car lang-lst) " (subtract-in (combine-in "
|
||||
;; (string-join reqs) ") " (car lang-lst) ")")]
|
||||
; [else (string-join (append lang-lst reqs))])
|
||||
[else (++ (string-join reqs) " "
|
||||
"(subtract-in (combine-in " (string-join lang-lst) ")"
|
||||
" (combine-in " (string-join reqs) "))")])
|
||||
"))\n"
|
||||
"@codeblock|{\n~a}|")
|
||||
code))
|
||||
|
|
Loading…
Reference in New Issue
Block a user