From 194d6f42583745c3fde6387b14abab2311b4f0b7 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 19 Dec 2019 10:21:30 -0500 Subject: Remove SERD_NOTHING node type --- include/serd/serd.h | 7 ------- src/env.c | 1 - src/writer.c | 3 --- test/test_reader_writer.c | 16 +--------------- 4 files changed, 1 insertion(+), 26 deletions(-) diff --git a/include/serd/serd.h b/include/serd/serd.h index 7a690b5b..2ccedcba 100644 --- a/include/serd/serd.h +++ b/include/serd/serd.h @@ -132,13 +132,6 @@ typedef uint32_t SerdStatementFlags; node types. */ typedef enum { - /** - The type of a nonexistent node. - - This type is useful as a sentinel, but is never emitted by the reader. - */ - SERD_NOTHING = 0, - /** Literal value. diff --git a/src/env.c b/src/env.c index c4744885..f88b8ab1 100644 --- a/src/env.c +++ b/src/env.c @@ -222,7 +222,6 @@ SerdNode* serd_env_expand_node(const SerdEnv* env, const SerdNode* node) { switch (node->type) { - case SERD_NOTHING: case SERD_LITERAL: break; case SERD_URI: { diff --git a/src/writer.c b/src/writer.c index dd16e732..6df55ada 100644 --- a/src/writer.c +++ b/src/writer.c @@ -737,8 +737,6 @@ write_node(SerdWriter* writer, { bool ret = false; switch (node->type) { - case SERD_NOTHING: - break; case SERD_LITERAL: ret = write_literal(writer, node, datatype, lang, flags); break; @@ -752,7 +750,6 @@ write_node(SerdWriter* writer, ret = write_blank(writer, node, field, flags); break; } - writer->last_sep = SEP_NONE; return ret; } diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c index 5d8efbe3..a97a44c0 100644 --- a/test/test_reader_writer.c +++ b/test/test_reader_writer.c @@ -260,22 +260,8 @@ test_writer(const char* const path) assert(!strcmp(out, "@base .\n")); serd_free(out); - // Test writing empty node - SerdNode* nothing = serd_new_string(SERD_NOTHING, ""); - FILE* const empty = tmpfile(); - - writer = serd_writer_new(SERD_TURTLE, 0, env, NULL, serd_file_sink, empty); - - // FIXME: error handling - serd_writer_write_statement(writer, 0, NULL, s, p, nothing, NULL, NULL); - - assert((size_t)ftell(empty) == strlen("<>\n\t ")); - - serd_writer_free(writer); - fclose(empty); - serd_node_free(nothing); - serd_node_free(s); serd_node_free(p); + serd_node_free(s); serd_env_free(env); fclose(fd); -- cgit v1.2.1