feat: interfaces of newick io more general. can now take arbitrary readers/writers

2 files changed, 6 insertions, 5 deletions

diff --git a/include/libbio.h b/include/libbio.h
index 9f54015..3cdab4e 100644
--- a/include/libbio.h
+++ b/include/libbio.h
@@ -25,16 +25,17 @@ typedef struct bio·Tree
 } bio·Tree;
 
 /* newick i/o */
-bio·Tree bio·readnewick(Stream *file, mem·Allocator heap);
-error    bio·writenewick(bio·Tree tree, Stream *out);
+bio·Tree bio·readnewick(io·Peeker stream, mem·Allocator heap);
+error    bio·writenewick(bio·Tree tree, io·Putter out);
 
 // -----------------------------------------------------------------------
 // Sequences
 
+#if 0
 typedef struct bio·FastaReader bio·FastaReader;
 
 /* fasta/q i/o */
 bio·Seq *bio·newfastareader(Stream *file, mem·Allocator heap);
 bio·Seq *bio·readfasta(bio·FastaParser *p);
 error    bio·writefasta(bio·Seq *seq, Stream *out);
-
+#endif
diff --git a/include/libn.h b/include/libn.h
index 67d131d..d2479e4 100644
--- a/include/libn.h
+++ b/include/libn.h
@@ -112,13 +112,13 @@ int     io·seek(Stream *s, long off, enum SeekPos origin);
 typedef struct io·Reader
 {
     int (*read)(int n, void *buf);
-};
+} io·Reader;
 
 typedef struct io·Peeker
 {
     byte  (*get)(void);
     error (*unget)(byte);
-};
+} io·Peeker;
 
 typedef struct io·FullReader
 {