Changeset 4446

Timestamp:

10/18/03 16:23:59 (18 years ago)

Author:

piso

Message:

Work in progress.

File:

• trunk/j/src/org/armedbear/lisp/compiler.lisp (modified) (3 diffs)

trunk/j/src/org/armedbear/lisp/compiler.lisp

@@ -2 +2 @@
 ;;;
 ;;; Copyright (C) 2003 Peter Graves
-;;; $Id: compiler.lisp,v 1.50 2003-10-18 14:42:35 piso Exp $
+;;; $Id: compiler.lisp,v 1.51 2003-10-18 16:23:59 piso Exp $
 ;;;
 ;;; This program is free software; you can redistribute it and/or
@@ -121 +121 @@
 
 (defun expand-local-macro (form)
-  (funcall (local-macro-function (car form)) form nil))
+  (let ((expansion (funcall (local-macro-function (car form)) form nil)))
+    ;; If the expansion turns out to be a bare symbol, wrap it with PROGN so it
+    ;; won't be mistaken for a tag in an enclosing TAGBODY.
+    (if (symbolp expansion)
+        (list 'progn expansion)
+        expansion)))
 
 (defun compile-macrolet (form)
@@ -172 +177 @@
        (let ((body (cdr form)))
          (if (= (length body) 1)
-             (compile-sexp (car body))
+             (let ((res (compile-sexp (car body))))
+               ;; If the result turns out to be a bare symbol, leave it wrapped
+               ;; with PROGN so it won't be mistaken for a tag in an enclosing
+               ;; TAGBODY.
+               (if (symbolp res)
+                   (list 'progn res)
+                   res))
              (cons 'progn (mapcar #'compile-sexp body)))))
       (IF