aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-01-22 19:40:25 +0000
committerDavid Robillard <d@drobilla.net>2011-01-22 19:40:25 +0000
commit70b81af9060efb3963949cdcf68611244a4c520c (patch)
treef42838a5b987aee725e01b849fdd540ffc843261
parent88a315b8ecf1534a92466bdc1ad37fe6a1bd6031 (diff)
downloadserd-70b81af9060efb3963949cdcf68611244a4c520c.tar.gz
serd-70b81af9060efb3963949cdcf68611244a4c520c.tar.bz2
serd-70b81af9060efb3963949cdcf68611244a4c520c.zip
Emit triples in the correct order for streaming abbreviation.
git-svn-id: http://svn.drobilla.net/serd/trunk@38 490d8e77-9747-427b-9fa3-0b8f29cee8a0
-rw-r--r--src/reader.c31
-rw-r--r--tests/test-05.out2
2 files changed, 24 insertions, 9 deletions
diff --git a/src/reader.c b/src/reader.c
index 0566617b..ea941770 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -1003,17 +1003,28 @@ read_blank(SerdReader reader, Context ctx, Node* dest)
if (peek_byte(reader) == ']') {
eat_byte(reader, ']');
*dest = make_node(BLANK, blank_id(reader), 0, 0);
- return true;
+ if (ctx.subject) {
+ emit_statement(reader, ctx.graph, ctx.subject, ctx.predicate, dest);
+ }
} else {
*dest = make_node(BLANK, blank_id(reader), 0, 0);
+ if (ctx.subject) {
+ emit_statement(reader, ctx.graph, ctx.subject, ctx.predicate, dest);
+ }
ctx.subject = dest;
read_predicateObjectList(reader, ctx);
read_ws_star(reader);
eat_byte(reader, ']');
- return true;
}
+ return true;
case '(':
- return read_collection(reader, ctx, dest);
+ if (read_collection(reader, ctx, dest)) {
+ if (ctx.subject) {
+ emit_statement(reader, ctx.graph, ctx.subject, ctx.predicate, dest);
+ }
+ return true;
+ }
+ return false;
default:
return error(reader, "illegal blank node\n");
}
@@ -1041,13 +1052,17 @@ read_object(SerdReader reader, Context ctx)
static const size_t XSD_BOOLEAN_LEN = 40;
uint8_t pre[6];
- bool ret = false;
- Node o = SERD_NODE_NULL;
- const uint8_t c = peek_byte(reader);
+ bool ret = false;
+ bool emit = true;
+ Node o = SERD_NODE_NULL;
+ const uint8_t c = peek_byte(reader);
switch (c) {
case ')':
return false;
- case '[': case '(': case '_':
+ case '[': case '(':
+ emit = false;
+ // fall through
+ case '_':
TRY_THROW(ret = read_blank(reader, ctx, &o));
break;
case '<': case ':':
@@ -1083,7 +1098,7 @@ read_object(SerdReader reader, Context ctx)
ret = o.value;
}
- if (ret) {
+ if (ret && emit) {
assert(o.value);
emit_statement(reader, ctx.graph, ctx.subject, ctx.predicate, &o);
}
diff --git a/tests/test-05.out b/tests/test-05.out
index 6925d40d..bf904178 100644
--- a/tests/test-05.out
+++ b/tests/test-05.out
@@ -1,4 +1,4 @@
_:genid1 <http://example.org/base#a> <http://example.org/base#b> .
_:genid1 <http://example.org/base#c> <http://example.org/base#d> .
-_:genid2 <http://example.org/base#g> <http://example.org/base#h> .
<http://example.org/base#e> <http://example.org/base#f> _:genid2 .
+_:genid2 <http://example.org/base#g> <http://example.org/base#h> .