Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-15 00:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use lib:idb

Browse source
This commit is contained in:
Justin Ethier 2016-03-30 01:00:43 -04:00
parent 6262dd0201
commit e67b67895f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cyclone.scm
View file

@ -91,7 +91,7 @@
;; As of now, that will have to be dealt with later. ;; As of now, that will have to be dealt with later.
(trace:info "imports:") (trace:info "imports:")
(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 "resolved imports:")
(trace:info imported-vars) (trace:info imported-vars)
(let ((meta (lib:resolve-meta imports))) (let ((meta (lib:resolve-meta imports)))
@ -145,7 +145,7 @@
; ;
; TODO: consider moving some of this alpha-conv logic below back into trans? ; TODO: consider moving some of this alpha-conv logic below back into trans?
(set! module-globals (global-vars input-program)) (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 (set! input-program
(map (map
(lambda (expr) (lambda (expr)

4
scheme/cyclone/cgen.sld
View file

@ -1354,7 +1354,7 @@
globals globals
required-libs required-libs
src-file) src-file)
(set! *global-syms* (append globals imported-globals)) (set! *global-syms* (append globals (lib:idb:ids imported-globals)))
(let ((compiled-program-lst '()) (let ((compiled-program-lst '())
(compiled-program #f)) (compiled-program #f))
;; Compile program, using for-each to guarantee execution order, ;; Compile program, using for-each to guarantee execution order,
@ -1385,7 +1385,7 @@
(emits "extern object ") (emits "extern object ")
(emits (mangle-global global)) (emits (mangle-global global))
(emits ";\n")) (emits ";\n"))
imported-globals) (lib:idb:ids imported-globals))
(emit "#include \"cyclone/runtime.h\"") (emit "#include \"cyclone/runtime.h\"")
(if program? (if program?