diff options
| author | David Robillard <d@drobilla.net> | 2018-12-30 13:52:33 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-04-13 19:15:32 +0200 |
| commit | 696b558616bec2d2259bf901d2d94728e0cb0b74 (patch) | |
| tree | 746d7df0d6d45c5656057798087a9926d9a47957 /src/writer.c | |
| parent | 271ba679ed9652ed91c9e3a0c0a13e50f8eb8ae4 (diff) | |
| download | serd-696b558616bec2d2259bf901d2d94728e0cb0b74.tar.gz serd-696b558616bec2d2259bf901d2d94728e0cb0b74.tar.bz2 serd-696b558616bec2d2259bf901d2d94728e0cb0b74.zip | |
Use simpler names for statement flags
Diffstat (limited to 'src/writer.c')
| -rw-r--r-- | src/writer.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/writer.c b/src/writer.c index 6989542f..2db925ef 100644 --- a/src/writer.c +++ b/src/writer.c @@ -449,8 +449,8 @@ is_inline_start(const SerdWriter* writer, SerdStatementFlags flags) { return (supports_abbrev(writer) && - ((field == SERD_SUBJECT && (flags & SERD_ANON_S_BEGIN)) || - (field == SERD_OBJECT && (flags & SERD_ANON_O_BEGIN)))); + ((field == SERD_SUBJECT && (flags & SERD_ANON_S)) || + (field == SERD_OBJECT && (flags & SERD_ANON_O)))); } static bool @@ -623,8 +623,8 @@ write_blank(SerdWriter* const writer, if (supports_abbrev(writer)) { if (is_inline_start(writer, field, flags)) { return write_sep(writer, SEP_ANON_BEGIN); - } else if ((field == SERD_SUBJECT && (flags & SERD_LIST_S_BEGIN)) || - (field == SERD_OBJECT && (flags & SERD_LIST_O_BEGIN))) { + } else if ((field == SERD_SUBJECT && (flags & SERD_LIST_S)) || + (field == SERD_OBJECT && (flags & SERD_LIST_O))) { return write_sep(writer, SEP_LIST_BEGIN); } else if (field == SERD_SUBJECT && (flags & SERD_EMPTY_S)) { /* Last character is technically a separator, but reset because we @@ -799,9 +799,9 @@ serd_writer_write_statement(SerdWriter* writer, if (serd_stack_is_empty(&writer->anon_stack)) { write_node(writer, subject, SERD_SUBJECT, flags); - if (!(flags & (SERD_ANON_S_BEGIN | SERD_LIST_S_BEGIN))) { + if (!(flags & (SERD_ANON_S | SERD_LIST_S))) { write_sep(writer, SEP_S_P); - } else if (flags & SERD_ANON_S_BEGIN) { + } else if (flags & SERD_ANON_S) { write_sep(writer, SEP_ANON_S_P); } } else { @@ -811,14 +811,14 @@ serd_writer_write_statement(SerdWriter* writer, reset_context(writer, false); serd_node_set(&writer->context.subject, subject); - if (!(flags & SERD_LIST_S_BEGIN)) { + if (!(flags & SERD_LIST_S)) { write_pred(writer, flags, predicate); } write_node(writer, object, SERD_OBJECT, flags); } - if (flags & (SERD_LIST_S_BEGIN)) { + if (flags & (SERD_LIST_S)) { WriteContext* ctx = (WriteContext*)serd_stack_push( &writer->anon_stack, sizeof(WriteContext)); *ctx = writer->context; @@ -828,7 +828,7 @@ serd_writer_write_statement(SerdWriter* writer, writer->context = new_context; } - if (flags & (SERD_LIST_O_BEGIN)) { + if (flags & (SERD_LIST_O)) { WriteContext* ctx = (WriteContext*)serd_stack_push( &writer->anon_stack, sizeof(WriteContext)); *ctx = writer->context; @@ -838,15 +838,15 @@ serd_writer_write_statement(SerdWriter* writer, writer->context = new_context; } - if (flags & (SERD_ANON_S_BEGIN|SERD_ANON_O_BEGIN)) { + if (flags & (SERD_ANON_S|SERD_ANON_O)) { WriteContext* ctx = (WriteContext*)serd_stack_push( &writer->anon_stack, sizeof(WriteContext)); *ctx = writer->context; WriteContext new_context = { - (flags & (SERD_LIST_S_BEGIN|SERD_LIST_O_BEGIN)) + (flags & (SERD_LIST_S|SERD_LIST_O)) ? CTX_LIST : CTX_BLANK, serd_node_copy(graph), serd_node_copy(subject), NULL }; - if ((flags & SERD_ANON_S_BEGIN)) { + if ((flags & SERD_ANON_S)) { new_context.predicate = serd_node_copy(predicate); } writer->context = new_context; |