diff options
author | Ludovic Courtès <ludo@gnu.org> | 2020-03-05 22:59:05 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2020-03-05 23:04:05 +0100 |
commit | 4cfe0c1014f2d238646c5d8d66d44ffb64ede54b (patch) | |
tree | 59cce493d2d9e49cbbb60e4eea7fcfb46f3a013c | |
parent | 0ad3986504eac9065ffd54701e7674e424967b80 (diff) | |
download | guile-4cfe0c1014f2d238646c5d8d66d44ffb64ede54b.tar.gz |
psyntax: 'include' no longer rejects relative file names.
Fixes a regression introduced in commit
fd2ffc649c2d08639c2ac41c25e4ebdbeb4b151d 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.
-rw-r--r-- | module/ice-9/psyntax-pp.scm | 2 | ||||
-rw-r--r-- | module/ice-9/psyntax.scm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm index ca9a0da56..b19ed77ed 100644 --- a/module/ice-9/psyntax-pp.scm +++ b/module/ice-9/psyntax-pp.scm @@ -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." diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm index 0c5082d73..b97911d87 100644 --- a/module/ice-9/psyntax.scm +++ b/module/ice-9/psyntax.scm @@ -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))) |