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

Fixes for library dependencies

Browse source
This commit is contained in:
Justin Ethier 2015-05-22 21:17:09 -04:00
parent ab9ba2618a
commit ad9f8aabb8
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cyclone.scm
View file

@ -223,7 +223,7 @@
(lib-deps (lib-deps
(if (and program? (if (and program?
(tagged-list? 'import (car in-prog))) (tagged-list? 'import (car in-prog)))
(delete-duplicates (lib:get-all-import-deps (cdar in-prog))) (lib:get-all-import-deps (cdar in-prog))
'())) '()))
(exec-file (basename in-file)) (exec-file (basename in-file))
(src-file (string-append exec-file ".c")) (src-file (string-append exec-file ".c"))

8
trans.scm
View file

@ -1565,6 +1565,9 @@
;; A quicky-and-dirty (for now) implementation of r7rs libraries ;; A quicky-and-dirty (for now) implementation of r7rs libraries
;; TODO: relocate this somewhere else, once it works. Ideally ;; TODO: relocate this somewhere else, once it works. Ideally
;; somewhere accessible to the interpreter ;; somewhere accessible to the interpreter
;; TODO: go through functions and ensure consistent naming conventions.
;; probably should also clean up some of the function names, this is
;; not a very clean or nice API at the moment.
(define (library? ast) (define (library? ast)
(tagged-list? 'define-library ast)) (tagged-list? 'define-library ast))
@ -1695,7 +1698,7 @@
;; The list of deps is intended to be returned in order, such that the ;; The list of deps is intended to be returned in order, such that the
;; libraries can be initialized properly in sequence. ;; libraries can be initialized properly in sequence.
(define (lib:get-all-import-deps imports) (define (lib:get-all-import-deps imports)
(let* ((libraries/deps '()) (letrec ((libraries/deps '())
(find-deps! (find-deps!
(lambda (import-set) (lambda (import-set)
(for-each (for-each
@ -1706,6 +1709,7 @@
;; Find all dependencies of i (IE, libraries it imports) ;; Find all dependencies of i (IE, libraries it imports)
(let ((deps (lib:read-imports i))) (let ((deps (lib:read-imports i)))
(set! libraries/deps (cons (cons i deps) libraries/deps)) (set! libraries/deps (cons (cons i deps) libraries/deps))
(find-deps! deps)
)))) ))))
import-set)))) import-set))))
(find-deps! imports) (find-deps! imports)
@ -1757,7 +1761,7 @@
(loop (+ i 1))))) (loop (+ i 1)))))
(loop 0) (loop 0)
(pp `(JAE DEBUG ,result ,lib/dep ,idx-imports-me ,idx-my-imports)) ;(pp `(JAE DEBUG ,result ,lib/dep ,idx-imports-me ,idx-my-imports))
(if (<= idx-my-imports idx-imports-me) (if (<= idx-my-imports idx-imports-me)
(list-insert-at! result lib/dep (list-insert-at! result lib/dep
(if (= idx-my-imports idx-imports-me) (if (= idx-my-imports idx-imports-me)