From 5d65a0b7b687ffbbd624d75b42ac3336ce353c39 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 29 Apr 2018 18:36:11 +0200 Subject: Add blank node API --- serd/serd.h | 10 ++++++++++ src/node.c | 14 ++++++++++++++ tests/env_test.c | 3 +++ tests/serd_test.c | 13 +++++++++++++ 4 files changed, 40 insertions(+) diff --git a/serd/serd.h b/serd/serd.h index 8fdea919..41a1f30d 100644 --- a/serd/serd.h +++ b/serd/serd.h @@ -488,6 +488,16 @@ serd_node_new_literal(const char* str, const SerdNode* datatype, const char* lang); +/** + Create a new blank node. + + Note this function measures `str`, which is a common bottleneck. + Use sord_node_from_serd_node() instead if `str` is already measured. +*/ +SERD_API +SerdNode* +serd_node_new_blank(const char* str); + /** Simple wrapper for serd_node_new_uri() to resolve a URI node. */ diff --git a/src/node.c b/src/node.c index 070a3a20..95a34fac 100644 --- a/src/node.c +++ b/src/node.c @@ -169,6 +169,20 @@ serd_node_new_literal(const char* str, return node; } +SerdNode* +serd_node_new_blank(const char* str) +{ + if (!str) { + return NULL; + } + + const size_t n_bytes = strlen(str); + SerdNode* node = serd_node_malloc(n_bytes, 0, SERD_BLANK); + memcpy(serd_node_buffer(node), str, n_bytes); + node->n_bytes = n_bytes; + return node; +} + SerdNode* serd_node_copy(const SerdNode* node) { diff --git a/tests/env_test.c b/tests/env_test.c index bcdd996e..8e0c9205 100644 --- a/tests/env_test.c +++ b/tests/env_test.c @@ -34,6 +34,8 @@ count_prefixes(void* handle, const SerdNode* name, const SerdNode* uri) static void test_env(void) { + SerdWorld* world = serd_world_new(); + SerdNode* u = serd_node_new_string(SERD_URI, "http://example.org/foo"); SerdNode* b = serd_node_new_string(SERD_CURIE, "invalid"); SerdNode* c = serd_node_new_string(SERD_CURIE, "eg.2:b"); @@ -90,6 +92,7 @@ test_env(void) serd_node_free(u); serd_env_free(env); + serd_world_free(world); } int diff --git a/tests/serd_test.c b/tests/serd_test.c index a99ce678..15a205db 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -500,6 +500,18 @@ test_relative_uri(void) serd_node_free(base); } +static void +test_blank(void) +{ + assert(!serd_node_new_blank(NULL)); + + SerdNode* blank = serd_node_new_blank("b0"); + assert(serd_node_length(blank) == 2); + assert(serd_node_flags(blank) == 0); + assert(!strcmp(serd_node_string(blank), "b0")); + serd_node_free(blank); +} + static void test_writer(const char* const path) { @@ -698,6 +710,7 @@ main(void) test_literal(); test_uri_from_string(); test_relative_uri(); + test_blank(); test_read_chunks(); test_read_string(); -- cgit v1.2.1