1 files changed, 19 insertions, 15 deletions

diff --git a/src/n3.c b/src/n3.c
index d5ee2832..fe6da47f 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -830,7 +830,11 @@ read_0_9(SerdReader* reader, Ref str, bool at_least_one)
 }
 
 static SerdStatus
-read_number(SerdReader* reader, Ref* dest, Ref* datatype, bool* ate_dot)
+read_number(SerdReader*    reader,
+            Ref*           dest,
+            Ref*           datatype,
+            SerdNodeFlags* flags,
+            bool*          ate_dot)
 {
 #define XSD_DECIMAL NS_XSD "decimal"
 #define XSD_DOUBLE NS_XSD "double"
@@ -888,6 +892,10 @@ read_number(SerdReader* reader, Ref* dest, Ref* datatype, bool* ate_dot)
       push_node(reader, SERD_URI, XSD_INTEGER, sizeof(XSD_INTEGER) - 1);
   }
 
+  if (*datatype) {
+    *flags |= SERD_HAS_DATATYPE;
+  }
+
   return SERD_SUCCESS;
 }
 
@@ -922,6 +930,7 @@ read_literal(SerdReader*    reader,
   switch (peek_byte(reader)) {
   case '@':
     eat_byte_safe(reader, '@');
+    *flags |= SERD_HAS_LANGUAGE;
     if ((st = read_LANGTAG(reader, lang))) {
       *datatype = pop_node(reader, *datatype);
       *lang     = pop_node(reader, *lang);
@@ -932,6 +941,7 @@ read_literal(SerdReader*    reader,
   case '^':
     eat_byte_safe(reader, '^');
     eat_byte_check(reader, '^');
+    *flags |= SERD_HAS_DATATYPE;
     if ((st = read_iri(reader, datatype, ate_dot))) {
       *datatype = pop_node(reader, *datatype);
       *lang     = pop_node(reader, *lang);
@@ -940,7 +950,6 @@ read_literal(SerdReader*    reader,
     }
     break;
   }
-
   return SERD_SUCCESS;
 }
 
@@ -1067,7 +1076,7 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest)
 
   SerdStatus st = SERD_SUCCESS;
   if (ctx.subject) {
-    TRY(st, emit_statement(reader, ctx, *dest, 0, 0));
+    TRY(st, emit_statement(reader, ctx, *dest));
   }
 
   ctx.subject = *dest;
@@ -1076,21 +1085,17 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest)
     if (!subject) {
       *ctx.flags |= SERD_ANON_CONT;
     }
-
     bool ate_dot_in_list = false;
     read_predicateObjectList(reader, ctx, &ate_dot_in_list);
     if (ate_dot_in_list) {
       return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n");
     }
-
     read_ws_star(reader);
     if (reader->end_sink) {
       reader->end_sink(reader->handle, deref(reader, *dest));
     }
-
     *ctx.flags = old_flags;
   }
-
   return (eat_byte_check(reader, ']') == ']') ? SERD_SUCCESS
                                               : SERD_ERR_BAD_SYNTAX;
 }
@@ -1160,7 +1165,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
   case '7':
   case '8':
   case '9':
-    ret = read_number(reader, &o, &datatype, ate_dot);
+    ret = read_number(reader, &o, &datatype, &flags, ate_dot);
     break;
   case '\"':
   case '\'':
@@ -1176,6 +1181,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
     node = deref(reader, o);
     if ((node->n_bytes == 4 && !memcmp(serd_node_string(node), "true", 4)) ||
         (node->n_bytes == 5 && !memcmp(serd_node_string(node), "false", 5))) {
+      flags      = flags | SERD_HAS_DATATYPE;
       node->type = SERD_LITERAL;
       datatype   = push_node(reader, SERD_URI, XSD_BOOLEAN, XSD_BOOLEAN_LEN);
       ret        = SERD_SUCCESS;
@@ -1195,7 +1201,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
   }
 
   if (!ret && emit && simple) {
-    ret = emit_statement(reader, *ctx, o, datatype, lang);
+    ret = emit_statement(reader, *ctx, o);
   } else if (!ret && !emit) {
     ctx->object   = o;
     ctx->datatype = datatype;
@@ -1289,14 +1295,12 @@ read_collection(SerdReader* reader, ReadContext ctx, Ref* dest)
 {
   SerdStatus st = SERD_SUCCESS;
   eat_byte_safe(reader, '(');
-
   bool end = peek_delim(reader, ')');
-
-  *dest = end ? reader->rdf_nil : blank_id(reader);
+  *dest    = end ? reader->rdf_nil : blank_id(reader);
   if (ctx.subject) {
     // subject predicate _:head
     *ctx.flags |= (end ? 0 : SERD_LIST_O_BEGIN);
-    TRY(st, emit_statement(reader, ctx, *dest, 0, 0));
+    TRY(st, emit_statement(reader, ctx, *dest));
     *ctx.flags |= SERD_LIST_CONT;
   } else {
     *ctx.flags |= (end ? 0 : SERD_LIST_S_BEGIN);
@@ -1335,7 +1339,7 @@ read_collection(SerdReader* reader, ReadContext ctx, Ref* dest)
     // _:node rdf:rest _:rest
     *ctx.flags |= SERD_LIST_CONT;
     ctx.predicate = reader->rdf_rest;
-    TRY(st, emit_statement(reader, ctx, (end ? reader->rdf_nil : rest), 0, 0));
+    TRY(st, emit_statement(reader, ctx, (end ? reader->rdf_nil : rest)));
 
     ctx.subject = rest;        // _:node = _:rest
     rest        = node;        // _:rest = (old)_:node
@@ -1710,7 +1714,7 @@ read_nquadsDoc(SerdReader* reader)
       }
     }
 
-    TRY(st, emit_statement(reader, ctx, ctx.object, ctx.datatype, ctx.lang));
+    TRY(st, emit_statement(reader, ctx, ctx.object));
 
     pop_node(reader, ctx.graph);
     pop_node(reader, ctx.lang);