Merge datatype/language into node

This moves closer to the sord API, and is more convenient in most cases.

1 files changed, 35 insertions, 43 deletions

diff --git a/src/writer.c b/src/writer.c
index f0bd11eb..b4917052 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -116,8 +116,6 @@ typedef enum { WRITE_STRING, WRITE_LONG_STRING } TextContext;
 static bool
 write_node(SerdWriter*        writer,
            const SerdNode*    node,
-           const SerdNode*    datatype,
-           const SerdNode*    lang,
            Field              field,
            SerdStatementFlags flags);
 
@@ -511,14 +509,14 @@ is_inline_start(const SerdWriter* writer, Field field, SerdStatementFlags flags)
 }
 
 static bool
-write_literal(SerdWriter*        writer,
-              const SerdNode*    node,
-              const SerdNode*    datatype,
-              const SerdNode*    lang,
-              SerdStatementFlags flags)
+write_literal(SerdWriter* const        writer,
+              const SerdNode* const    node,
+              const SerdStatementFlags flags)
 {
-  const char* node_str = serd_node_string(node);
-  const char* type_uri = datatype ? serd_node_string(datatype) : NULL;
+  const SerdNode* datatype = serd_node_datatype(node);
+  const SerdNode* lang     = serd_node_language(node);
+  const char*     node_str = serd_node_string(node);
+  const char*     type_uri = datatype ? serd_node_string(datatype) : NULL;
   if (supports_abbrev(writer) && type_uri) {
     if (!strncmp(type_uri, NS_XSD, sizeof(NS_XSD) - 1) &&
         (!strcmp(type_uri + sizeof(NS_XSD) - 1, "boolean") ||
@@ -554,7 +552,7 @@ write_literal(SerdWriter*        writer,
     sink(serd_node_string(lang), lang->length, writer);
   } else if (type_uri) {
     sink("^^", 2, writer);
-    return write_node(writer, datatype, NULL, NULL, FIELD_NONE, flags);
+    return write_node(writer, datatype, FIELD_NONE, flags);
   }
   return true;
 }
@@ -713,17 +711,15 @@ write_blank(SerdWriter* const        writer,
 }
 
 static bool
-write_node(SerdWriter*        writer,
-           const SerdNode*    node,
-           const SerdNode*    datatype,
-           const SerdNode*    lang,
-           Field              field,
-           SerdStatementFlags flags)
+write_node(SerdWriter* const        writer,
+           const SerdNode* const    node,
+           const Field              field,
+           const SerdStatementFlags flags)
 {
   bool ret = false;
   switch (node->type) {
   case SERD_LITERAL:
-    ret = write_literal(writer, node, datatype, lang, flags);
+    ret = write_literal(writer, node, flags);
     break;
   case SERD_URI:
     ret = write_uri_node(writer, node, field);
@@ -748,18 +744,16 @@ is_resource(const SerdNode* node)
 static void
 write_pred(SerdWriter* writer, SerdStatementFlags flags, const SerdNode* pred)
 {
-  write_node(writer, pred, NULL, NULL, FIELD_PREDICATE, flags);
+  write_node(writer, pred, FIELD_PREDICATE, flags);
   write_sep(writer, SEP_P_O);
   serd_node_set(&writer->context.predicate, pred);
 }
 
 static bool
-write_list_obj(SerdWriter*        writer,
-               SerdStatementFlags flags,
-               const SerdNode*    predicate,
-               const SerdNode*    object,
-               const SerdNode*    datatype,
-               const SerdNode*    lang)
+write_list_obj(SerdWriter* const        writer,
+               const SerdStatementFlags flags,
+               const SerdNode* const    predicate,
+               const SerdNode* const    object)
 {
   if (!strcmp(serd_node_string(object), NS_RDF "nil")) {
     --writer->indent;
@@ -769,21 +763,19 @@ write_list_obj(SerdWriter*        writer,
 
   if (!strcmp(serd_node_string(predicate), NS_RDF "first")) {
     write_sep(writer, SEP_LIST_SEP);
-    write_node(writer, object, datatype, lang, FIELD_OBJECT, flags);
+    write_node(writer, object, FIELD_OBJECT, flags);
   }
 
   return false;
 }
 
 SerdStatus
-serd_writer_write_statement(SerdWriter*        writer,
-                            SerdStatementFlags flags,
-                            const SerdNode*    graph,
-                            const SerdNode*    subject,
-                            const SerdNode*    predicate,
-                            const SerdNode*    object,
-                            const SerdNode*    datatype,
-                            const SerdNode*    lang)
+serd_writer_write_statement(SerdWriter* const        writer,
+                            const SerdStatementFlags flags,
+                            const SerdNode* const    graph,
+                            const SerdNode* const    subject,
+                            const SerdNode* const    predicate,
+                            const SerdNode* const    object)
 {
   if (!is_resource(subject) || !is_resource(predicate) || !object) {
     return SERD_ERR_BAD_ARG;
@@ -797,14 +789,14 @@ serd_writer_write_statement(SerdWriter*        writer,
   } while (0)
 
   if (writer->syntax == SERD_NTRIPLES || writer->syntax == SERD_NQUADS) {
-    TRY(write_node(writer, subject, NULL, NULL, FIELD_SUBJECT, flags));
+    TRY(write_node(writer, subject, FIELD_SUBJECT, flags));
     sink(" ", 1, writer);
-    TRY(write_node(writer, predicate, NULL, NULL, FIELD_PREDICATE, flags));
+    TRY(write_node(writer, predicate, FIELD_PREDICATE, flags));
     sink(" ", 1, writer);
-    TRY(write_node(writer, object, datatype, lang, FIELD_OBJECT, flags));
+    TRY(write_node(writer, object, FIELD_OBJECT, flags));
     if (writer->syntax == SERD_NQUADS && graph) {
       sink(" ", 1, writer);
-      TRY(write_node(writer, graph, datatype, lang, FIELD_GRAPH, flags));
+      TRY(write_node(writer, graph, FIELD_GRAPH, flags));
     }
     sink(" .\n", 3, writer);
     return SERD_SUCCESS;
@@ -822,7 +814,7 @@ serd_writer_write_statement(SerdWriter*        writer,
 
     reset_context(writer, true);
     if (graph) {
-      TRY(write_node(writer, graph, datatype, lang, FIELD_GRAPH, flags));
+      TRY(write_node(writer, graph, FIELD_GRAPH, flags));
       ++writer->indent;
       write_sep(writer, SEP_GRAPH_BEGIN);
       serd_node_set(&writer->context.graph, graph);
@@ -830,7 +822,7 @@ serd_writer_write_statement(SerdWriter*        writer,
   }
 
   if ((flags & SERD_LIST_CONT)) {
-    if (write_list_obj(writer, flags, predicate, object, datatype, lang)) {
+    if (write_list_obj(writer, flags, predicate, object)) {
       // Reached end of list
       if (--writer->list_depth == 0 && writer->list_subj) {
         reset_context(writer, false);
@@ -847,7 +839,7 @@ serd_writer_write_statement(SerdWriter*        writer,
         ++writer->indent;
       }
       write_sep(writer, SEP_END_O);
-      write_node(writer, object, datatype, lang, FIELD_OBJECT, flags);
+      write_node(writer, object, FIELD_OBJECT, flags);
       if (!(flags & SERD_ANON_O_BEGIN)) {
         --writer->indent;
       }
@@ -856,7 +848,7 @@ serd_writer_write_statement(SerdWriter*        writer,
       Sep sep = ctx(writer, FIELD_PREDICATE) ? SEP_END_P : SEP_S_P;
       write_sep(writer, sep);
       write_pred(writer, flags, predicate);
-      write_node(writer, object, datatype, lang, FIELD_OBJECT, flags);
+      write_node(writer, object, FIELD_OBJECT, flags);
     }
   } else {
     // No abbreviation
@@ -871,7 +863,7 @@ serd_writer_write_statement(SerdWriter*        writer,
     }
 
     if (!(flags & SERD_ANON_CONT)) {
-      write_node(writer, subject, NULL, NULL, FIELD_SUBJECT, flags);
+      write_node(writer, subject, FIELD_SUBJECT, flags);
       ++writer->indent;
       write_sep(writer, SEP_S_P);
     } else {
@@ -885,7 +877,7 @@ serd_writer_write_statement(SerdWriter*        writer,
       write_pred(writer, flags, predicate);
     }
 
-    write_node(writer, object, datatype, lang, FIELD_OBJECT, flags);
+    write_node(writer, object, FIELD_OBJECT, flags);
   }
 
   if (flags & (SERD_ANON_S_BEGIN | SERD_ANON_O_BEGIN)) {