~ chicken-core (chicken-5) 00e7d9812dda4210715bb3cb0e70325d98592bca
commit 00e7d9812dda4210715bb3cb0e70325d98592bca
Author: Evan Hanson <evhan@foldling.org>
AuthorDate: Tue Sep 5 22:31:14 2017 +1200
Commit: Evan Hanson <evhan@foldling.org>
CommitDate: Tue Sep 5 22:31:14 2017 +1200
Drop unused return value from `##sys#process-require'
diff --git a/core.scm b/core.scm
index 0229dd9c..5fff8df5 100644
--- a/core.scm
+++ b/core.scm
@@ -700,12 +700,12 @@
((##core#require)
(let ((id (cadr x))
(alternates (cddr x)))
- (let-values (((exp found type)
- (##sys#process-require
- id #t
- alternates provided
- static-extensions
- register-static-extension)))
+ (let-values (((exp type)
+ (##sys#process-require
+ id #t
+ alternates provided
+ static-extensions
+ register-static-extension)))
(unless (not type)
(hash-table-update!
file-requirements type
diff --git a/eval.scm b/eval.scm
index 69182c00..f6ffd287 100644
--- a/eval.scm
+++ b/eval.scm
@@ -590,7 +590,7 @@
[(##core#require)
(let ((id (cadr x))
(alternates (cddr x)))
- (let-values (((exp _ _) (##sys#process-require id #f alternates)))
+ (let-values (((exp _) (##sys#process-require id #f alternates)))
(compile exp e #f tf cntr se #f)))]
[(##core#elaborationtimeonly ##core#elaborationtimetoo) ; <- Note this!
@@ -1302,36 +1302,32 @@
;; Given a library specification, returns three values:
;;
;; - an expression for loading the library, if required
-;; - a library id if the library was found, #f otherwise
;; - a requirement type (e.g. 'dynamic) or #f if provided in core
;;
(define (##sys#process-require lib #!optional compiling? (alternates '()) (provided '()) static? mark-static)
(let ((id (library-id lib)))
(cond
((assq id core-unit-requirements) =>
- (lambda (x) (values (cdr x) id #f)))
+ (lambda (x) (values (cdr x) #f)))
((memq id builtin-features)
- (values '(##core#undefined) id #f))
+ (values '(##core#undefined) #f))
((memq id provided)
- (values '(##core#undefined) id #f))
+ (values '(##core#undefined) #f))
((any (cut memq <> provided) alternates)
- (values '(##core#undefined) id #f))
+ (values '(##core#undefined) #f))
((memq id core-units)
- (values
- (if compiling?
- `(##core#declare (uses ,id))
- `(##sys#load-library (##core#quote ,id)))
- id #f))
+ (if compiling?
+ (values `(##core#declare (uses ,id)) #f)
+ (values `(##sys#load-library (##core#quote ,id)) #f)))
((and compiling? static? (find-static-extension id)) =>
(lambda (path)
- (mark-static id path)
- (values `(##core#declare (uses ,id)) id 'static)))
+ (mark-static id path)
+ (values `(##core#declare (uses ,id)) 'static)))
(else
(values `(chicken.load#load-extension
(##core#quote ,id)
(##core#quote ,alternates)
(##core#quote require))
- #f
'dynamic)))))
;;; Find included file:
Trap