aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--doc/serdi.14
-rw-r--r--serd/serd.h1
-rw-r--r--src/n3.c2
-rw-r--r--src/serdi.c39
-rw-r--r--src/writer.c12
6 files changed, 35 insertions, 24 deletions
diff --git a/NEWS b/NEWS
index 2e416c57..a523bb3c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ serd (1.0.1) unstable;
* Add extensible logging API
* Add extensible logging API
* Add model for storing statements in memory
+ * Add option for writing terse output without newlines
* Add support for validation
* Bring read/write interface closer to C standard
* Make nodes opaque
diff --git a/doc/serdi.1 b/doc/serdi.1
index 810d13a5..4765d551 100644
--- a/doc/serdi.1
+++ b/doc/serdi.1
@@ -80,6 +80,10 @@ Keep relative URIs within \fIROOT_URI\fR.
Parse \fIINPUT\fR as a string (terminates options).
.TP
+.BR \-t
+Write terser output without newlines.
+
+.TP
.BR \-v
Display version information and exit.
diff --git a/serd/serd.h b/serd/serd.h
index ebb4b7c9..bde720b9 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -262,6 +262,7 @@ typedef struct {
*/
typedef enum {
SERD_WRITE_ASCII = 1 << 0, ///< Escape all non-ASCII characters
+ SERD_WRITE_TERSE = 1 << 1, ///< Write terser output without newlines
} SerdWriterFlag;
/// Bitwise OR of SerdWriterFlag values
diff --git a/src/n3.c b/src/n3.c
index 89a5c5cd..f5385daa 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -1061,7 +1061,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
if (!emit) {
ctx->object = o;
- } else if (!ret && emit && simple && o) {
+ } else if (!ret && simple && o) {
ret = emit_statement(reader, *ctx, o);
serd_stack_pop_to(&reader->stack, orig_stack_size);
}
diff --git a/src/serdi.c b/src/serdi.c
index c7250958..b7586aa7 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -67,6 +67,7 @@ print_usage(const char* name, bool error)
fprintf(os, " -q Suppress all output except data.\n");
fprintf(os, " -r ROOT_URI Keep relative URIs within ROOT_URI.\n");
fprintf(os, " -s INPUT Parse INPUT as string (terminates options).\n");
+ fprintf(os, " -t Write terser output without newlines.\n");
fprintf(os, " -v Display version information and exit.\n");
return error ? 1 : 0;
}
@@ -93,28 +94,28 @@ main(int argc, char** argv)
return print_usage(argv[0], true);
}
- SerdSyntax input_syntax = (SerdSyntax)0;
- SerdSyntax output_syntax = (SerdSyntax)0;
- bool from_string = false;
- bool from_stdin = false;
- bool ascii = false;
- bool bulk_read = true;
- bool bulk_write = false;
- bool no_inline = false;
- bool lax = false;
- bool use_model = false;
- bool quiet = false;
- size_t stack_size = 4194304;
- const char* add_prefix = NULL;
- const char* chop_prefix = NULL;
- const char* root_uri = NULL;
- int a = 1;
+ SerdSyntax input_syntax = (SerdSyntax)0;
+ SerdSyntax output_syntax = (SerdSyntax)0;
+ SerdWriterFlags writer_flags = 0;
+ bool from_string = false;
+ bool from_stdin = false;
+ bool bulk_read = true;
+ bool bulk_write = false;
+ bool no_inline = false;
+ bool lax = false;
+ bool use_model = false;
+ bool quiet = false;
+ size_t stack_size = 4194304;
+ const char* add_prefix = NULL;
+ const char* chop_prefix = NULL;
+ const char* root_uri = NULL;
+ int a = 1;
for (; a < argc && argv[a][0] == '-'; ++a) {
if (argv[a][1] == '\0') {
from_stdin = true;
break;
} else if (argv[a][1] == 'a') {
- ascii = true;
+ writer_flags |= SERD_WRITE_ASCII;
} else if (argv[a][1] == 'b') {
bulk_write = true;
} else if (argv[a][1] == 'e') {
@@ -135,6 +136,8 @@ main(int argc, char** argv)
from_string = true;
++a;
break;
+ } else if (argv[a][1] == 't') {
+ writer_flags |= SERD_WRITE_TERSE;
} else if (argv[a][1] == 'i') {
if (++a == argc) {
return missing_arg(argv[0], 'i');
@@ -211,8 +214,6 @@ main(int argc, char** argv)
SerdWorld* world = serd_world_new();
SerdEnv* env = serd_env_new(base);
- const SerdWriterFlags writer_flags = (ascii ? SERD_WRITE_ASCII : 0U);
-
const SerdSerialisationFlags serialisation_flags =
no_inline ? SERD_NO_INLINE_OBJECTS : 0U;
diff --git a/src/writer.c b/src/writer.c
index 9c3b5d3e..cf8ae2fe 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -379,16 +379,20 @@ uri_sink(const void* buf, size_t size, size_t nmemb, void* stream)
static void
write_newline(SerdWriter* writer)
{
- sink("\n", 1, writer);
- for (int i = 0; i < writer->indent; ++i) {
- sink("\t", 1, writer);
+ if (writer->flags & SERD_WRITE_TERSE) {
+ sink(" ", 1, writer);
+ } else {
+ sink("\n", 1, writer);
+ for (int i = 0; i < writer->indent; ++i) {
+ sink("\t", 1, writer);
+ }
}
}
static void
write_top_level_sep(SerdWriter* writer)
{
- if (!writer->empty) {
+ if (!writer->empty && !(writer->flags & SERD_WRITE_TERSE)) {
write_newline(writer);
}
}