diff --git a/cyclone.scm b/cyclone.scm index d268d4c1..93db7793 100644 --- a/cyclone.scm +++ b/cyclone.scm @@ -91,7 +91,7 @@ ;; As of now, that will have to be dealt with later. (trace:info "imports:") (trace:info imports) - (set! imported-vars (lib:resolve-imports imports)) + (set! imported-vars (lib:imports->idb imports)) (trace:info "resolved imports:") (trace:info imported-vars) (let ((meta (lib:resolve-meta imports))) @@ -145,7 +145,7 @@ ; ; TODO: consider moving some of this alpha-conv logic below back into trans? (set! module-globals (global-vars input-program)) - (set! globals (append imported-vars module-globals)) + (set! globals (append (lib:idb:ids imported-vars) module-globals)) (set! input-program (map (lambda (expr) diff --git a/scheme/cyclone/cgen.sld b/scheme/cyclone/cgen.sld index 403773bb..202f4442 100644 --- a/scheme/cyclone/cgen.sld +++ b/scheme/cyclone/cgen.sld @@ -1354,7 +1354,7 @@ globals required-libs src-file) - (set! *global-syms* (append globals imported-globals)) + (set! *global-syms* (append globals (lib:idb:ids imported-globals))) (let ((compiled-program-lst '()) (compiled-program #f)) ;; Compile program, using for-each to guarantee execution order, @@ -1385,7 +1385,7 @@ (emits "extern object ") (emits (mangle-global global)) (emits ";\n")) - imported-globals) + (lib:idb:ids imported-globals)) (emit "#include \"cyclone/runtime.h\"") (if program?