From 05d9109178906eb68ef6b488d115134c7bdcf179 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 29 Apr 2018 18:29:03 +0200
Subject: Make serd_node_new_literal take datatype as a node

---
 serd/serd.h       |  4 +++-
 src/node.c        | 14 ++++++++------
 tests/serd_test.c | 12 +++++++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/serd/serd.h b/serd/serd.h
index 5e2b2d6f..fd0912e2 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -488,7 +488,9 @@ serd_node_new_substring(SerdType type, const char* str, size_t len);
 */
 SERD_API
 SerdNode*
-serd_node_new_literal(const char* str, const char* datatype, const char* lang);
+serd_node_new_literal(const char*     str,
+                      const SerdNode* datatype,
+                      const char*     lang);
 
 /**
    Return a deep copy of `node`.
diff --git a/src/node.c b/src/node.c
index 3f2fd90f..c06cb88d 100644
--- a/src/node.c
+++ b/src/node.c
@@ -113,9 +113,13 @@ serd_node_new_substring(SerdType type, const char* str, const size_t len)
 }
 
 SerdNode*
-serd_node_new_literal(const char* str, const char* datatype, const char* lang)
+serd_node_new_literal(const char*     str,
+                      const SerdNode* datatype,
+                      const char*     lang)
 {
-	if (!str || (lang && datatype && strcmp(datatype, NS_RDF "#langString"))) {
+	if (!str || (lang && datatype &&
+	             strcmp(serd_node_buffer_c(datatype), NS_RDF "#langString")) ||
+	    (datatype && serd_node_get_type(datatype) != SERD_URI)) {
 		return NULL;
 	}
 
@@ -138,16 +142,14 @@ serd_node_new_literal(const char* str, const char* datatype, const char* lang)
 		memcpy(serd_node_buffer(lang_node), lang, lang_len);
 	} else if (datatype) {
 		flags |= SERD_HAS_DATATYPE;
-		const size_t datatype_len = strlen(datatype);
+		const size_t datatype_len = strlen(serd_node_buffer_c(datatype));
 		const size_t total_len    = len + sizeof(SerdNode) + datatype_len;
 		node = serd_node_malloc(total_len, flags, SERD_LITERAL);
 		memcpy(serd_node_buffer(node), str, n_bytes);
 		node->n_bytes = n_bytes;
 
 		SerdNode* datatype_node = node + 1 + (len / serd_node_align);
-		datatype_node->type    = SERD_URI;
-		datatype_node->n_bytes = datatype_len;
-		memcpy(serd_node_buffer(datatype_node), datatype, datatype_len);
+		memcpy(datatype_node, datatype, sizeof(SerdNode) + datatype_len);
 	} else {
 		node = serd_node_malloc(n_bytes, flags, SERD_LITERAL);
 		memcpy(serd_node_buffer(node), str, n_bytes);
diff --git a/tests/serd_test.c b/tests/serd_test.c
index c797322c..816eb83c 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -306,8 +306,10 @@ main(void)
 	               "en"));
 	serd_node_free(hello_l);
 
-	SerdNode* hello_dt = serd_node_new_literal(
-	        "hello_dt\"", "http://example.org/Thing", NULL);
+	SerdNode* eg_Thing = serd_node_new_uri_from_string(
+	        "http://example.org/Thing", NULL, NULL);
+
+	SerdNode* hello_dt = serd_node_new_literal("hello_dt\"", eg_Thing, NULL);
 	assert(serd_node_get_length(hello_dt) == 9);
 	assert(!strcmp(serd_node_get_string(hello_dt), "hello_dt\""));
 	assert(serd_node_get_flags(hello_dt) ==
@@ -315,6 +317,7 @@ main(void)
 	assert(!strcmp(serd_node_get_string(serd_node_get_datatype(hello_dt)),
 	               "http://example.org/Thing"));
 	serd_node_free(hello_dt);
+	serd_node_free(eg_Thing);
 
 	// Test serd_node_new_uri_from_string
 
@@ -460,7 +463,9 @@ main(void)
 			       junk[i][0], junk[i][1], junk[i][2]));
 	}
 
-	SerdNode* t = serd_node_new_literal((char*)buf, "urn:Type", NULL);
+	SerdNode* urn_Type = serd_node_new_uri_from_string("urn:Type", NULL, NULL);
+
+	SerdNode* t = serd_node_new_literal((char*)buf, urn_Type, NULL);
 	SerdNode* l = serd_node_new_literal((char*)buf, NULL, "en");
 	const SerdNode* good[][5] = { { s, p, o },
 	                              { s, p, o },
@@ -498,6 +503,7 @@ main(void)
 	serd_node_free(o);
 	serd_node_free(t);
 	serd_node_free(l);
+	serd_node_free(urn_Type);
 
 	// Test buffer sink
 	SerdBuffer buffer = { NULL, 0 };
-- 
cgit v1.2.1