From 3ec2558a6f54bc5982d4e6c8b1c0694ba9d07b90 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Tue, 28 Apr 2015 16:48:38 -0400 Subject: [PATCH] Fixes --- cyclone.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cyclone.scm b/cyclone.scm index 153f78e7..fd46f346 100644 --- a/cyclone.scm +++ b/cyclone.scm @@ -29,13 +29,13 @@ (tagged-list? 'define-library ast)) (define (lib:name ast) (cadr ast)) (define (lib:exports ast) - (and-let* ((code (assoc 'export (cddr l)))) + (and-let* ((code (assoc 'export (cddr ast)))) (cdr code))) (define (lib:imports ast) - (and-let* ((code (assoc 'import (cddr l)))) + (and-let* ((code (assoc 'import (cddr ast)))) (cdr code))) (define (lib:body ast) - (and-let* ((code (assoc 'begin (cddr l)))) + (and-let* ((code (assoc 'begin (cddr ast)))) (cdr code))) ;; TODO: include, include-ci, cond-expand @@ -58,14 +58,14 @@ (trace:info input-program) ;pretty-print (cond - ((library? input-program) + ((library? (car input-program)) (set! program? #f) - (set! lib-exports (lib:exports input-program)) - (set! lib-imports (lib:imports input-program)) - (set! input-program (lib:body input-program)) + (set! lib-exports (lib:exports (car input-program))) + (set! lib-imports (lib:imports (car input-program))) + (set! input-program (lib:body (car input-program))) (error "TODO: I do not know how to compile a library")) (else - (error "DEBUG: not a library"))) + (error "DEBUG: not a library" input-program))) ;; TODO: how to handle stdlib when compiling a library?? (set! input-program (add-libs input-program))