diff options
| -rw-r--r-- | serd/serd.h | 71 | ||||
| -rw-r--r-- | src/reader.c | 14 | ||||
| -rw-r--r-- | src/reader.h | 3 | ||||
| -rw-r--r-- | src/serd_internal.h | 8 | ||||
| -rw-r--r-- | src/serdi.c | 14 | ||||
| -rw-r--r-- | src/world.c | 40 | ||||
| -rw-r--r-- | src/world.h | 27 | ||||
| -rw-r--r-- | src/writer.c | 16 | ||||
| -rw-r--r-- | tests/serd_test.c | 16 | ||||
| -rw-r--r-- | wscript | 1 |
10 files changed, 148 insertions, 62 deletions
diff --git a/serd/serd.h b/serd/serd.h index 5270c15f..8744b634 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -55,6 +55,13 @@ extern "C" { */ /** + World. + + The World represents all library state shared between various objects. +*/ +typedef struct SerdWorldImpl SerdWorld; + +/** Environment. Represents the state required to resolve a CURIE or relative URI, e.g. the @@ -723,6 +730,41 @@ typedef struct SerdSink { /** @} + @name World + @{ +*/ + +/** + Create a new Serd World. + + It is safe to use multiple worlds in one process, though no objects can be + shared between worlds. +*/ +SERD_API +SerdWorld* +serd_world_new(void); + +/** + Free `world`. +*/ +SERD_API +void +serd_world_free(SerdWorld* world); + +/** + Set a function to be called when errors occur. + + The `error_sink` will be called with `handle` as its first argument. If + no error function is set, errors are printed to stderr. +*/ +SERD_API +void +serd_world_set_error_sink(SerdWorld* world, + SerdErrorSink error_sink, + void* handle); + +/** + @} @name Environment @{ */ @@ -828,7 +870,7 @@ serd_env_foreach(const SerdEnv* env, */ SERD_API SerdReader* -serd_reader_new(SerdSyntax syntax, const SerdSink* sink); +serd_reader_new(SerdWorld* world, SerdSyntax syntax, const SerdSink* sink); /** Enable or disable strict parsing. @@ -842,18 +884,6 @@ void serd_reader_set_strict(SerdReader* reader, bool strict); /** - Set a function to be called when errors occur during reading. - - The `error_sink` will be called with `handle` as its first argument. If - no error function is set, errors are printed to stderr in GCC style. -*/ -SERD_API -void -serd_reader_set_error_sink(SerdReader* reader, - SerdErrorSink error_sink, - void* error_handle); - -/** Set a prefix to be added to all blank node identifiers. This is useful when multiple files are to be parsed into the same output @@ -964,7 +994,8 @@ serd_reader_free(SerdReader* reader); */ SERD_API SerdWriter* -serd_writer_new(SerdSyntax syntax, +serd_writer_new(SerdWorld* world, + SerdSyntax syntax, SerdStyle style, SerdEnv* env, const SerdURI* base_uri, @@ -1015,18 +1046,6 @@ char* serd_buffer_sink_finish(SerdBuffer* stream); /** - Set a function to be called when errors occur during writing. - - The `error_sink` will be called with `handle` as its first argument. If - no error function is set, errors are printed to stderr. -*/ -SERD_API -void -serd_writer_set_error_sink(SerdWriter* writer, - SerdErrorSink error_sink, - void* error_handle); - -/** Set a prefix to be removed from matching blank node identifiers. */ SERD_API diff --git a/src/reader.c b/src/reader.c index fd7acd96..1c4c5104 100644 --- a/src/reader.c +++ b/src/reader.c @@ -35,7 +35,7 @@ r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...) va_start(args, fmt); const Cursor* const cur = &reader->source.cur; const SerdError e = { st, cur->filename, cur->line, cur->col, fmt, &args }; - serd_error(reader->error_sink, reader->error_handle, &e); + serd_error(reader->world, &e); va_end(args); return 0; } @@ -155,10 +155,11 @@ serd_reader_read_document(SerdReader* reader) } SerdReader* -serd_reader_new(SerdSyntax syntax, const SerdSink* sink) +serd_reader_new(SerdWorld* world, SerdSyntax syntax, const SerdSink* sink) { SerdReader* me = (SerdReader*)calloc(1, sizeof(SerdReader)); + me->world = world; me->sink = sink; me->default_graph = NULL; me->stack = serd_stack_new(SERD_PAGE_SIZE); @@ -180,15 +181,6 @@ serd_reader_set_strict(SerdReader* reader, bool strict) } void -serd_reader_set_error_sink(SerdReader* reader, - SerdErrorSink error_sink, - void* error_handle) -{ - reader->error_sink = error_sink; - reader->error_handle = error_handle; -} - -void serd_reader_free(SerdReader* reader) { pop_node(reader, reader->rdf_nil); diff --git a/src/reader.h b/src/reader.h index b4109eea..05a5de6a 100644 --- a/src/reader.h +++ b/src/reader.h @@ -46,7 +46,8 @@ typedef struct { } ReadContext; struct SerdReaderImpl { - const SerdSink* sink; + SerdWorld* world; + const SerdSink* sink; SerdErrorSink error_sink; void* error_handle; Ref rdf_first; diff --git a/src/serd_internal.h b/src/serd_internal.h index fbf493e9..172343b8 100644 --- a/src/serd_internal.h +++ b/src/serd_internal.h @@ -27,6 +27,8 @@ #include "serd/serd.h" #include "serd_config.h" +#include "world.h" + #if defined(HAVE_POSIX_FADVISE) && defined(HAVE_FILENO) # include <fcntl.h> #endif @@ -68,10 +70,10 @@ serd_bufalloc(size_t size) } static inline void -serd_error(SerdErrorSink error_sink, void* handle, const SerdError* e) +serd_error(const SerdWorld* world, const SerdError* e) { - if (error_sink) { - error_sink(handle, e); + if (world->error_sink) { + world->error_sink(world->error_handle, e); } else { fprintf(stderr, "error: %s:%u:%u: ", e->filename, e->line, e->col); vfprintf(stderr, e->fmt, *e->args); diff --git a/src/serdi.c b/src/serdi.c index 697f1217..c132eaf8 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -254,8 +254,9 @@ main(int argc, char** argv) base = serd_node_new_file_uri(input, NULL, &base_uri, true); } - FILE* out_fd = stdout; - SerdEnv* env = serd_env_new(base); + FILE* out_fd = stdout; + SerdWorld* world = serd_world_new(); + SerdEnv* env = serd_env_new(base); int output_style = 0; if (output_syntax == SERD_NTRIPLES || ascii) { @@ -277,7 +278,8 @@ main(int argc, char** argv) output_style |= SERD_STYLE_BULK; } - SerdWriter* writer = serd_writer_new(output_syntax, + SerdWriter* writer = serd_writer_new(world, + output_syntax, (SerdStyle)output_style, env, &base_uri, @@ -285,12 +287,11 @@ main(int argc, char** argv) out_fd); SerdReader* reader = - serd_reader_new(input_syntax, serd_writer_get_sink(writer)); + serd_reader_new(world, input_syntax, serd_writer_get_sink(writer)); serd_reader_set_strict(reader, !lax); if (quiet) { - serd_reader_set_error_sink(reader, quiet_error_sink, NULL); - serd_writer_set_error_sink(writer, quiet_error_sink, NULL); + serd_world_set_error_sink(world, quiet_error_sink, NULL); } SerdNode* root = serd_node_new_string(SERD_URI, root_uri); @@ -321,6 +322,7 @@ main(int argc, char** argv) serd_writer_free(writer); serd_env_free(env); serd_node_free(base); + serd_world_free(world); free(input_path); if (from_file) { diff --git a/src/world.c b/src/world.c new file mode 100644 index 00000000..07439137 --- /dev/null +++ b/src/world.c @@ -0,0 +1,40 @@ +/* + Copyright 2011-2018 David Robillard <http://drobilla.net> + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#include "serd_internal.h" + +#include "world.h" + +SerdWorld* +serd_world_new(void) +{ + return (SerdWorld*)calloc(1, sizeof(SerdWorld)); +} + +void +serd_world_free(SerdWorld* world) +{ + free(world); +} + +void +serd_world_set_error_sink(SerdWorld* world, + SerdErrorSink error_sink, + void* handle) +{ + world->error_sink = error_sink; + world->error_handle = handle; +} diff --git a/src/world.h b/src/world.h new file mode 100644 index 00000000..88241b0e --- /dev/null +++ b/src/world.h @@ -0,0 +1,27 @@ +/* + Copyright 2011-2018 David Robillard <http://drobilla.net> + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#ifndef SERD_WORLD_H +#define SERD_WORLD_H + +#include "serd_internal.h" + +struct SerdWorldImpl { + SerdErrorSink error_sink; + void* error_handle; +}; + +#endif // SERD_WORLD_H diff --git a/src/writer.c b/src/writer.c index 11ef0692..7bdc05f3 100644 --- a/src/writer.c +++ b/src/writer.c @@ -89,6 +89,7 @@ static const SepRule rules[] = { }; struct SerdWriterImpl { + SerdWorld* world; SerdSink iface; SerdSyntax syntax; SerdStyle style; @@ -144,7 +145,7 @@ w_err(SerdWriter* writer, SerdStatus st, const char* fmt, ...) va_list args; va_start(args, fmt); const SerdError e = { st, NULL, 0, 0, fmt, &args }; - serd_error(writer->error_sink, writer->error_handle, &e); + serd_error(writer->world, &e); va_end(args); } @@ -874,7 +875,8 @@ serd_writer_finish(SerdWriter* writer) } SerdWriter* -serd_writer_new(SerdSyntax syntax, +serd_writer_new(SerdWorld* world, + SerdSyntax syntax, SerdStyle style, SerdEnv* env, const SerdURI* base_uri, @@ -883,6 +885,7 @@ serd_writer_new(SerdSyntax syntax, { const WriteContext context = WRITE_CONTEXT_NULL; SerdWriter* writer = (SerdWriter*)calloc(1, sizeof(SerdWriter)); + writer->world = world; writer->syntax = syntax; writer->style = style; writer->env = env; @@ -906,15 +909,6 @@ serd_writer_new(SerdSyntax syntax, } void -serd_writer_set_error_sink(SerdWriter* writer, - SerdErrorSink error_sink, - void* error_handle) -{ - writer->error_sink = error_sink; - writer->error_handle = error_handle; -} - -void serd_writer_chop_blank_prefix(SerdWriter* writer, const char* prefix) { diff --git a/tests/serd_test.c b/tests/serd_test.c index cdea3810..2f0d32fe 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -365,6 +365,8 @@ main(void) // Test SerdEnv + SerdWorld* world = serd_world_new(); + SerdNode* u = serd_node_new_string(SERD_URI, "http://example.org/foo"); SerdNode* b = serd_node_new_string(SERD_CURIE, "invalid"); SerdNode* c = serd_node_new_string(SERD_CURIE, "eg.2:b"); @@ -417,8 +419,13 @@ main(void) FILE* fd = fopen(path, "wb"); assert(fd); - SerdWriter* writer = serd_writer_new( - SERD_TURTLE, (SerdStyle)0, env, NULL, (SerdWriteFunc)fwrite, fd); + SerdWriter* writer = serd_writer_new(world, + SERD_TURTLE, + (SerdStyle)0, + env, + NULL, + (SerdWriteFunc)fwrite, + fd); assert(writer); serd_writer_chop_blank_prefix(writer, "tmp"); @@ -494,7 +501,7 @@ main(void) // Test buffer sink SerdBuffer buffer = { NULL, 0 }; writer = serd_writer_new( - SERD_TURTLE, (SerdStyle)0, env, NULL, serd_buffer_sink, &buffer); + world, SERD_TURTLE, (SerdStyle)0, env, NULL, serd_buffer_sink, &buffer); o = serd_node_new_string(SERD_URI, "http://example.org/base"); assert(!serd_writer_set_base_uri(writer, o)); @@ -511,7 +518,7 @@ main(void) ReaderTest* rt = (ReaderTest*)calloc(1, sizeof(ReaderTest)); SerdSink sink = { rt, NULL, NULL, test_sink, NULL }; - SerdReader* reader = serd_reader_new(SERD_TURTLE, &sink); + SerdReader* reader = serd_reader_new(world, SERD_TURTLE, &sink); assert(reader); SerdNode* g = serd_node_new_string(SERD_URI, "http://example.org/"); @@ -537,6 +544,7 @@ main(void) fclose(fd); serd_env_free(env); + serd_world_free(world); printf("Success\n"); return 0; @@ -81,6 +81,7 @@ lib_source = ['src/byte_source.c', 'src/reader.c', 'src/string.c', 'src/uri.c', + 'src/world.c', 'src/writer.c'] def build(bld): |