Rope from stream (#2)

Make a rope from streams or pathnames

Author: garlic0x1

rope.lisp

@@ -36,9 +36,22 @@
 ;;-------;;
 
 (defgeneric make-rope (source)
-  (:documentation "Create a new rope from a string.")
+  (:documentation "Create a new rope from a string, stream, or pathname.")
   (:method ((source rope))
     source)
+  (:method ((source stream))
+    (labels ((read-leaves (&optional acc)
+               (let* ((string (make-string *long-leaf*))
+                      (length (read-sequence string source))
+                      (leaf (make-instance 'leaf :length length :string (subseq string 0 length))))
+                 (if (= *long-leaf* length)
+                     (read-leaves (cons leaf acc))
+                     (cons leaf acc)))))
+      (let ((leaves (nreverse (read-leaves))))
+        (merge-leaves leaves 0 (length leaves)))))
+  (:method ((source pathname))
+    (with-open-file (s source)
+      (make-rope s)))
   (:method ((source string))
     (let ((length (length source)))
       (if (<= *long-leaf* length)

test/basic.lisp

@@ -45,3 +45,12 @@ can be done efficiently.")
   (let* ((rope (rope:make-rope "0123456789")))
     (is (string= #\1 (rope:index-rope rope 1)))
     (is (string= #\9 (rope:index-rope rope 9)))))
+
+(deftest read-files-and-streams ()
+  "Test reading a file to a rope."
+  (let* ((pathname (merge-pathnames "README.md" (asdf:system-source-directory :rope)))
+         (rope (rope:make-rope pathname)))
+    (is (string= (uiop:read-file-string pathname) (rope:write-rope rope nil))))
+  (let* ((stream (make-string-input-stream *string-2*))
+         (rope (rope:make-rope stream)))
+    (is (string= *string-2* (rope:write-rope rope nil)))))