ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ui: Provide hints for unbound-variable errors.

Browse source 
* guix/ui.scm (known-variable-definition): New procedure.
(report-load-error): Handle 'unbound-variable'.
This commit is contained in:
Ludovic Courtès 2017-11-09 23:29:39 +01:00
parent 935542fbde
commit a2985bb101
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
guix/ui.scm
View file

@ -229,6 +229,38 @@ (define tag
(else (else
#t)))))) #t))))))
(define (known-variable-definition variable)
"Search among the currently loaded modules one that defines a variable named
VARIABLE and return it, or #f if none was found."
(define (module<? m1 m2)
(match (module-name m2)
(('gnu _ ...) #t)
(('guix _ ...)
(match (module-name m1)
(('gnu _ ...) #f)
(_ #t)))
(_ #f)))
(let loop ((modules (list (resolve-module '() #f #f #:ensure #f)))
(suggestions '()))
(match modules
(()
;; Pick the "best" suggestion.
(match (sort suggestions module<?)
(() #f)
((first _ ...) first)))
((head tail ...)
(let ((next (append tail
(hash-map->list (lambda (name module)
module)
(module-submodules head)))))
(match (module-local-variable head variable)
(#f (loop next suggestions))
(_
(match (module-name head)
(('gnu _ ...) head) ;must be that one
(_ (loop next (cons head suggestions)))))))))))
(define* (display-hint message #:optional (port (current-error-port))) (define* (display-hint message #:optional (port (current-error-port)))
"Display MESSAGE, a l10n message possibly containing Texinfo markup, to "Display MESSAGE, a l10n message possibly containing Texinfo markup, to
PORT." PORT."
@ -256,6 +288,16 @@ (define* (report-load-error file args #:optional frame)
(let ((loc (source-properties->location properties))) (let ((loc (source-properties->location properties)))
(format (current-error-port) (G_ "~a: error: ~a~%") (format (current-error-port) (G_ "~a: error: ~a~%")
(location->string loc) message))) (location->string loc) message)))
(('unbound-variable proc message (variable) _ ...)
(match args
((key . args)
(print-exception (current-error-port) frame key args)))
(match (known-variable-definition variable)
(#f
(display-hint (G_ "Did you forget a @code{use-modules} form?")))
(module
(display-hint (format #f (G_ "Try adding @code{(use-modules ~a)}.")
(module-name module))))))
(('srfi-34 obj) (('srfi-34 obj)
(if (message-condition? obj) (if (message-condition? obj)
(if (error-location? obj) (if (error-location? obj)