Simplify SerdEnv API

3 files changed, 84 insertions, 33 deletions

diff --git a/src/env.c b/src/env.c
index 7fa43aad..6714186e 100644
--- a/src/env.c
+++ b/src/env.c
@@ -155,26 +155,11 @@ serd_env_set_prefix(SerdEnv*        env,
 	return SERD_SUCCESS;
 }
 
-SerdStatus
-serd_env_set_prefix_from_strings(SerdEnv*    env,
-                                 const char* name,
-                                 const char* uri)
-{
-	SerdNode* name_node = serd_new_string(name);
-	SerdNode* uri_node  = serd_new_uri(uri);
-
-	const SerdStatus st = serd_env_set_prefix(env, name_node, uri_node);
-
-	serd_node_free(name_node);
-	serd_node_free(uri_node);
-	return st;
-}
-
 bool
-serd_env_qualify(const SerdEnv*   env,
-                 const SerdNode*  uri,
-                 const SerdNode** prefix,
-                 SerdStringView*  suffix)
+serd_env_qualify_in_place(const SerdEnv*   env,
+                          const SerdNode*  uri,
+                          const SerdNode** prefix,
+                          SerdStringView*  suffix)
 {
 	for (size_t i = 0; i < env->n_prefixes; ++i) {
 		const SerdNode* const prefix_uri = env->prefixes[i].uri;
@@ -194,10 +179,46 @@ serd_env_qualify(const SerdEnv*   env,
 }
 
 SerdStatus
-serd_env_expand(const SerdEnv*  env,
-                const SerdNode* curie,
-                SerdStringView* uri_prefix,
-                SerdStringView* uri_suffix)
+serd_env_set_prefix_from_strings(SerdEnv*    env,
+                                 const char* name,
+                                 const char* uri)
+{
+	SerdNode* name_node = serd_new_string(name);
+	SerdNode* uri_node  = serd_new_uri(uri);
+
+	const SerdStatus st = serd_env_set_prefix(env, name_node, uri_node);
+
+	serd_node_free(name_node);
+	serd_node_free(uri_node);
+	return st;
+}
+
+SerdNode*
+serd_env_qualify(const SerdEnv* env, const SerdNode* uri)
+{
+	const SerdNode* prefix = NULL;
+	SerdStringView  suffix = {NULL, 0};
+	if (serd_env_qualify_in_place(env, uri, &prefix, &suffix)) {
+		const size_t prefix_len = serd_node_get_length(prefix);
+		const size_t n_bytes    = prefix_len + 1 + suffix.len;
+		SerdNode*    node       = serd_node_malloc(n_bytes, 0, SERD_CURIE);
+		memcpy(serd_node_buffer(node),
+		       serd_node_get_string(prefix),
+		       prefix_len);
+		serd_node_buffer(node)[prefix_len] = ':';
+		memcpy(serd_node_buffer(node) + 1 + prefix_len, suffix.buf, suffix.len);
+		node->n_bytes = n_bytes;
+		return node;
+	}
+
+	return NULL;
+}
+
+SerdStatus
+serd_env_expand_in_place(const SerdEnv*  env,
+                         const SerdNode* curie,
+                         SerdStringView* uri_prefix,
+                         SerdStringView* uri_suffix)
 {
 	const char* const str   = serd_node_get_string(curie);
 	const char* const colon = (const char*)memchr(str, ':', curie->n_bytes + 1);
@@ -218,14 +239,17 @@ serd_env_expand(const SerdEnv*  env,
 }
 
 SerdNode*
-serd_env_expand_node(const SerdEnv*  env,
-                     const SerdNode* node)
+serd_env_expand(const SerdEnv* env, const SerdNode* node)
 {
+	if (!node) {
+		return NULL;
+	}
+
 	switch (node->type) {
 	case SERD_CURIE: {
 		SerdStringView prefix;
 		SerdStringView suffix;
-		if (serd_env_expand(env, node, &prefix, &suffix)) {
+		if (serd_env_expand_in_place(env, node, &prefix, &suffix)) {
 			return NULL;
 		}
 		const size_t len = prefix.len + suffix.len;
@@ -237,7 +261,7 @@ serd_env_expand_node(const SerdEnv*  env,
 	}
 	case SERD_LITERAL:
 		if (serd_node_get_datatype(node)) {
-			SerdNode* datatype = serd_env_expand_node(
+			SerdNode* datatype = serd_env_expand(
 				env, serd_node_get_datatype(node));
 			if (datatype) {
 				SerdNode* ret = serd_new_typed_literal(
diff --git a/src/env.h b/src/env.h
index ecb6cc15..c8d17912 100644
--- a/src/env.h
+++ b/src/env.h
@@ -19,6 +19,30 @@
 
 #include "serd/serd.h"
 
-const SerdURI* serd_env_get_parsed_base_uri(const SerdEnv* env);
+#include <stdbool.h>
 
-#endif  // SERD_ENV_H
+/**
+   Qualify `uri` into a CURIE if possible.
+*/
+bool
+serd_env_qualify_in_place(const SerdEnv*   env,
+                          const SerdNode*  uri,
+                          const SerdNode** prefix,
+                          SerdStringView*  suffix);
+
+/**
+   Expand `curie`.
+
+   Errors: SERD_ERR_BAD_ARG if `curie` is not valid, or SERD_ERR_BAD_CURIE if
+   prefix is not defined in `env`.
+*/
+SerdStatus
+serd_env_expand_in_place(const SerdEnv*  env,
+                         const SerdNode* curie,
+                         SerdStringView* uri_prefix,
+                         SerdStringView* uri_suffix);
+
+const SerdURI*
+serd_env_get_parsed_base_uri(const SerdEnv* env);
+
+#endif // SERD_ENV_H
diff --git a/src/writer.c b/src/writer.c
index 692139a6..55feb3f0 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -514,7 +514,7 @@ write_uri_node(SerdWriter* const        writer,
 	} else if (supports_abbrev(writer) && !strcmp(node_str, NS_RDF "nil")) {
 		return sink("()", 2, writer) == 2;
 	} else if (has_scheme && (writer->style & SERD_STYLE_CURIED) &&
-	           serd_env_qualify(writer->env, node, &prefix, &suffix) &&
+	           serd_env_qualify_in_place(writer->env, node, &prefix, &suffix) &&
 	           is_name(suffix.buf, suffix.len)) {
 		write_uri_from_node(writer, prefix);
 		sink(":", 1, writer);
@@ -562,9 +562,12 @@ write_curie(SerdWriter* const        writer,
 	switch (writer->syntax) {
 	case SERD_NTRIPLES:
 	case SERD_NQUADS:
-		if ((st = serd_env_expand(writer->env, node, &prefix, &suffix))) {
-			serd_world_errorf(writer->world, st,
-			                  "undefined namespace prefix `%s'\n", node_str);
+		if ((st = serd_env_expand_in_place(
+			     writer->env, node, &prefix, &suffix))) {
+			serd_world_errorf(writer->world,
+			                  st,
+			                  "undefined namespace prefix `%s'\n",
+			                  node_str);
 			return false;
 		}
 		write_sep(writer, SEP_URI_BEGIN);