[Guile-commits] 03/03: Fix syntax-violation, which was passing vectors instead of alists

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit ee7d18ec41ff8702248258ffbb6544a65c4206fc
Author: Andy Wingo <wingo@pobox.com>
AuthorDate: Thu Apr 29 21:53:12 2021 +0200

    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.
---
 module/ice-9/psyntax-pp.scm | 3 ++-
 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 554ae0e..40750d6 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 b52bb39..663d927 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))))