clarify "unknown module" error message in determine-module-imports

original commit: 6af5ae075c4cce789d3528c3a6ef2620f90793e8
This commit is contained in:
Oscar Waddell 2018-05-23 15:35:35 -04:00
parent 75bce2810b
commit 47e236a07c
2 changed files with 7 additions and 5 deletions

2
LOG
View File

@ -999,3 +999,5 @@
misc.ms misc.ms
- flush expand-output and expand/optimize-output ports - flush expand-output and expand/optimize-output ports
compile.ss compile.ss
- clarify "unknown module" error message in determine-module-imports
syntax.ss

View File

@ -4071,7 +4071,7 @@
; (and <sub-version ref>*) ; (and <sub-version ref>*)
; (or <sub-version ref>*) ; (or <sub-version ref>*)
; (not <sub-version ref>) ; (not <sub-version ref>)
(define (determine-module-imports what mid tid) (define (determine-module-imports what who mid tid)
(let ([binding (lookup (id->label mid empty-wrap) r)]) (let ([binding (lookup (id->label mid empty-wrap) r)])
(case (binding-type binding) (case (binding-type binding)
[($module) [($module)
@ -4087,7 +4087,7 @@
(values mid tid (values mid tid
(make-import-interface x (make-import-interface x
(diff-marks (id-marks tid) (interface-marks (get-indirect-interface x))))))] (diff-marks (id-marks tid) (interface-marks (get-indirect-interface x))))))]
[else (syntax-error mid "unknown module")]))) [else (syntax-error who (format "unknown ~a" what))])))
(define (impset x) (define (impset x)
(syntax-case x () (syntax-case x ()
[(?only *x id ...) [(?only *x id ...)
@ -4222,13 +4222,13 @@
[else (f (cdr imps) o.n* (cons a new-imps))]))))))))] [else (f (cdr imps) o.n* (cons a new-imps))]))))))))]
[mid [mid
(and (not std?) (id? #'mid)) (and (not std?) (id? #'mid))
(determine-module-imports "module" #'mid #'mid)] (determine-module-imports "module" #'mid #'mid #'mid)]
[(?library-reference lr) [(?library-reference lr)
(sym-kwd? ?library-reference library-reference) (sym-kwd? ?library-reference library-reference)
(let-values ([(mid tid) (lookup-library #'lr)]) (let-values ([(mid tid) (lookup-library #'lr)])
(determine-module-imports "library" mid tid))] (determine-module-imports "library" #'lr mid tid))]
[lr (let-values ([(mid tid) (lookup-library #'lr)]) [lr (let-values ([(mid tid) (lookup-library #'lr)])
(determine-module-imports "library" mid tid))])) (determine-module-imports "library" #'lr mid tid))]))
(syntax-case impspec (for) (syntax-case impspec (for)
[(?for *x level ...) [(?for *x level ...)
(sym-kwd? ?for for) (sym-kwd? ?for for)