1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00

psyntax: 'include' no longer rejects relative file names.

Fixes a regression introduced in commit
fd2ffc649c whereby including a relative
file name would result in:

  ice-9/psyntax.scm:3254:24: attempt to include relative file name but could not determine base dir

* module/ice-9/psyntax.scm (call-with-include-port)[syntax-dirname]:
Lookup 'filename (symbol), not filename (identifier).
* module/ice-9/psyntax-pp.scm: Regenerate.
This commit is contained in:
Ludovic Courtès 2020-03-05 22:59:05 +01:00
parent 0ad3986504
commit 4cfe0c1014
2 changed files with 2 additions and 2 deletions

View file

@ -3321,7 +3321,7 @@
(lambda (stx)
(letrec*
((src (syntax-source stx))
(filename (if src (assq-ref src filename) #f)))
(filename (if src (assq-ref src 'filename) #f)))
(if (string? filename) (dirname filename) #f)))))
(lambda* (filename proc #:key (dirname (syntax-dirname filename) #:dirname))
"Like @code{call-with-input-file}, except relative paths are\nsearched relative to the @var{dirname} instead of the current working\ndirectory. Also, @var{filename} can be a syntax object; in that case,\nand if @var{dirname} is not specified, the @code{syntax-source} of\n@var{filename} is used to obtain a base directory for relative file\nnames."

View file

@ -3234,7 +3234,7 @@
(define call-with-include-port
(let ((syntax-dirname (lambda (stx)
(define src (syntax-source stx))
(define filename (and src (assq-ref src filename)))
(define filename (and src (assq-ref src 'filename)))
(and (string? filename)
(dirname filename)))))
(lambda* (filename proc #:key (dirname (syntax-dirname filename)))