aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-12-26 20:04:27 -0500
committerDavid Robillard <d@drobilla.net>2019-04-13 19:15:32 +0200
commit52a0e3cc05f0e865bd2652f5c956a853fb86dc0c (patch)
tree282ab6b6b84d3f04676a83eb4da84d3055643fa9
parent2330ba6051f113fb47b124b3187d3e17be1fc969 (diff)
downloadserd-52a0e3cc05f0e865bd2652f5c956a853fb86dc0c.tar.gz
serd-52a0e3cc05f0e865bd2652f5c956a853fb86dc0c.tar.bz2
serd-52a0e3cc05f0e865bd2652f5c956a853fb86dc0c.zip
Remove serd_reader_set_default_graph()
-rw-r--r--serd/serd.h12
-rw-r--r--src/reader.c12
-rw-r--r--src/reader.h1
-rw-r--r--tests/serd_test.c11
4 files changed, 2 insertions, 34 deletions
diff --git a/serd/serd.h b/serd/serd.h
index 7b2bd815..cec5d8f9 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -1071,18 +1071,6 @@ serd_reader_add_blank_prefix(SerdReader* reader,
const char* prefix);
/**
- Set the URI of the default graph.
-
- If this is set, the reader will emit quads with the graph set to the given
- node for any statements that are not in a named graph (which is currently
- all of them since Serd currently does not support any graph syntaxes).
-*/
-SERD_API
-void
-serd_reader_set_default_graph(SerdReader* reader,
- const SerdNode* graph);
-
-/**
Prepare to read from the file at a local file `uri`.
*/
SERD_API
diff --git a/src/reader.c b/src/reader.c
index 5dc86f1e..39056d4c 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -118,8 +118,6 @@ emit_statement(SerdReader* reader, ReadContext ctx, SerdNode* o)
SerdNode* graph = ctx.graph;
if (!reader->sink->statement) {
return SERD_SUCCESS;
- } else if (!graph && reader->default_graph) {
- graph = reader->default_graph;
}
/* Zero the pad of the object node on the top of the stack. Lower nodes
@@ -171,7 +169,6 @@ serd_reader_new(SerdWorld* world,
me->world = world;
me->sink = sink;
- me->default_graph = NULL;
me->stack = serd_stack_new(stack_size);
me->syntax = syntax;
me->next_id = 1;
@@ -194,7 +191,6 @@ void
serd_reader_free(SerdReader* reader)
{
serd_reader_finish(reader);
- serd_node_free(reader->default_graph);
#ifdef SERD_STACK_CHECK
free(reader->allocs);
@@ -218,14 +214,6 @@ serd_reader_add_blank_prefix(SerdReader* reader,
}
}
-void
-serd_reader_set_default_graph(SerdReader* reader,
- const SerdNode* graph)
-{
- serd_node_free(reader->default_graph);
- reader->default_graph = serd_node_copy(graph);
-}
-
static SerdStatus
skip_bom(SerdReader* me)
{
diff --git a/src/reader.h b/src/reader.h
index 17aac125..4edef344 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -51,7 +51,6 @@ struct SerdReaderImpl {
SerdNode* rdf_first;
SerdNode* rdf_rest;
SerdNode* rdf_nil;
- SerdNode* default_graph;
SerdByteSource source;
SerdStack stack;
SerdSyntax syntax;
diff --git a/tests/serd_test.c b/tests/serd_test.c
index 7de0025d..f1d6fad9 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -63,8 +63,7 @@ count_prefixes(void* handle, const SerdNode* name, const SerdNode* uri)
}
typedef struct {
- int n_statements;
- const SerdNode* graph;
+ int n_statements;
} ReaderTest;
static SerdStatus
@@ -77,7 +76,6 @@ test_sink(void* handle,
ReaderTest* rt = (ReaderTest*)handle;
++rt->n_statements;
- rt->graph = serd_statement_get_graph(statement);
return SERD_SUCCESS;
}
@@ -570,18 +568,15 @@ main(void)
// Rewind and test reader
fseek(fd, 0, SEEK_SET);
- ReaderTest rt = { 0, NULL };
+ ReaderTest rt = { 0 };
SerdSink* sink = serd_sink_new(&rt);
serd_sink_set_statement_func(sink, test_sink);
SerdReader* reader = serd_reader_new(world, SERD_TURTLE, sink, 4096);
assert(reader);
- SerdNode* g = serd_new_uri("http://example.org/");
- serd_reader_set_default_graph(reader, g);
serd_reader_add_blank_prefix(reader, "tmp");
serd_reader_add_blank_prefix(reader, NULL);
- serd_node_free(g);
assert(serd_reader_start_file(reader, "http://notafile", false));
assert(serd_reader_start_file(reader, "file://invalid", false));
@@ -590,8 +585,6 @@ main(void)
assert(!serd_reader_start_file(reader, path, true));
assert(!serd_reader_read_document(reader));
assert(rt.n_statements == 13);
- assert(rt.graph && serd_node_get_string(rt.graph) &&
- !strcmp(serd_node_get_string(rt.graph), "http://example.org/"));
serd_reader_finish(reader);
serd_reader_free(reader);