Continue work on continuation passing style.

1 files changed, 6 insertions, 5 deletions

diff --git a/csc/macros.csc b/csc/macros.csc
index dfcfa64..ff5b63a 100644
--- a/csc/macros.csc
+++ b/csc/macros.csc
@@ -27,7 +27,7 @@
             lexical-ref-gensym
             lexical-ref?
             library-define-expression
-            library-define-name
+            library-define-ref
             library-define?
             library-ref-name
             library-ref?
@@ -681,7 +681,7 @@
             (define expanded-expr (expand-syntax-object expr))
             (cond
               ((library-define? expanded-expr)
-                (let ((name (library-define-name expanded-expr))
+                (let ((name (library-ref-name (library-define-ref expanded-expr)))
                       (g (gensym)))
                   (loop (with-binding name (make-lexical-ref name g) (syntax-map cdr body))
                         (cons name names)
@@ -731,9 +731,10 @@
           (syntax-case x
             ((_ symbol expression)
               (make-library-define
-                (identifier-name symbol)
-                (expand-syntax-object expression)
-                (environment-library (syntax-object-environment x))))
+                (make-library-ref
+                  (identifier-name symbol)
+                  (environment-library (syntax-object-environment x)))
+                (expand-syntax-object expression)))
             (_ (raise-syntax-error "unexpected form in builtin-define" x))))))