From 5e3244fa9d2ed3e8ab47f42f4a1ad799c64e10a6 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Tue, 26 Dec 2017 18:08:31 -0500
Subject: [PATCH] Allow importing (cyclone ...) libraries from a relative path

---
 scheme/cyclone/libraries.sld | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/scheme/cyclone/libraries.sld b/scheme/cyclone/libraries.sld
index 60ec7319..54a4a4d9 100644
--- a/scheme/cyclone/libraries.sld
+++ b/scheme/cyclone/libraries.sld
@@ -15,6 +15,7 @@
 ;;;;
 (define-library (scheme cyclone libraries)
   (import (scheme base)
+          ;; Debugging: (scheme write)
           (scheme read)
           (scheme process-context)
           (scheme cyclone util)
@@ -273,8 +274,8 @@
          (dir (if (or (tagged-list? 'scheme import)
                       (tagged-list? 'srfi import)
                       (tagged-list? 'cyclone import))
-                  (Cyc-installation-dir 'sld)
-                  "./")))
+                  (list (Cyc-installation-dir 'sld) "./")
+                  (list "./"))))
     (call/cc
       (lambda (return)
         (for-each
@@ -282,11 +283,11 @@
             (let ((f (string-append path "/" filename)))
               (if (file-exists? f) 
                   (return f))))
-          (append prepend-dirs (list dir) append-dirs))
+          (append prepend-dirs dir append-dirs))
         ;; Not found, just return base name
         (lib:check-system-path
-          (if (> (string-length dir) 0)
-              (string-append dir "/" filename)
+          (if (> (length dir) 0)
+              (string-append (car dir) "/" filename)
               filename))))
   ))
 
@@ -306,20 +307,22 @@
                       ;(tagged-list? 'srfi import)
                       (tagged-list? 'cyclone import)
                   )
-                  (Cyc-installation-dir 'sld)
-                  "")))
+                  (list (Cyc-installation-dir 'sld) "./")
+                  (list "./"))))
     (call/cc
       (lambda (return)
         (for-each
           (lambda (path)
             (let ((f (string-append path "/" filename)))
+              ;(write `(DEBUG ,path ,f ,(file-exists? f)))
+              ;(newline)
               (if (file-exists? f) 
                   (return f))))
-          (append prepend-dirs (list dir) append-dirs))
+          (append prepend-dirs dir append-dirs))
         ;; Not found, just return base name
         (lib:check-system-path
-          (if (> (string-length dir) 0)
-              (string-append dir "/" filename)
+          (if (> (string-length (car dir)) 0)
+              (string-append (car dir) "/" filename)
               filename))))
     ;(if (tagged-list? 'scheme import)
     ;  (string-append (Cyc-installation-dir 'sld) "/" path) ;; Built-in library