diff options
| -rw-r--r-- | include/serd/serd.h | 8 | ||||
| -rw-r--r-- | src/writer.c | 86 |
2 files changed, 48 insertions, 46 deletions
diff --git a/include/serd/serd.h b/include/serd/serd.h index c2077f5c..21f6b7b1 100644 --- a/include/serd/serd.h +++ b/include/serd/serd.h @@ -191,6 +191,14 @@ typedef enum { /// Bitwise OR of SerdNodeFlag values typedef uint32_t SerdNodeFlags; +/// Index of a node in a statement +typedef enum { + SERD_SUBJECT = 0, ///< Subject + SERD_PREDICATE = 1, ///< Predicate ("key") + SERD_OBJECT = 2, ///< Object ("value") + SERD_GRAPH = 3 ///< Graph ("context") +} SerdField; + /// A syntactic RDF node typedef struct SerdNodeImpl SerdNode; diff --git a/src/writer.c b/src/writer.c index be3f2469..8800282d 100644 --- a/src/writer.c +++ b/src/writer.c @@ -33,14 +33,6 @@ #include <stdlib.h> #include <string.h> -typedef enum { - FIELD_NONE, - FIELD_SUBJECT, - FIELD_PREDICATE, - FIELD_OBJECT, - FIELD_GRAPH -} Field; - typedef struct { SerdNode* graph; SerdNode* subject; @@ -124,7 +116,7 @@ serd_writer_set_prefix(SerdWriter* writer, static bool write_node(SerdWriter* writer, const SerdNode* node, - Field field, + SerdField field, SerdStatementFlags flags); static bool @@ -148,14 +140,14 @@ anon_stack_top(SerdWriter* writer) } static inline SerdNode* -ctx(SerdWriter* writer, const Field field) +ctx(SerdWriter* writer, const SerdField field) { SerdNode* node = NULL; - if (field == FIELD_SUBJECT) { + if (field == SERD_SUBJECT) { node = writer->context.subject; - } else if (field == FIELD_PREDICATE) { + } else if (field == SERD_PREDICATE) { node = writer->context.predicate; - } else if (field == FIELD_GRAPH) { + } else if (field == SERD_GRAPH) { node = writer->context.graph; } @@ -491,11 +483,13 @@ free_context(SerdWriter* writer) } static bool -is_inline_start(const SerdWriter* writer, Field field, SerdStatementFlags flags) +is_inline_start(const SerdWriter* writer, + SerdField field, + SerdStatementFlags flags) { return (supports_abbrev(writer) && - ((field == FIELD_SUBJECT && (flags & SERD_ANON_S_BEGIN)) || - (field == FIELD_OBJECT && (flags & SERD_ANON_O_BEGIN)))); + ((field == SERD_SUBJECT && (flags & SERD_ANON_S_BEGIN)) || + (field == SERD_OBJECT && (flags & SERD_ANON_O_BEGIN)))); } static bool @@ -542,7 +536,7 @@ write_literal(SerdWriter* writer, sink(serd_node_string(lang), lang->n_bytes, writer); } else if (type_uri) { sink("^^", 2, writer); - return write_node(writer, datatype, FIELD_NONE, flags); + return write_node(writer, datatype, (SerdField)-1, flags); } return true; } @@ -564,7 +558,7 @@ is_name(const char* buf, const size_t len) static bool write_uri_node(SerdWriter* const writer, const SerdNode* node, - const Field field, + const SerdField field, const SerdStatementFlags flags) { const SerdNode* prefix = NULL; @@ -579,7 +573,7 @@ write_uri_node(SerdWriter* const writer, const char* node_str = serd_node_string(node); const bool has_scheme = serd_uri_string_has_scheme(node_str); if (supports_abbrev(writer)) { - if (field == FIELD_PREDICATE && !strcmp(node_str, NS_RDF "type")) { + if (field == SERD_PREDICATE && !strcmp(node_str, NS_RDF "type")) { return sink("a", 1, writer) == 1; } @@ -636,7 +630,7 @@ write_uri_node(SerdWriter* const writer, static bool write_curie(SerdWriter* const writer, const SerdNode* node, - const Field field, + const SerdField field, const SerdStatementFlags flags) { const char* node_str = serd_node_string(node); @@ -676,7 +670,7 @@ write_curie(SerdWriter* const writer, static bool write_blank(SerdWriter* const writer, const SerdNode* node, - const Field field, + const SerdField field, const SerdStatementFlags flags) { const char* node_str = serd_node_string(node); @@ -686,7 +680,7 @@ write_blank(SerdWriter* const writer, return write_sep(writer, SEP_ANON_BEGIN); } - if (field == FIELD_SUBJECT && (flags & SERD_LIST_S_BEGIN)) { + if (field == SERD_SUBJECT && (flags & SERD_LIST_S_BEGIN)) { assert(writer->list_depth == 0); serd_node_set(&writer->list_subj, node); ++writer->list_depth; @@ -694,14 +688,14 @@ write_blank(SerdWriter* const writer, return write_sep(writer, SEP_LIST_BEGIN); } - if (field == FIELD_OBJECT && (flags & SERD_LIST_O_BEGIN)) { + if (field == SERD_OBJECT && (flags & SERD_LIST_O_BEGIN)) { ++writer->indent; ++writer->list_depth; return write_sep(writer, SEP_LIST_BEGIN); } - if ((field == FIELD_SUBJECT && (flags & SERD_EMPTY_S)) || - (field == FIELD_OBJECT && (flags & SERD_EMPTY_O))) { + if ((field == SERD_SUBJECT && (flags & SERD_EMPTY_S)) || + (field == SERD_OBJECT && (flags & SERD_EMPTY_O))) { return sink("[]", 2, writer) == 2; } } @@ -722,7 +716,7 @@ write_blank(SerdWriter* const writer, static bool write_node(SerdWriter* writer, const SerdNode* node, - Field field, + const SerdField field, SerdStatementFlags flags) { bool ret = false; @@ -753,7 +747,7 @@ is_resource(const SerdNode* node) static void write_pred(SerdWriter* writer, SerdStatementFlags flags, const SerdNode* pred) { - write_node(writer, pred, FIELD_PREDICATE, flags); + write_node(writer, pred, SERD_PREDICATE, flags); write_sep(writer, SEP_P_O); serd_node_set(&writer->context.predicate, pred); } @@ -772,7 +766,7 @@ write_list_obj(SerdWriter* writer, if (!strcmp(serd_node_string(predicate), NS_RDF "first")) { write_sep(writer, SEP_LIST_SEP); - write_node(writer, object, FIELD_OBJECT, flags); + write_node(writer, object, SERD_OBJECT, flags); } return false; @@ -798,32 +792,32 @@ serd_writer_write_statement(SerdWriter* writer, } while (0) if (writer->syntax == SERD_NTRIPLES || writer->syntax == SERD_NQUADS) { - TRY(write_node(writer, subject, FIELD_SUBJECT, flags)); + TRY(write_node(writer, subject, SERD_SUBJECT, flags)); sink(" ", 1, writer); - TRY(write_node(writer, predicate, FIELD_PREDICATE, flags)); + TRY(write_node(writer, predicate, SERD_PREDICATE, flags)); sink(" ", 1, writer); - TRY(write_node(writer, object, FIELD_OBJECT, flags)); + TRY(write_node(writer, object, SERD_OBJECT, flags)); if (writer->syntax == SERD_NQUADS && graph) { sink(" ", 1, writer); - TRY(write_node(writer, graph, FIELD_GRAPH, flags)); + TRY(write_node(writer, graph, SERD_GRAPH, flags)); } sink(" .\n", 3, writer); return SERD_SUCCESS; } if ((graph && !serd_node_equals(graph, writer->context.graph)) || - (!graph && ctx(writer, FIELD_GRAPH))) { + (!graph && ctx(writer, SERD_GRAPH))) { writer->indent = 0; - if (ctx(writer, FIELD_SUBJECT)) { + if (ctx(writer, SERD_SUBJECT)) { write_sep(writer, SEP_END_S); } - if (ctx(writer, FIELD_GRAPH)) { + if (ctx(writer, SERD_GRAPH)) { write_sep(writer, SEP_GRAPH_END); } reset_context(writer, true); if (graph) { - TRY(write_node(writer, graph, FIELD_GRAPH, flags)); + TRY(write_node(writer, graph, SERD_GRAPH, flags)); ++writer->indent; write_sep(writer, SEP_GRAPH_BEGIN); serd_node_set(&writer->context.graph, graph); @@ -848,20 +842,20 @@ serd_writer_write_statement(SerdWriter* writer, ++writer->indent; } write_sep(writer, SEP_END_O); - write_node(writer, object, FIELD_OBJECT, flags); + write_node(writer, object, SERD_OBJECT, flags); if (!(flags & SERD_ANON_O_BEGIN)) { --writer->indent; } } else { // Abbreviate S - Sep sep = ctx(writer, FIELD_PREDICATE) ? SEP_END_P : SEP_S_P; + Sep sep = ctx(writer, SERD_PREDICATE) ? SEP_END_P : SEP_S_P; write_sep(writer, sep); write_pred(writer, flags, predicate); - write_node(writer, object, FIELD_OBJECT, flags); + write_node(writer, object, SERD_OBJECT, flags); } } else { // No abbreviation - if (ctx(writer, FIELD_SUBJECT)) { + if (ctx(writer, SERD_SUBJECT)) { assert(writer->indent > 0); --writer->indent; if (serd_stack_is_empty(&writer->anon_stack)) { @@ -872,7 +866,7 @@ serd_writer_write_statement(SerdWriter* writer, } if (!(flags & SERD_ANON_CONT)) { - write_node(writer, subject, FIELD_SUBJECT, flags); + write_node(writer, subject, SERD_SUBJECT, flags); ++writer->indent; write_sep(writer, SEP_S_P); } else { @@ -886,7 +880,7 @@ serd_writer_write_statement(SerdWriter* writer, write_pred(writer, flags, predicate); } - write_node(writer, object, FIELD_OBJECT, flags); + write_node(writer, object, SERD_OBJECT, flags); } if (flags & (SERD_ANON_S_BEGIN | SERD_ANON_O_BEGIN)) { @@ -942,10 +936,10 @@ serd_writer_end_anon(SerdWriter* writer, const SerdNode* node) SerdStatus serd_writer_finish(SerdWriter* writer) { - if (ctx(writer, FIELD_SUBJECT)) { + if (ctx(writer, SERD_SUBJECT)) { write_sep(writer, SEP_END_S); } - if (ctx(writer, FIELD_GRAPH)) { + if (ctx(writer, SERD_GRAPH)) { write_sep(writer, SEP_GRAPH_END); } serd_byte_sink_flush(&writer->byte_sink); @@ -1012,7 +1006,7 @@ serd_writer_set_base_uri(SerdWriter* writer, const SerdNode* uri) if (!serd_env_set_base_uri(writer->env, serd_node_string_view(uri))) { if (writer->syntax == SERD_TURTLE || writer->syntax == SERD_TRIG) { - if (ctx(writer, FIELD_GRAPH) || ctx(writer, FIELD_SUBJECT)) { + if (ctx(writer, SERD_GRAPH) || ctx(writer, SERD_SUBJECT)) { sink(" .\n\n", 4, writer); reset_context(writer, true); } @@ -1052,7 +1046,7 @@ serd_writer_set_prefix(SerdWriter* writer, if (!serd_env_set_prefix( writer->env, serd_node_string_view(name), serd_node_string_view(uri))) { if (writer->syntax == SERD_TURTLE || writer->syntax == SERD_TRIG) { - if (ctx(writer, FIELD_GRAPH) || ctx(writer, FIELD_SUBJECT)) { + if (ctx(writer, SERD_GRAPH) || ctx(writer, SERD_SUBJECT)) { sink(" .\n\n", 4, writer); reset_context(writer, true); } |