From 79bd5c789631ea51071564813046e34b304e1bc7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 10 May 2018 19:29:22 +0200 Subject: Add SerdSink interface and hide individual function implementations --- src/n3.c | 16 ++++++++-------- src/reader.c | 51 ++++++++++++++++----------------------------------- src/reader.h | 7 +------ src/serdi.c | 8 ++------ src/writer.c | 23 +++++++++++++++++++++-- 5 files changed, 48 insertions(+), 57 deletions(-) (limited to 'src') diff --git a/src/n3.c b/src/n3.c index 6c904c1a..37976f58 100644 --- a/src/n3.c +++ b/src/n3.c @@ -1037,8 +1037,8 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest) return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n"); } read_ws_star(reader); - if (reader->end_sink) { - reader->end_sink(reader->handle, deref(reader, *dest)); + if (reader->sink->end) { + reader->sink->end(reader->sink->handle, deref(reader, *dest)); } *ctx.flags = old_flags; } @@ -1358,8 +1358,8 @@ read_base(SerdReader* reader, bool sparql, bool token) Ref uri = 0; TRY(st, read_IRIREF(reader, &uri)); - if (reader->base_sink) { - TRY(st, reader->base_sink(reader->handle, deref(reader, uri))); + if (reader->sink->base) { + TRY(st, reader->sink->base(reader->sink->handle, deref(reader, uri))); } pop_node(reader, uri); @@ -1396,10 +1396,10 @@ read_prefixID(SerdReader* reader, bool sparql, bool token) Ref uri = 0; TRY(st, read_IRIREF(reader, &uri)); - if (reader->prefix_sink) { - st = reader->prefix_sink(reader->handle, - deref(reader, name), - deref(reader, uri)); + if (reader->sink->prefix) { + st = reader->sink->prefix(reader->sink->handle, + deref(reader, name), + deref(reader, uri)); } pop_node(reader, uri); pop_node(reader, name); diff --git a/src/reader.c b/src/reader.c index e58982c0..0f097a02 100644 --- a/src/reader.c +++ b/src/reader.c @@ -124,14 +124,14 @@ emit_statement(SerdReader* reader, ReadContext ctx, Ref o) } const SerdStatus st = - !reader->statement_sink + !reader->sink->statement ? SERD_SUCCESS - : reader->statement_sink(reader->handle, - *ctx.flags, - graph, - deref(reader, ctx.subject), - deref(reader, ctx.predicate), - deref(reader, o)); + : reader->sink->statement(reader->sink->handle, + *ctx.flags, + graph, + deref(reader, ctx.subject), + deref(reader, ctx.predicate), + deref(reader, o)); *ctx.flags &= SERD_ANON_CONT|SERD_LIST_CONT; // Preserve only cont flags return st; @@ -158,26 +158,16 @@ serd_reader_read_document(SerdReader* reader) } SerdReader* -serd_reader_new(SerdSyntax syntax, - void* handle, - void (*free_handle)(void*), - SerdBaseSink base_sink, - SerdPrefixSink prefix_sink, - SerdStatementSink statement_sink, - SerdEndSink end_sink) +serd_reader_new(SerdSyntax syntax, const SerdSink* sink) { - SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); - me->handle = handle; - me->free_handle = free_handle; - me->base_sink = base_sink; - me->prefix_sink = prefix_sink; - me->statement_sink = statement_sink; - me->end_sink = end_sink; - me->default_graph = NULL; - me->stack = serd_stack_new(SERD_PAGE_SIZE); - me->syntax = syntax; - me->next_id = 1; - me->strict = true; + SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); + + me->sink = sink; + me->default_graph = NULL; + me->stack = serd_stack_new(SERD_PAGE_SIZE); + me->syntax = syntax; + me->next_id = 1; + me->strict = true; me->rdf_first = push_node(me, SERD_URI, NS_RDF "first", 48); me->rdf_rest = push_node(me, SERD_URI, NS_RDF "rest", 47); @@ -218,18 +208,9 @@ serd_reader_free(SerdReader* reader) #endif free(reader->stack.buf); free(reader->bprefix); - if (reader->free_handle) { - reader->free_handle(reader->handle); - } free(reader); } -void* -serd_reader_handle(const SerdReader* reader) -{ - return reader->handle; -} - void serd_reader_add_blank_prefix(SerdReader* reader, const char* prefix) diff --git a/src/reader.h b/src/reader.h index fc4d7a1c..10e72384 100644 --- a/src/reader.h +++ b/src/reader.h @@ -57,12 +57,7 @@ typedef struct { } ReadContext; struct SerdReaderImpl { - void* handle; - void (*free_handle)(void* ptr); - SerdBaseSink base_sink; - SerdPrefixSink prefix_sink; - SerdStatementSink statement_sink; - SerdEndSink end_sink; + const SerdSink* sink; SerdErrorSink error_sink; void* error_handle; Ref rdf_first; diff --git a/src/serdi.c b/src/serdi.c index c16cd668..151465d9 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -319,12 +319,8 @@ main(int argc, char** argv) (SerdWriteFunc)fwrite, out_fd); - SerdReader* reader = serd_reader_new( - input_syntax, writer, NULL, - (SerdBaseSink)serd_writer_set_base_uri, - (SerdPrefixSink)serd_writer_set_prefix, - (SerdStatementSink)serd_writer_write_statement, - (SerdEndSink)serd_writer_end_anon); + SerdReader* reader = + serd_reader_new(input_syntax, serd_writer_get_sink(writer)); serd_reader_set_strict(reader, !lax); if (quiet) { diff --git a/src/writer.c b/src/writer.c index dbbdfbef..4da374aa 100644 --- a/src/writer.c +++ b/src/writer.c @@ -93,6 +93,7 @@ static const SepRule rules[] = { }; struct SerdWriterImpl { + SerdSink iface; SerdSyntax syntax; SerdStyle style; SerdEnv* env; @@ -118,6 +119,11 @@ typedef enum { WRITE_LONG_STRING } TextContext; +static SerdStatus +serd_writer_set_prefix(SerdWriter* writer, + const SerdNode* name, + const SerdNode* uri); + static bool write_node(SerdWriter* writer, const SerdNode* node, @@ -698,7 +704,7 @@ write_list_obj(SerdWriter* writer, return false; } -SerdStatus +static SerdStatus serd_writer_write_statement(SerdWriter* writer, SerdStatementFlags flags, const SerdNode* graph, @@ -829,7 +835,7 @@ serd_writer_write_statement(SerdWriter* writer, return SERD_SUCCESS; } -SerdStatus +static SerdStatus serd_writer_end_anon(SerdWriter* writer, const SerdNode* node) { @@ -892,6 +898,13 @@ serd_writer_new(SerdSyntax syntax, writer->empty = true; writer->byte_sink = serd_byte_sink_new( ssink, stream, (style & SERD_STYLE_BULK) ? SERD_PAGE_SIZE : 1); + + writer->iface.handle = writer; + writer->iface.base = (SerdBaseSink)serd_writer_set_base_uri; + writer->iface.prefix = (SerdPrefixSink)serd_writer_set_prefix; + writer->iface.statement = (SerdStatementSink)serd_writer_write_statement; + writer->iface.end = (SerdEndSink)serd_writer_end_anon; + return writer; } @@ -993,6 +1006,12 @@ serd_writer_free(SerdWriter* writer) free(writer); } +const SerdSink* +serd_writer_get_sink(SerdWriter* writer) +{ + return &writer->iface; +} + SerdEnv* serd_writer_env(SerdWriter* writer) { -- cgit v1.2.1