mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-21 12:10:26 +02:00
Code Activity

Avoid failure when `format-analysis' stumbles upon unbound variables.

Browse source 
* module/language/tree-il/analyze.scm (proc-ref?): Wrap `variable-ref'
  in `false-if-exception'.

* test-suite/tests/tree-il.test ("warnings")["format"]("non-literal
  format string with forward declaration"): New test.
This commit is contained in:
Ludovic Courtès 2012-02-27 00:51:09 +01:00
parent a850c3ccc4
commit d316047326
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/language/tree-il/analyze.scm
View file

@ -1354,7 +1354,8 @@ resort, return #t when EXP refers to the global variable SPECIAL-NAME."
(($ <toplevel-ref> _ name) (($ <toplevel-ref> _ name)
(let ((var (false-if-exception (module-variable env name)))) (let ((var (false-if-exception (module-variable env name))))
(if var (if var
(eq? (variable-ref var) proc) (eq? (false-if-exception (variable-ref var)) ; VAR may be unbound
proc)
(eq? name special-name)))) ; special hack to support local aliases (eq? name special-name)))) ; special hack to support local aliases
(($ <module-ref> _ module name public?) (($ <module-ref> _ module name public?)
(let ((m (false-if-exception (if public? (let ((m (false-if-exception (if public?

13
test-suite/tests/tree-il.test
View file

@ -2184,6 +2184,19 @@
#:opts %opts-w-format #:opts %opts-w-format
#:to 'assembly))))) #:to 'assembly)))))
(pass-if "non-literal format string with forward declaration"
(let ((w (call-with-warnings
(lambda ()
(compile '(begin
(define (foo)
(format #t (_ "~A ~A!") "hello" "world"))
(define _ bar))
#:opts %opts-w-format
#:to 'assembly)))))
(and (= (length w) 1)
(number? (string-contains (car w)
"non-literal format string")))))
(pass-if "wrong format string" (pass-if "wrong format string"
(let ((w (call-with-warnings (let ((w (call-with-warnings
(lambda () (lambda ()