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

Fixed error handling; detect and report macro expansion errors.

Browse source 
* module/language/scheme/translate.scm (trans): Catch exceptions thrown
  by `macroexpand' and throw a syntax error.
  (trans-pair): Catch calls to `procedure->memoizing-macro' and raise a
  syntax error.

* module/system/base/compile.scm (call-with-compile-error-catch): Made a
  macro (a procedure doesn't do the job).
  (compile-file): Uncommented call to `call-with-compile-error-catch'.

git-archimport-id: lcourtes@laas.fr--2005-mobile/guile-vm--mobile--0.6--patch-7
This commit is contained in:
Ludovic Courtes 2005-12-13 21:33:50 +00:00 • committed by Ludovic Courtès
parent 884d46de23
commit 48302624d9
2 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
module/language/scheme/translate.scm
View file

@ -24,6 +24,7 @@
:use-module (system il ghil)
:use-module (ice-9 match)
:use-module (ice-9 receive)
:use-module ((system base compile) :select (syntax-error))
:export (translate))
(define (translate x e)
@ -41,10 +42,12 @@
(define (trans e l x)
(cond ((pair? x)
(let ((y (macroexpand x)))
(if (eq? x y)
(trans-pair e (or (location x) l) (car x) (cdr x))
(trans e l y))))
(let ((y (false-if-exception (macroexpand x))))
(if (not y)
(syntax-error l "failed to expand macro" x)
(if (eq? x y)
(trans-pair e (or (location x) l) (car x) (cdr x))
(trans e l y)))))
((symbol? x)
(let ((y (symbol-expand x)))
(if (symbol? y)
@ -240,8 +243,15 @@
(else
(if (memq head scheme-primitives)
(<ghil-inline> e l head (map trans:x tail))
(<ghil-call> e l (trans:x head) (map trans:x tail))))))
(<ghil-inline> e l head (map trans:x tail))
(if (eq? head 'procedure->memoizing-macro)
;;; XXX: `procedure->memoizing-macro' is evil because it crosses
;;; the compilation boundary. One solution might be to evaluate
;;; calls to `procedure->memoizing-macro' at compilation time,
;;; but it may be more compicated than that.
(syntax-error l "`procedure->memoizing-macro' is forbidden"
(cons head tail))
(<ghil-call> e l (trans:x head) (map trans:x tail)))))))
(define (trans-quasiquote e l x)
(cond ((not (pair? x)) x)