Make statement sink take a statement rather than nodes

This makes the interface more extensible, towards associating more information
with statements.  The serd_sink_write_nodes wrapper remains so that user code
does not need to allocate in order to write statement.

6 files changed, 42 insertions, 58 deletions

diff --git a/serd/serd.h b/serd/serd.h
index 0429cefb..382506f7 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -777,12 +777,9 @@ typedef SerdStatus (*SerdPrefixSink)(void*           handle,
 
    Called for every RDF statement in the serialisation.
 */
-typedef SerdStatus (*SerdStatementSink)(void*              handle,
-                                        SerdStatementFlags flags,
-                                        const SerdNode*    graph,
-                                        const SerdNode*    subject,
-                                        const SerdNode*    predicate,
-                                        const SerdNode*    object);
+typedef SerdStatus (*SerdStatementSink)(void*                handle,
+                                        SerdStatementFlags   flags,
+                                        const SerdStatement* statement);
 
 /**
    Sink (callback) for anonymous node end markers.
diff --git a/src/reader.c b/src/reader.c
index 065a6040..1bca81ac 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -18,6 +18,7 @@
 #include "system.h"
 
 #include "serd_internal.h"
+#include "statement.h"
 #include "world.h"
 
 #include <errno.h>
@@ -119,15 +120,15 @@ emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o)
 	   (subject and predicate) were already zeroed by subsequent pushes. */
 	serd_node_zero_pad(o);
 
-	const SerdStatus st =
-	    !reader->sink->statement
-	        ? SERD_SUCCESS
-	        : reader->sink->statement(reader->sink->handle,
-	                                  *ctx.flags,
-	                                  graph,
-	                                  ctx.subject,
-	                                  ctx.predicate,
-	                                  o);
+	const SerdStatement statement = {
+		{ ctx.subject, ctx.predicate, o, graph }
+	};
+
+	const SerdStatus st = !reader->sink->statement
+	                          ? SERD_SUCCESS
+	                          : reader->sink->statement(reader->sink->handle,
+	                                                    *ctx.flags,
+	                                                    &statement);
 
 	*ctx.flags &= SERD_ANON_CONT|SERD_LIST_CONT;  // Preserve only cont flags
 	return st;
diff --git a/src/sink.c b/src/sink.c
index d025520b..1c5c500f 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -16,6 +16,8 @@
 
 #include "serd/serd.h"
 
+#include "statement.h"
+
 SerdStatus
 serd_sink_write_base(const SerdSink* sink, const SerdNode* uri)
 {
@@ -35,12 +37,7 @@ serd_sink_write_statement(const SerdSink*          sink,
                           const SerdStatementFlags flags,
                           const SerdStatement*     statement)
 {
-	return sink->statement(sink->handle,
-	                       flags,
-	                       serd_statement_graph(statement),
-	                       serd_statement_subject(statement),
-	                       serd_statement_predicate(statement),
-	                       serd_statement_object(statement));
+	return sink->statement(sink->handle, flags, statement);
 }
 
 SerdStatus
@@ -51,8 +48,8 @@ serd_sink_write(const SerdSink*          sink,
                 const SerdNode*          object,
                 const SerdNode*          graph)
 {
-	return sink->statement(
-	        sink->handle, flags, graph, subject, predicate, object);
+	const SerdStatement statement = { { subject, predicate, object, graph } };
+	return sink->statement(sink->handle, flags, &statement);
 }
 
 SerdStatus
diff --git a/src/writer.c b/src/writer.c
index 5e2e2976..f376e86e 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -684,13 +684,15 @@ write_list_obj(SerdWriter*        writer,
 }
 
 static SerdStatus
-serd_writer_write_statement(SerdWriter*        writer,
-                            SerdStatementFlags flags,
-                            const SerdNode*    graph,
-                            const SerdNode*    subject,
-                            const SerdNode*    predicate,
-                            const SerdNode*    object)
+serd_writer_write_statement(SerdWriter*          writer,
+                            SerdStatementFlags   flags,
+                            const SerdStatement* statement)
 {
+	const SerdNode* const subject   = serd_statement_subject(statement);
+	const SerdNode* const predicate = serd_statement_predicate(statement);
+	const SerdNode* const object    = serd_statement_object(statement);
+	const SerdNode* const graph     = serd_statement_graph(statement);
+
 	if (!subject || !predicate || !object ||
 	    !is_resource(subject) || !is_resource(predicate)) {
 		return SERD_ERR_BAD_ARG;
diff --git a/tests/read_chunk_test.c b/tests/read_chunk_test.c
index 9fa40bab..7abd865f 100644
--- a/tests/read_chunk_test.c
+++ b/tests/read_chunk_test.c
@@ -48,19 +48,13 @@ on_prefix(void* handle, const SerdNode* name, const SerdNode* uri)
 }
 
 static SerdStatus
-on_statement(void*              handle,
-             SerdStatementFlags flags,
-             const SerdNode*    graph,
-             const SerdNode*    subject,
-             const SerdNode*    predicate,
-             const SerdNode*    object)
+on_statement(void*                handle,
+             SerdStatementFlags   flags,
+             const SerdStatement* statement)
 {
 	(void)handle;
 	(void)flags;
-	(void)graph;
-	(void)subject;
-	(void)predicate;
-	(void)object;
+	(void)statement;
 
 	++n_statement;
 	return SERD_SUCCESS;
diff --git a/tests/serd_test.c b/tests/serd_test.c
index 859ba088..2f0a3b07 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -56,21 +56,16 @@ typedef struct {
 } ReaderTest;
 
 static SerdStatus
-test_sink(void*              handle,
-          SerdStatementFlags flags,
-          const SerdNode*    graph,
-          const SerdNode*    subject,
-          const SerdNode*    predicate,
-          const SerdNode*    object)
+test_sink(void*                handle,
+          SerdStatementFlags   flags,
+          const SerdStatement* statement)
 {
 	(void)flags;
-	(void)subject;
-	(void)predicate;
-	(void)object;
+	(void)statement;
 
 	ReaderTest* rt = (ReaderTest*)handle;
 	++rt->n_statements;
-	rt->graph = graph;
+	rt->graph = serd_statement_graph(statement);
 	return SERD_SUCCESS;
 }
 
@@ -615,9 +610,8 @@ test_writer(const char* const path)
 	                              { s,    p,    NULL },
 	                              { NULL, NULL, NULL } };
 	for (size_t i = 0; i < sizeof(junk) / (sizeof(SerdNode*) * 5); ++i) {
-		assert(iface->statement(
-			       iface->handle, 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], 0));
 	}
 
 	SerdNode* urn_Type = serd_node_new_uri("urn:Type");
@@ -635,24 +629,23 @@ test_writer(const char* const path)
 	                              { s, p, o },
 	                              { s, p, o } };
 	for (size_t i = 0; i < sizeof(good) / (sizeof(SerdNode*) * 5); ++i) {
-		assert(!iface->statement(
-		        iface->handle, 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], 0));
 	}
 
 	// Write statements with bad UTF-8 (should be replaced)
 	const char bad_str[] = { (char)0xFF, (char)0x90, 'h', 'i', 0 };
 	SerdNode*  bad_lit   = serd_node_new_string(bad_str);
 	SerdNode*  bad_uri   = serd_node_new_uri(bad_str);
-	assert(!iface->statement(iface->handle, 0, NULL, s, p, bad_lit));
-	assert(!iface->statement(iface->handle, 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_node_new_string("hello");
-	assert(!iface->statement(iface->handle, 0, NULL, s, p, o));
+	assert(!serd_sink_write(iface, 0, s, p, o, 0));
 
 	serd_writer_free(writer);
 	serd_node_free(lit);