From c631742a70fa9451efbba1ad6f54f25b127cb3c7 Mon Sep 17 00:00:00 2001 From: Justin Ethier Date: Thu, 5 May 2016 00:35:20 -0400 Subject: [PATCH] Call (lib:list->import-set) for an import set Call for an import set, not a list of import sets. --- scheme/cyclone/libraries.sld | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scheme/cyclone/libraries.sld b/scheme/cyclone/libraries.sld index 93d192e8..1bd01381 100644 --- a/scheme/cyclone/libraries.sld +++ b/scheme/cyclone/libraries.sld @@ -102,7 +102,8 @@ (define (lib:imports ast) (lib:result (let ((code (assoc 'import (cddr ast)))) - (if code (lib:list->import-set (cdr code)) #f)))) + (if code (map lib:list->import-set (cdr code)) + #f)))) (define (lib:body ast) (lib:result (let ((code (assoc 'begin (cddr ast)))) @@ -215,7 +216,7 @@ (map (lambda (import) (lib:import->export-list import)) - (lib:list->import-set imports)))) + (map lib:list->import-set imports)))) ;; Take a list of imports and create a "database" from them ;; consisting of maps between each exported identifier and the @@ -239,7 +240,7 @@ '() (lib:import->export-list import)) ) - (lib:list->import-set imports)))) + (map lib:list->import-set imports)))) ;; Convert from the import DB to a list of identifiers that are imported. ;; EG: '((call/cc . (scheme base))) ==> '(call/cc)