From a938b755197e8a2ea660cfae1b1ef160e8d59e11 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 30 Sep 2018 17:31:10 +0200 Subject: Add serd_env_copy() and serd_env_equals() --- serd/serd.h | 14 ++++++++++++++ src/env.c | 36 ++++++++++++++++++++++++++++++++++++ tests/env_test.c | 19 +++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/serd/serd.h b/serd/serd.h index 135e2b81..89d5b4eb 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -938,6 +938,20 @@ SERD_API SerdEnv* serd_env_new(const SerdNode* base_uri); +/** + Copy an environment. +*/ +SERD_API +SerdEnv* +serd_env_copy(const SerdEnv* env); + +/** + Return true iff `a` is equal to `b`. +*/ +SERD_API +bool +serd_env_equals(const SerdEnv* a, const SerdEnv* b); + /** Free `ns`. */ diff --git a/src/env.c b/src/env.c index 15e49413..6828a0fd 100644 --- a/src/env.c +++ b/src/env.c @@ -47,6 +47,22 @@ serd_env_new(const SerdNode* base_uri) return env; } +SerdEnv* +serd_env_copy(const SerdEnv* env) +{ + SerdEnv* copy = (SerdEnv*)calloc(1, sizeof(struct SerdEnvImpl)); + + copy->n_prefixes = env->n_prefixes; + copy->prefixes = (SerdPrefix*)malloc(copy->n_prefixes * sizeof(SerdPrefix)); + for (size_t i = 0; i < copy->n_prefixes; ++i) { + copy->prefixes[i].name = serd_node_copy(env->prefixes[i].name); + copy->prefixes[i].uri = serd_node_copy(env->prefixes[i].uri); + } + + serd_env_set_base_uri(copy, serd_env_base_uri(env)); + return copy; +} + void serd_env_free(SerdEnv* env) { @@ -63,6 +79,26 @@ serd_env_free(SerdEnv* env) free(env); } +bool +serd_env_equals(const SerdEnv* a, const SerdEnv* b) +{ + if (!a || !b) { + return !a == !b; + } else if (a->n_prefixes != b->n_prefixes || + !serd_node_equals(a->base_uri_node, b->base_uri_node)) { + return false; + } + + for (size_t i = 0; i < a->n_prefixes; ++i) { + if (!serd_node_equals(a->prefixes[i].name, b->prefixes[i].name) || + !serd_node_equals(a->prefixes[i].uri, b->prefixes[i].uri)) { + return false; + } + } + + return true; +} + const SerdURI* serd_env_get_parsed_base_uri(const SerdEnv* env) { diff --git a/tests/env_test.c b/tests/env_test.c index e507bfc9..25164701 100644 --- a/tests/env_test.c +++ b/tests/env_test.c @@ -95,6 +95,24 @@ test_env(void) SerdNode* qualified = serd_env_qualify(env, foo_u); assert(serd_node_equals(qualified, foo_c)); + + SerdEnv* env_copy = serd_env_copy(env); + assert(serd_env_equals(env, env_copy)); + assert(!serd_env_equals(env, NULL)); + assert(!serd_env_equals(NULL, env)); + assert(serd_env_equals(NULL, NULL)); + + SerdNode* qualified2 = serd_env_expand(env_copy, foo_u); + assert(serd_node_equals(qualified, foo_c)); + serd_node_free(qualified2); + + serd_env_set_prefix_from_strings( + env_copy, "test", "http://example.org/test"); + assert(!serd_env_equals(env, env_copy)); + + serd_env_set_prefix_from_strings(env, "test2", "http://example.org/test"); + assert(!serd_env_equals(env, env_copy)); + serd_node_free(qualified); serd_node_free(foo_c); serd_node_free(foo_u); @@ -102,6 +120,7 @@ test_env(void) serd_node_free(b); serd_node_free(pre); serd_node_free(eg); + serd_env_free(env_copy); serd_env_free(env); serd_world_free(world); -- cgit v1.2.1