Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-19 05:39:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename new idb functions

Browse source
This commit is contained in:
Justin Ethier 2016-10-11 03:19:22 -04:00
parent 298102c261
commit d4d02cc2b9
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scheme/cyclone/libraries.sld
View file

@ -54,8 +54,8 @@
lib:idb:ids lib:idb:ids
lib:idb:id->import lib:idb:id->import
lib:idb:lookup lib:idb:lookup
lib:idb:entry:->library-name lib:idb:entry->library-name
lib:idb:entry:->library-id lib:idb:entry->library-id
) )
(begin (begin
@ -396,9 +396,11 @@
(lambda (entry) (lambda (entry)
(cond (cond
;; Normal identifier, no renaming ;; Normal identifier, no renaming
((equal? identifier (car entry)) (return entry)) ((equal? identifier (car entry))
(return entry))
;; Identifier was renamed by an import set ;; Identifier was renamed by an import set
((equal? identifier (caar entry)) ((and (pair? (car entry))
(equal? identifier (caar entry)))
(return entry)) (return entry))
;; Keep going ;; Keep going
(else #f))) (else #f)))
@ -406,14 +408,14 @@
(return #f)))) (return #f))))
;; Take an idb entry and find the library that imported it ;; Take an idb entry and find the library that imported it
(define (lib:idb:entry:->library-name entry) (define (lib:idb:entry->library-name entry)
(if entry (if entry
(cdr entry) (cdr entry)
#f)) #f))
;; Take an idb entry and find the original identifier for it, ;; Take an idb entry and find the original identifier for it,
;; that is part of the library definition. ;; that is part of the library definition.
(define (lib:idb:entry:->library-id entry) (define (lib:idb:entry->library-id entry)
(if (pair? entry) (if (pair? entry)
(cond (cond
;; ID was renamed by an import set ;; ID was renamed by an import set