diff options
| -rw-r--r-- | serd/serd.h | 9 | ||||
| -rw-r--r-- | src/reader.c | 8 | ||||
| -rw-r--r-- | src/sink.c | 13 | ||||
| -rw-r--r-- | src/writer.c | 14 | ||||
| -rw-r--r-- | tests/serd_test.c | 31 |
5 files changed, 34 insertions, 41 deletions
diff --git a/serd/serd.h b/serd/serd.h index e25d3b37..ef8153ff 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -767,12 +767,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 ee27a2fb..40c48a41 100644 --- a/src/reader.c +++ b/src/reader.c @@ -21,6 +21,7 @@ #include "serd/serd.h" #include "serd_internal.h" #include "stack.h" +#include "statement.h" #include "system.h" #include "world.h" @@ -125,9 +126,12 @@ emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o) (subject and predicate) were already zeroed by subsequent pushes. */ serd_node_zero_pad(o); + const SerdStatement statement = { + { ctx.subject, ctx.predicate, o, graph } + }; + const SerdStatus st = reader->sink->statement( - reader->sink->handle, *ctx.flags, graph, - ctx.subject, ctx.predicate, o); + reader->sink->handle, *ctx.flags, &statement); *ctx.flags &= SERD_ANON_CONT|SERD_LIST_CONT; // Preserve only cont flags return st; } @@ -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_get_graph(statement), - serd_statement_get_subject(statement), - serd_statement_get_predicate(statement), - serd_statement_get_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 b58260a1..692139a6 100644 --- a/src/writer.c +++ b/src/writer.c @@ -685,13 +685,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_get_subject(statement); + const SerdNode* const predicate = serd_statement_get_predicate(statement); + const SerdNode* const object = serd_statement_get_object(statement); + const SerdNode* const graph = serd_statement_get_graph(statement); + if (!subject || !predicate || !object || !is_resource(subject) || !is_resource(predicate)) { return SERD_ERR_BAD_ARG; diff --git a/tests/serd_test.c b/tests/serd_test.c index d9fc1388..2f932f51 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -68,21 +68,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_get_graph(statement); return SERD_SUCCESS; } @@ -502,9 +497,8 @@ main(void) { s, p, NULL }, { NULL, NULL, NULL } }; for (unsigned 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"); @@ -522,24 +516,23 @@ main(void) { s, p, o }, { s, p, o } }; for (unsigned 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); |