diff options
| author | Andy Wingo <wingo@pobox.com> | 2021-04-29 21:53:12 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2021-04-29 22:00:18 +0200 |
| commit | ee7d18ec41ff8702248258ffbb6544a65c4206fc (patch) | |
| tree | 34d7c584ba4a28b21af8f78c52b0ba9e54a154aa | |
| parent | c72a0237e3bc931fa0654298a148631974c2b9b1 (diff) | |
| download | guile-ee7d18ec41ff8702248258ffbb6544a65c4206fc.tar.gz | |
Fix syntax-violation, which was passing vectors instead of alists
* module/ice-9/psyntax.scm (syntax-violation): Pass source as an alist.
A sourcev would be better but it's incompatible.
* module/ice-9/psyntax-pp.scm: Regenerate.
| -rw-r--r-- | module/ice-9/psyntax-pp.scm | 3 | ||||
| -rw-r--r-- | module/ice-9/psyntax.scm | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/module/ice-9/psyntax-pp.scm b/module/ice-9/psyntax-pp.scm index 554ae0e28..40750d6a9 100644 --- a/module/ice-9/psyntax-pp.scm +++ b/module/ice-9/psyntax-pp.scm @@ -2530,7 +2530,8 @@ (throw 'syntax-error who message - (or (source-annotation subform) (source-annotation form)) + (sourcev->alist + (or (source-annotation subform) (source-annotation form))) (strip form) (strip subform)))) (letrec* diff --git a/module/ice-9/psyntax.scm b/module/ice-9/psyntax.scm index b52bb397e..663d9275a 100644 --- a/module/ice-9/psyntax.scm +++ b/module/ice-9/psyntax.scm @@ -2792,8 +2792,9 @@ who 'syntax-violation) (arg-check string? message 'syntax-violation) (throw 'syntax-error who message - (or (source-annotation subform) - (source-annotation form)) + (sourcev->alist + (or (source-annotation subform) + (source-annotation form))) (strip form) (strip subform)))) |