Make environments and sinks part of the world

Although functions/components that require minimal pre-existing state are nice,
these allocate memory and could potentially share resources.  So, give them a
pointer to a world which can be used to configure such things.  In particular,
this is working towards supporting custom allocators everywhere.

1 files changed, 19 insertions, 14 deletions

diff --git a/test/test_reader.c b/test/test_reader.c
index d9edc294..80d9533b 100644
--- a/test/test_reader.c
+++ b/test/test_reader.c
@@ -62,10 +62,12 @@ test_prepare_error(void)
   size_t           n_statements = 0;
   FILE* const      f            = tmpfile();
 
-  SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+  SerdSink* const sink =
+    serd_sink_new(world, &n_statements, count_statements, NULL);
+
   assert(sink);
 
-  SerdEnv* const    env = serd_env_new(SERD_EMPTY_STRING());
+  SerdEnv* const    env = serd_env_new(world, SERD_EMPTY_STRING());
   SerdReader* const reader =
     serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
 
@@ -94,10 +96,10 @@ test_read_string(void)
   SerdWorld* world        = serd_world_new();
   size_t     n_statements = 0;
 
-  SerdSink* sink = serd_sink_new(&n_statements, count_statements, NULL);
+  SerdSink* sink = serd_sink_new(world, &n_statements, count_statements, NULL);
   assert(sink);
 
-  SerdEnv* const    env = serd_env_new(SERD_EMPTY_STRING());
+  SerdEnv* const    env = serd_env_new(world, SERD_EMPTY_STRING());
   SerdReader* const reader =
     serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
 
@@ -196,8 +198,8 @@ test_read_eof_by_page(void)
 
   SerdWorld* world   = serd_world_new();
   size_t     ignored = 0u;
-  SerdSink*  sink    = serd_sink_new(&ignored, count_statements, NULL);
-  SerdEnv*   env     = serd_env_new(SERD_EMPTY_STRING());
+  SerdSink*  sink    = serd_sink_new(world, &ignored, count_statements, NULL);
+  SerdEnv*   env     = serd_env_new(world, SERD_EMPTY_STRING());
 
   SerdReader* reader = serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
 
@@ -224,8 +226,8 @@ test_read_eof_by_byte(void)
 {
   SerdWorld* world   = serd_world_new();
   size_t     ignored = 0u;
-  SerdSink*  sink    = serd_sink_new(&ignored, count_statements, NULL);
-  SerdEnv*   env     = serd_env_new(SERD_EMPTY_STRING());
+  SerdSink*  sink    = serd_sink_new(world, &ignored, count_statements, NULL);
+  SerdEnv*   env     = serd_env_new(world, SERD_EMPTY_STRING());
 
   SerdReader* reader = serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
 
@@ -255,10 +257,12 @@ test_read_chunks(void)
   FILE* const       f            = tmpfile();
   static const char null         = 0;
 
-  SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+  SerdSink* const sink =
+    serd_sink_new(world, &n_statements, count_statements, NULL);
+
   assert(sink);
 
-  SerdEnv* const    env = serd_env_new(SERD_EMPTY_STRING());
+  SerdEnv* const    env = serd_env_new(world, SERD_EMPTY_STRING());
   SerdReader* const reader =
     serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
 
@@ -324,10 +328,11 @@ test_read_empty(void)
   size_t           n_statements = 0;
   FILE* const      f            = tmpfile();
 
-  SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+  SerdSink* const sink =
+    serd_sink_new(world, &n_statements, count_statements, NULL);
   assert(sink);
 
-  SerdEnv* const    env = serd_env_new(SERD_EMPTY_STRING());
+  SerdEnv* const    env = serd_env_new(world, SERD_EMPTY_STRING());
   SerdReader* const reader =
     serd_reader_new(world, SERD_SYNTAX_EMPTY, 0, env, sink, 4096);
 
@@ -374,8 +379,8 @@ test_error_cursor(void)
 {
   SerdWorld*        world  = serd_world_new();
   bool              called = false;
-  SerdSink*         sink   = serd_sink_new(&called, check_cursor, NULL);
-  SerdEnv* const    env    = serd_env_new(SERD_EMPTY_STRING());
+  SerdSink*         sink   = serd_sink_new(world, &called, check_cursor, NULL);
+  SerdEnv* const    env    = serd_env_new(world, SERD_EMPTY_STRING());
   SerdReader* const reader =
     serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);