From b82920ddbd6c401a033ed1ff507379fdf7fcbc03 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 8 Jul 2018 16:40:45 +0200
Subject: Remove serd_reader_set_default_graph

This is easily handled by the sink.  In particular, the inserter already
contains this functionality.
---
 serd/serd.h       | 12 ------------
 src/reader.c      | 12 ------------
 src/reader.h      |  1 -
 tests/serd_test.c | 12 ++----------
 4 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 3b6fa3e3..93a2454d 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -1071,18 +1071,6 @@ void
 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`.
 */
diff --git a/src/reader.c b/src/reader.c
index 38b8a8b0..94387171 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -115,8 +115,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
@@ -168,7 +166,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;
@@ -191,7 +188,6 @@ void
 serd_reader_free(SerdReader* reader)
 {
 	serd_reader_finish(reader);
-	serd_node_free(reader->default_graph);
 
 #ifdef SERD_STACK_CHECK
 	free(reader->allocs);
@@ -215,14 +211,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 d803d9d9..f00ecd2d 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 d4e8e9d9..538febb5 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -64,8 +64,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
@@ -75,7 +74,6 @@ test_sink(void*                handle,
 {
 	ReaderTest* rt = (ReaderTest*)handle;
 	++rt->n_statements;
-	rt->graph = serd_statement_get_graph(statement);
 	return SERD_SUCCESS;
 }
 
@@ -690,7 +688,7 @@ 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);
 
@@ -699,11 +697,8 @@ main(void)
 		FAIL("Failed to create reader\n");
 	}
 
-	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);
 
 	if (!serd_reader_start_file(reader, "http://notafile", false)) {
 		FAIL("Apparently can read an http URI\n");
@@ -719,9 +714,6 @@ main(void)
 		FAIL("Failed reading test document\n");
 	} else if (rt.n_statements != 13) {
 		FAILF("Bad statement count %d\n", rt.n_statements);
-	} else if (!rt.graph || !serd_node_get_string(rt.graph) ||
-	           strcmp(serd_node_get_string(rt.graph), "http://example.org/")) {
-		FAILF("Bad graph %p\n", rt.graph);
 	}
 	serd_reader_finish(reader);
 
-- 
cgit v1.2.1