Add SerdSink interface and hide implementations

3 files changed, 45 insertions, 29 deletions

diff --git a/test/test_free_null.c b/test/test_free_null.c
index 99e0be1d..af1ae149 100644
--- a/test/test_free_null.c
+++ b/test/test_free_null.c
@@ -26,6 +26,7 @@ main(void)
   serd_free(NULL);
   serd_node_free(NULL);
   serd_env_free(NULL);
+  serd_sink_free(NULL);
   serd_reader_free(NULL);
   serd_writer_free(NULL);
 
diff --git a/test/test_read_chunk.c b/test/test_read_chunk.c
index 76e9b642..c4e267f3 100644
--- a/test/test_read_chunk.c
+++ b/test/test_read_chunk.c
@@ -79,8 +79,13 @@ on_end(void* handle, const SerdNode* node)
 int
 main(void)
 {
-  SerdReader* reader = serd_reader_new(
-    SERD_TURTLE, NULL, NULL, on_base, on_prefix, on_statement, on_end);
+  SerdSink* sink = serd_sink_new(NULL, NULL);
+  serd_sink_set_base_func(sink, on_base);
+  serd_sink_set_prefix_func(sink, on_prefix);
+  serd_sink_set_statement_func(sink, on_statement);
+  serd_sink_set_end_func(sink, on_end);
+
+  SerdReader* reader = serd_reader_new(SERD_TURTLE, sink);
   assert(reader);
 
   assert(!serd_reader_start_string(reader,
@@ -106,5 +111,6 @@ main(void)
   assert(!serd_reader_end_stream(reader));
 
   serd_reader_free(reader);
+  serd_sink_free(sink);
   return 0;
 }
diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index 91e95806..8f80deee 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -78,15 +78,16 @@ eof_test_error(void* stream)
 static void
 test_read_chunks(void)
 {
-  ReaderTest* const rt   = (ReaderTest*)calloc(1, sizeof(ReaderTest));
-  FILE* const       f    = tmpfile();
-  static const char null = 0;
-  SerdReader* const reader =
-    serd_reader_new(SERD_TURTLE, rt, free, NULL, NULL, test_sink, NULL);
+  ReaderTest* const rt     = (ReaderTest*)calloc(1, sizeof(ReaderTest));
+  FILE* const       f      = tmpfile();
+  static const char null   = 0;
+  SerdSink*         sink   = serd_sink_new(rt, NULL);
+  SerdReader*       reader = serd_reader_new(SERD_TURTLE, sink);
 
   assert(reader);
-  assert(serd_reader_handle(reader) == rt);
+  assert(sink);
   assert(f);
+  serd_sink_set_statement_func(sink, test_sink);
 
   SerdStatus st = serd_reader_start_stream(
     reader, (SerdReadFunc)fread, (SerdStreamErrorFunc)ferror, f, NULL, 1);
@@ -131,18 +132,22 @@ test_read_chunks(void)
   assert(rt->n_statements == 2);
 
   serd_reader_free(reader);
+  serd_sink_free(sink);
   fclose(f);
+  free(rt);
 }
 
 static void
 test_read_string(void)
 {
-  ReaderTest* rt = (ReaderTest*)calloc(1, sizeof(ReaderTest));
-  SerdReader* reader =
-    serd_reader_new(SERD_TURTLE, rt, free, NULL, NULL, test_sink, NULL);
+  ReaderTest* rt     = (ReaderTest*)calloc(1, sizeof(ReaderTest));
+  SerdSink*   sink   = serd_sink_new(rt, NULL);
+  SerdReader* reader = serd_reader_new(SERD_TURTLE, sink);
 
   assert(reader);
-  assert(serd_reader_handle(reader) == rt);
+  assert(sink);
+
+  serd_sink_set_statement_func(sink, test_sink);
 
   // Test reading a string that ends exactly at the end of input (no newline)
   const SerdStatus st =
@@ -154,6 +159,8 @@ test_read_string(void)
   assert(rt->n_statements == 1);
 
   serd_reader_free(reader);
+  serd_sink_free(sink);
+  free(rt);
 }
 
 static void
@@ -172,9 +179,9 @@ test_writer(const char* const path)
 
   SerdNode* lit = serd_new_string(SERD_STATIC_STRING("hello"));
 
-  assert(serd_writer_set_base_uri(writer, lit));
-  assert(serd_writer_set_prefix(writer, lit, lit));
-  assert(serd_writer_end_anon(writer, NULL));
+  const SerdSink* const iface = serd_writer_sink(writer);
+  assert(serd_sink_write_base(iface, lit));
+  assert(serd_sink_write_prefix(iface, lit, lit));
   assert(serd_writer_env(writer) == env);
 
   static const uint8_t buf[]    = {0xEF, 0xBF, 0xBD, 0};
@@ -187,8 +194,7 @@ test_writer(const char* const path)
   // Write 3 invalid statements (should write nothing)
   const SerdNode* junk[][3] = {{s, o, o}, {o, p, o}, {s, o, p}};
   for (size_t i = 0; i < sizeof(junk) / (sizeof(SerdNode*) * 3); ++i) {
-    assert(serd_writer_write_statement(
-      writer, 0, NULL, junk[i][0], junk[i][1], junk[i][2]));
+    assert(serd_sink_write(iface, 0, junk[i][0], junk[i][1], junk[i][2], NULL));
   }
 
   static const SerdStringView empty    = SERD_EMPTY_STRING();
@@ -200,8 +206,8 @@ test_writer(const char* const path)
   const SerdNode* good[][3] = {{s, p, o}, {s, p, t}, {s, p, l}};
 
   for (size_t i = 0; i < sizeof(good) / (sizeof(SerdNode*) * 3); ++i) {
-    assert(!serd_writer_write_statement(
-      writer, 0, NULL, good[i][0], good[i][1], good[i][2]));
+    assert(
+      !serd_sink_write(iface, 0, good[i][0], good[i][1], good[i][2], NULL));
   }
 
   // Write statements with bad UTF-8 (should be replaced)
@@ -209,16 +215,15 @@ test_writer(const char* const path)
   const SerdStringView bad_view  = {(const char*)bad_str, 4};
   SerdNode*            bad_lit   = serd_new_string(bad_view);
   SerdNode*            bad_uri   = serd_new_uri(bad_view);
-  assert(!serd_writer_write_statement(writer, 0, NULL, s, p, bad_lit));
-  assert(!serd_writer_write_statement(writer, 0, NULL, s, p, bad_uri));
-
+  assert(!serd_sink_write(iface, 0, s, p, bad_lit, 0));
+  assert(!serd_sink_write(iface, 0, s, p, bad_uri, 0));
   serd_node_free(bad_uri);
   serd_node_free(bad_lit);
 
   // Write 1 valid statement
-  serd_node_free(o);
-  o = serd_new_string(SERD_STATIC_STRING("hello"));
-  assert(!serd_writer_write_statement(writer, 0, NULL, s, p, o));
+  SerdNode* const hello = serd_new_string(SERD_STATIC_STRING("hello"));
+  assert(!serd_sink_write(iface, 0, s, p, hello, 0));
+  serd_node_free(hello);
 
   serd_writer_free(writer);
   serd_node_free(lit);
@@ -252,11 +257,13 @@ test_writer(const char* const path)
 static void
 test_reader(const char* path)
 {
-  ReaderTest* rt = (ReaderTest*)calloc(1, sizeof(ReaderTest));
-  SerdReader* reader =
-    serd_reader_new(SERD_TURTLE, rt, free, NULL, NULL, test_sink, NULL);
+  ReaderTest*     rt     = (ReaderTest*)calloc(1, sizeof(ReaderTest));
+  SerdSink* const sink   = serd_sink_new(rt, NULL);
+  SerdReader*     reader = serd_reader_new(SERD_TURTLE, sink);
+
+  assert(sink);
   assert(reader);
-  assert(serd_reader_handle(reader) == rt);
+  serd_sink_set_statement_func(sink, test_sink);
 
   SerdNode* g = serd_new_uri(SERD_STATIC_STRING("http://example.org/"));
   serd_reader_set_default_graph(reader, g);
@@ -325,6 +332,8 @@ test_reader(const char* path)
   }
 
   serd_reader_free(reader);
+  serd_sink_free(sink);
+  free(rt);
 }
 
 int