diff options
Diffstat (limited to 'src/node.c')
| -rw-r--r-- | src/node.c | 190 |
1 files changed, 82 insertions, 108 deletions
@@ -16,11 +16,10 @@ #include "node.h" -#include "base64.h" -#include "serd_internal.h" #include "static_nodes.h" #include "string_utils.h" +#include "exess/exess.h" #include "serd/serd.h" #include <assert.h> @@ -32,14 +31,10 @@ #include <stdlib.h> #include <string.h> -#ifdef _WIN32 -# ifndef isnan -# define isnan(x) _isnan(x) -# endif -# ifndef isinf -# define isinf(x) (!_finite(x)) -# endif -#endif +typedef struct { + const void* SERD_NULLABLE buf; + size_t len; +} SerdConstBuffer; static const size_t serd_node_align = sizeof(SerdNode); @@ -480,134 +475,113 @@ serd_new_file_uri(const SerdStringView path, const SerdStringView hostname) return node; } -static inline unsigned -serd_digits(double abs) -{ - const double lg = ceil(log10(floor(abs) + 1.0)); - return lg < 1.0 ? 1U : (unsigned)lg; -} +typedef size_t (*SerdWriteLiteralFunc)(const void* const user_data, + const size_t buf_size, + char* const buf); -SerdNode* -serd_new_decimal(double d, unsigned frac_digits, const SerdNode* datatype) +static SerdNode* +serd_new_custom_literal(const void* const user_data, + const size_t len, + SerdWriteLiteralFunc write, + const SerdNode* const datatype) { - if (isnan(d) || isinf(d)) { + if (len == 0 || !write) { return NULL; } - const SerdNode* type = datatype ? datatype : &serd_xsd_decimal.node; - const double abs_d = fabs(d); - const unsigned int_digits = serd_digits(abs_d); - const size_t len = int_digits + frac_digits + 3; - const size_t type_len = serd_node_total_size(type); - const size_t total_len = len + type_len; + const size_t datatype_size = serd_node_total_size(datatype); + const size_t total_size = serd_node_pad_size(len + 1) + datatype_size; - SerdNode* const node = - serd_node_malloc(total_len, SERD_HAS_DATATYPE, SERD_LITERAL); - - // Point s to decimal point location - char* const buf = serd_node_buffer(node); - const double int_part = floor(abs_d); - char* s = buf + int_digits; - if (d < 0.0) { - *buf = '-'; - ++s; - } + SerdNode* const node = serd_node_malloc( + total_size, datatype ? SERD_HAS_DATATYPE : 0, SERD_LITERAL); - // Write integer part (right to left) - char* t = s - 1; - uint64_t dec = (uint64_t)int_part; - do { - *t-- = (char)('0' + dec % 10); - } while ((dec /= 10) > 0); - - *s++ = '.'; - - // Write fractional part (right to left) - double frac_part = fabs(d - int_part); - if (frac_part < DBL_EPSILON) { - *s++ = '0'; - node->n_bytes = (size_t)(s - buf); - } else { - uint64_t frac = (uint64_t)llround(frac_part * pow(10.0, (int)frac_digits)); - s += frac_digits - 1; - unsigned i = 0; - - // Skip trailing zeros - for (; i < frac_digits - 1 && !(frac % 10); ++i, --s, frac /= 10) { - } - - node->n_bytes = (size_t)(s - buf) + 1u; + node->n_bytes = write(user_data, len + 1, serd_node_buffer(node)); + if (node->n_bytes == 0 || node->n_bytes > len) { + serd_node_free(node); + return NULL; + } - // Write digits from last trailing zero to decimal point - for (; i < frac_digits; ++i) { - *s-- = (char)('0' + (frac % 10)); - frac /= 10; - } + if (datatype) { + memcpy(serd_node_meta(node), datatype, datatype_size); } - memcpy(serd_node_meta(node), type, type_len); serd_node_check_padding(node); return node; } -SerdNode* -serd_new_integer(int64_t i, const SerdNode* datatype) +static size_t +write_variant_literal(const void* const user_data, + const size_t buf_size, + char* const buf) { - const SerdNode* type = datatype ? datatype : &serd_xsd_integer.node; - uint64_t abs_i = (uint64_t)((i < 0) ? -i : i); - const unsigned digits = serd_digits((double)abs_i); - const size_t type_len = serd_node_total_size(type); - const size_t total_len = digits + 2 + type_len; + const ExessVariant value = *(const ExessVariant*)user_data; + const ExessResult r = exess_write_variant(value, buf_size, buf); - SerdNode* node = serd_node_malloc(total_len, SERD_HAS_DATATYPE, SERD_LITERAL); + return r.status ? 0 : r.count; +} - // Point s to the end - char* buf = serd_node_buffer(node); - char* s = buf + digits - 1; - if (i < 0) { - *buf = '-'; - ++s; - } +SerdNode* +serd_new_decimal(const double d, const SerdNode* const datatype) +{ + // Use given datatype, or xsd:decimal as a default if it is null + const SerdNode* type = datatype ? datatype : &serd_xsd_decimal.node; + const size_t type_size = serd_node_total_size(type); - node->n_bytes = (size_t)(s - buf) + 1u; + // Measure integer string to know how much space the node will need + ExessResult r = exess_write_decimal(d, 0, NULL); + if (r.status) { + return NULL; + } - // Write integer part (right to left) - do { - *s-- = (char)('0' + (abs_i % 10)); - } while ((abs_i /= 10) > 0); + // Allocate node with enough space for value and datatype URI + SerdNode* const node = + serd_node_malloc(serd_node_pad_size(r.count + 1) + type_size, + SERD_HAS_DATATYPE, + SERD_LITERAL); + + // Write string directly into node + r = exess_write_decimal(d, r.count + 1, serd_node_buffer(node)); + if (r.status) { + free(node); + return NULL; + } - memcpy(serd_node_meta(node), type, type_len); + node->n_bytes = r.count; + memcpy(serd_node_meta(node), type, type_size); serd_node_check_padding(node); return node; } SerdNode* -serd_new_blob(const void* buf, - size_t size, - bool wrap_lines, - const SerdNode* datatype) +serd_new_integer(int64_t i, const SerdNode* datatype) { - if (!buf || !size) { - return NULL; - } + const ExessVariant variant = exess_make_long(i); + const size_t len = exess_write_variant(variant, 0, NULL).count; + const SerdNode* type = datatype ? datatype : &serd_xsd_integer.node; - const SerdNode* type = datatype ? datatype : &serd_xsd_base64Binary.node; - const size_t len = serd_base64_get_length(size, wrap_lines); - const size_t type_len = serd_node_total_size(type); - const size_t total_len = len + 1 + type_len; + return serd_new_custom_literal(&variant, len, write_variant_literal, type); +} - SerdNode* const node = - serd_node_malloc(total_len, SERD_HAS_DATATYPE, SERD_LITERAL); +static size_t +write_base64_literal(const void* const user_data, + const size_t buf_size, + char* const buf) +{ + const SerdConstBuffer blob = *(const SerdConstBuffer*)user_data; - uint8_t* str = (uint8_t*)serd_node_buffer(node); - if (serd_base64_encode(str, buf, size, wrap_lines)) { - node->flags |= SERD_HAS_NEWLINE; - } + const ExessResult r = exess_write_base64(blob.len, blob.buf, buf_size, buf); - node->n_bytes = len; - memcpy(serd_node_meta(node), type, type_len); - serd_node_check_padding(node); - return node; + return r.status ? 0 : r.count; +} + +SerdNode* +serd_new_blob(const void* buf, size_t size, const SerdNode* datatype) +{ + const size_t len = exess_write_base64(size, buf, 0, NULL).count; + const SerdNode* type = datatype ? datatype : &serd_xsd_base64Binary.node; + SerdConstBuffer blob = {buf, size}; + + return serd_new_custom_literal(&blob, len, write_base64_literal, type); } SerdNodeType |