Remove double allocations in serd_env_expand()

1 files changed, 64 insertions, 17 deletions

diff --git a/src/node.c b/src/node.c
index 51dc8828..8323e036 100644
--- a/src/node.c
+++ b/src/node.c
@@ -234,35 +234,82 @@ serd_new_plain_literal_i(const SerdStringView str,
   return node;
 }
 
-/// Internal pre-measured implementation of serd_new_typed_literal
-static SerdNode*
-serd_new_typed_literal_i(const SerdStringView str,
-                         SerdNodeFlags        flags,
-                         const SerdStringView datatype_uri)
+/// Internal implementation of serd_new_typed_literal from datatype URI parts
+SerdNode*
+serd_new_typed_literal_expanded(const SerdStringView str,
+                                const SerdNodeFlags  flags,
+                                const SerdStringView datatype_prefix,
+                                const SerdStringView datatype_suffix)
 {
-  assert(str.len);
-  assert(datatype_uri.len);
-  assert(strcmp(datatype_uri.buf, NS_RDF "langString"));
+  const size_t datatype_uri_len = datatype_prefix.len + datatype_suffix.len;
+  const size_t len              = serd_node_pad_size(str.len);
+  const size_t total_len        = len + sizeof(SerdNode) + datatype_uri_len;
 
-  flags |= SERD_HAS_DATATYPE;
-
-  const size_t len       = serd_node_pad_size(str.len);
-  const size_t total_len = len + sizeof(SerdNode) + datatype_uri.len;
+  SerdNode* node =
+    serd_node_malloc(total_len, flags | SERD_HAS_DATATYPE, SERD_LITERAL);
 
-  SerdNode* node = serd_node_malloc(total_len, flags, SERD_LITERAL);
   memcpy(serd_node_buffer(node), str.buf, str.len);
   node->n_bytes = str.len;
 
-  SerdNode* datatype_node = node + 1 + (len / sizeof(SerdNode));
-  datatype_node->n_bytes  = datatype_uri.len;
-  datatype_node->type     = SERD_URI;
-  memcpy(serd_node_buffer(datatype_node), datatype_uri.buf, datatype_uri.len);
+  SerdNode* const datatype_node = node + 1 + (len / sizeof(SerdNode));
+  char* const     datatype_buf  = serd_node_buffer(datatype_node);
+
+  datatype_node->n_bytes = datatype_uri_len;
+  datatype_node->type    = SERD_URI;
+  memcpy(datatype_buf, datatype_prefix.buf, datatype_prefix.len);
+  memcpy(datatype_buf + datatype_prefix.len,
+         datatype_suffix.buf,
+         datatype_suffix.len);
+
   serd_node_check_padding(datatype_node);
+  serd_node_check_padding(node);
+  return node;
+}
+
+/// Internal implementation of serd_new_typed_literal from a parsed datatype URI
+SerdNode*
+serd_new_typed_literal_uri(const SerdStringView str,
+                           const SerdNodeFlags  flags,
+                           const SerdURIView    datatype_uri)
+{
+  const size_t datatype_uri_len = serd_uri_string_length(&datatype_uri);
+  const size_t len              = serd_node_pad_size(str.len);
+  const size_t total_len        = len + sizeof(SerdNode) + datatype_uri_len;
 
+  SerdNode* node =
+    serd_node_malloc(total_len, flags | SERD_HAS_DATATYPE, SERD_LITERAL);
+
+  memcpy(serd_node_buffer(node), str.buf, str.len);
+  node->n_bytes = str.len;
+
+  SerdNode* const datatype_node = node + 1 + (len / sizeof(SerdNode));
+  char*           ptr           = serd_node_buffer(datatype_node);
+
+  const size_t actual_len = serd_write_uri(datatype_uri, string_sink, &ptr);
+
+  serd_node_buffer(datatype_node)[actual_len] = '\0';
+  datatype_node->n_bytes                      = actual_len;
+  datatype_node->type                         = SERD_URI;
+
+  serd_node_check_padding(datatype_node);
   serd_node_check_padding(node);
   return node;
 }
 
+/// Internal pre-measured implementation of serd_new_typed_literal
+static SerdNode*
+serd_new_typed_literal_i(const SerdStringView str,
+                         SerdNodeFlags        flags,
+                         const SerdStringView datatype_uri)
+{
+  assert(str.len);
+  assert(datatype_uri.len);
+  assert(strcmp(datatype_uri.buf, NS_RDF "langString"));
+
+  return serd_new_typed_literal_expanded(
+    str, flags, datatype_uri, SERD_EMPTY_STRING());
+}
+
 SerdNode*
 serd_new_plain_literal(const SerdStringView str, const SerdStringView lang)
 {