summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/c/overview.rst6
-rw-r--r--src/dumper.c85
-rw-r--r--src/loader.c33
-rw-r--r--test/test_sratom.c10
4 files changed, 57 insertions, 77 deletions
diff --git a/doc/c/overview.rst b/doc/c/overview.rst
index c6347d6..2fb1a31 100644
--- a/doc/c/overview.rst
+++ b/doc/c/overview.rst
@@ -51,13 +51,13 @@ For example:
.. code-block:: c
- SerdStringView base = SERD_STRING("file:///tmp/state/");
+ SerdStringView base = serd_string("file:///tmp/state/");
SerdEnv* env = serd_env_new(base);
serd_env_set_prefix(
env,
- SERD_STRING("atom"),
- SERD_STRING("http://lv2plug.in/ns/ext/atom#"));
+ serd_string("atom"),
+ serd_string("http://lv2plug.in/ns/ext/atom#"));
With the environment configured,
:func:`sratom_to_string` can be used to convert atoms to strings:
diff --git a/src/dumper.c b/src/dumper.c
index 53f2f7c..b577dff 100644
--- a/src/dumper.c
+++ b/src/dumper.c
@@ -33,12 +33,10 @@
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define NS_XSD "http://www.w3.org/2001/XMLSchema#"
-#define DUMP_WARN(msg) \
- serd_world_logf(writer->world, SERD_LOG_LEVEL_WARNING, 0, NULL, msg)
+#define DUMP_WARN(msg) serd_logf(writer->world, SERD_LOG_LEVEL_WARNING, msg)
#define DUMP_ERRORF(msg, ...) \
- serd_world_logf( \
- writer->world, SERD_LOG_LEVEL_ERROR, 0, NULL, msg, __VA_ARGS__)
+ serd_logf(writer->world, SERD_LOG_LEVEL_ERROR, msg, __VA_ARGS__)
struct SratomDumperImpl {
LV2_URID_Unmap* unmap;
@@ -104,7 +102,7 @@ sratom_dumper_new(SerdWorld* const world,
lv2_atom_forge_init(&dumper->forge, map);
#define MANAGE_URI(uri) \
- serd_nodes_uri(serd_world_nodes(world), SERD_STRING(uri))
+ serd_nodes_uri(serd_world_nodes(world), serd_string(uri))
dumper->nodes.atom_Path = MANAGE_URI(LV2_ATOM__Path);
dumper->nodes.atom_beatTime = MANAGE_URI(LV2_ATOM__beatTime);
@@ -192,7 +190,7 @@ start_object(StreamContext* const ctx,
}
if (type) {
- SerdNode* const o = serd_new_uri(NULL, SERD_STRING(type));
+ SerdNode* const o = serd_new_uri(NULL, serd_string(type));
serd_sink_write(
ctx->sink, ctx->sflags, node, ctx->writer->nodes.rdf_type, o, NULL);
@@ -219,25 +217,6 @@ path_is_absolute(const char* const path)
(path[2] == '/' || path[2] == '\\')));
}
-static SerdStringView
-number_type(const StreamContext* const ctx, const SerdNode* const type)
-{
- SratomDumper* const writer = ctx->writer;
- const bool pretty = (ctx->flags & SRATOM_PRETTY_NUMBERS);
-
- if (pretty) {
- if (type == writer->nodes.xsd_int || type == writer->nodes.xsd_long) {
- return serd_node_string_view(writer->nodes.xsd_integer);
- }
-
- if (type == writer->nodes.xsd_float || type == writer->nodes.xsd_double) {
- return serd_node_string_view(writer->nodes.xsd_decimal);
- }
- }
-
- return serd_node_string_view(type);
-}
-
static bool
is_primitive_type(const StreamContext* const ctx, const LV2_URID type)
{
@@ -264,30 +243,31 @@ write_atom(StreamContext* const ctx,
const char* const type_uri = unmap->unmap(unmap->handle, type);
SerdNode* object = NULL;
SratomStatus st = SRATOM_SUCCESS;
+ const bool pretty = ctx->flags & SRATOM_PRETTY_NUMBERS;
if (type == 0 && size == 0) {
object = serd_node_copy(NULL, writer->nodes.rdf_nil);
} else if (type == writer->forge.String) {
- object = serd_new_string(NULL, SERD_STRING((const char*)body));
+ object = serd_new_string(NULL, serd_string((const char*)body));
} else if (type == writer->forge.Chunk) {
- object = serd_new_base64(NULL, body, size, SERD_EMPTY_STRING());
+ object = serd_new_base64(NULL, body, size);
} else if (type == writer->forge.Literal) {
const LV2_Atom_Literal_Body* lit = (const LV2_Atom_Literal_Body*)body;
const char* str = (const char*)(lit + 1);
if (lit->datatype) {
const SerdStringView datatype_uri =
- SERD_STRING(unmap->unmap(unmap->handle, lit->datatype));
+ serd_string(unmap->unmap(unmap->handle, lit->datatype));
object = serd_new_literal(
- NULL, SERD_STRING(str), SERD_HAS_DATATYPE, datatype_uri);
+ NULL, serd_string(str), SERD_HAS_DATATYPE, datatype_uri);
} else if (lit->lang) {
const char* lang = unmap->unmap(unmap->handle, lit->lang);
const char* prefix = "http://lexvo.org/id/iso639-3/";
const size_t prefix_len = strlen(prefix);
if (lang && !strncmp(lang, prefix, prefix_len)) {
object = serd_new_literal(NULL,
- SERD_STRING(str),
+ serd_string(str),
SERD_HAS_LANGUAGE,
- SERD_STRING(lang + prefix_len));
+ serd_string(lang + prefix_len));
} else {
DUMP_ERRORF("Unknown language URID %u\n", lit->lang);
}
@@ -296,11 +276,11 @@ write_atom(StreamContext* const ctx,
const uint32_t urid = *(const uint32_t*)body;
const char* str = unmap->unmap(unmap->handle, urid);
- object = serd_new_uri(NULL, SERD_STRING(str));
+ object = serd_new_uri(NULL, serd_string(str));
} else if (type == writer->forge.Path) {
- const SerdStringView str = SERD_STRING((const char*)body);
+ const SerdStringView str = serd_string((const char*)body);
if (path_is_absolute(str.buf)) {
- object = serd_new_file_uri(NULL, str, SERD_EMPTY_STRING());
+ object = serd_new_file_uri(NULL, str, serd_empty_string());
} else {
const SerdNode* base_uri = serd_env_base_uri(env);
if (!base_uri || strncmp(serd_node_string(base_uri), "file://", 7)) {
@@ -312,7 +292,7 @@ write_atom(StreamContext* const ctx,
SERD_HAS_DATATYPE,
serd_node_string_view(writer->nodes.atom_Path));
} else {
- SerdNode* const rel = serd_new_file_uri(NULL, str, SERD_EMPTY_STRING());
+ SerdNode* const rel = serd_new_file_uri(NULL, str, serd_empty_string());
object =
serd_new_parsed_uri(NULL,
@@ -323,19 +303,19 @@ write_atom(StreamContext* const ctx,
}
}
} else if (type == writer->forge.URI) {
- object = serd_new_uri(NULL, SERD_STRING((const char*)body));
+ object = serd_new_uri(NULL, serd_string((const char*)body));
} else if (type == writer->forge.Int) {
- object = serd_new_integer(
- NULL, *(const int32_t*)body, number_type(ctx, writer->nodes.xsd_int));
+ object = pretty ? serd_new_integer(NULL, *(const int32_t*)body)
+ : serd_new_value(NULL, serd_int(*(const int32_t*)body));
} else if (type == writer->forge.Long) {
- object = serd_new_integer(
- NULL, *(const int64_t*)body, number_type(ctx, writer->nodes.xsd_long));
+ object = pretty ? serd_new_integer(NULL, *(const int64_t*)body)
+ : serd_new_value(NULL, serd_long(*(const int64_t*)body));
} else if (type == writer->forge.Float) {
- object = serd_new_float(NULL, *(const float*)body);
+ object = serd_new_value(NULL, serd_float(*(const float*)body));
} else if (type == writer->forge.Double) {
- object = serd_new_double(NULL, *(const double*)body);
+ object = serd_new_value(NULL, serd_double(*(const double*)body));
} else if (type == writer->forge.Bool) {
- object = serd_new_boolean(NULL, *(const int32_t*)body);
+ object = serd_new_value(NULL, serd_bool(*(const int32_t*)body));
} else if (type == writer->midi_MidiEvent) {
const size_t len = 2 * size;
char* const str = (char*)calloc(len + 1, 1);
@@ -348,7 +328,7 @@ write_atom(StreamContext* const ctx,
object =
serd_new_literal(NULL,
- SERD_SUBSTRING(str, len),
+ serd_substring(str, len),
SERD_HAS_DATATYPE,
serd_node_string_view(writer->nodes.midi_MidiEvent));
@@ -361,11 +341,10 @@ write_atom(StreamContext* const ctx,
const SerdNode* p = NULL;
if (ctx->seq_unit == writer->atom_beatTime) {
p = writer->nodes.atom_beatTime;
- time = serd_new_double(NULL, ev->time.beats);
+ time = serd_new_value(NULL, serd_double(ev->time.beats));
} else {
p = writer->nodes.atom_frameTime;
- time = serd_new_integer(
- NULL, ev->time.frames, number_type(ctx, writer->nodes.xsd_long));
+ time = serd_new_value(NULL, serd_long(ev->time.frames));
}
serd_sink_write(sink, 0, id, p, time, NULL);
serd_node_free(NULL, time);
@@ -401,7 +380,7 @@ write_atom(StreamContext* const ctx,
const SerdNode* p = writer->nodes.atom_childType;
SerdNode* const child_type = serd_new_uri(
- NULL, SERD_STRING(unmap->unmap(unmap->handle, vec->child_type)));
+ NULL, serd_string(unmap->unmap(unmap->handle, vec->child_type)));
serd_sink_write(sink, ctx->sflags, id, p, child_type, NULL);
p = writer->nodes.rdf_value;
@@ -429,14 +408,14 @@ write_atom(StreamContext* const ctx,
start_object(ctx, subject, predicate, id, otype);
} else {
id =
- serd_new_uri(NULL, SERD_STRING(unmap->unmap(unmap->handle, obj->id)));
+ serd_new_uri(NULL, serd_string(unmap->unmap(unmap->handle, obj->id)));
ctx->sflags = 0;
start_object(ctx, NULL, NULL, id, otype);
}
LV2_ATOM_OBJECT_BODY_FOREACH (obj, size, prop) {
const char* const key = unmap->unmap(unmap->handle, prop->key);
- SerdNode* const pred = serd_new_uri(NULL, SERD_STRING(key));
+ SerdNode* const pred = serd_new_uri(NULL, serd_string(key));
write_atom(ctx,
id,
pred,
@@ -469,7 +448,7 @@ write_atom(StreamContext* const ctx,
const SerdNode* id = serd_world_get_blank(writer->world);
start_object(ctx, subject, predicate, id, type_uri);
const SerdNode* p = writer->nodes.rdf_value;
- SerdNode* o = serd_new_base64(NULL, body, size, SERD_EMPTY_STRING());
+ SerdNode* o = serd_new_base64(NULL, body, size);
serd_sink_write(sink, ctx->sflags, id, p, o, NULL);
end_object(ctx, subject, predicate, id);
serd_node_free(NULL, o);
@@ -547,8 +526,8 @@ sratom_to_string(SratomDumper* const writer,
const LV2_Atom* const atom,
const SratomDumperFlags flags)
{
- SerdDynamicBuffer buffer = {NULL, NULL, 0};
- SerdOutputStream out = serd_open_output_buffer(&buffer);
+ SerdBuffer buffer = {NULL, NULL, 0};
+ SerdOutputStream out = serd_open_output_buffer(&buffer);
SerdWriter* const ttl_writer =
serd_writer_new(writer->world,
diff --git a/src/loader.c b/src/loader.c
index a02a5b7..e23e9c5 100644
--- a/src/loader.c
+++ b/src/loader.c
@@ -31,8 +31,7 @@
#define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define NS_XSD "http://www.w3.org/2001/XMLSchema#"
-#define LOAD_ERROR(msg) \
- serd_world_logf(loader->world, SERD_LOG_LEVEL_ERROR, 0, NULL, msg)
+#define LOAD_ERROR(msg) serd_logf(loader->world, SERD_LOG_LEVEL_ERROR, msg)
typedef enum { MODE_SUBJECT, MODE_BODY, MODE_SEQUENCE } ReadMode;
@@ -87,7 +86,7 @@ sratom_loader_new(SerdWorld* const world, LV2_URID_Map* const map)
lv2_atom_forge_init(&loader->forge, map);
#define MANAGE_URI(uri) \
- serd_nodes_uri(serd_world_nodes(world), SERD_STRING(uri))
+ serd_nodes_uri(serd_world_nodes(world), serd_string(uri))
loader->nodes.atom_beatTime = MANAGE_URI(LV2_ATOM__beatTime);
loader->nodes.atom_childType = MANAGE_URI(LV2_ATOM__childType);
@@ -243,15 +242,15 @@ read_typed_literal(SratomLoader* const loader,
ref = lv2_atom_forge_long(forge, strtol(str, NULL, 10));
} else if (!strcmp(type_uri, NS_XSD "decimal") ||
!strcmp(type_uri, NS_XSD "double")) {
- ref = lv2_atom_forge_double(forge, serd_get_double(node));
+ ref = lv2_atom_forge_double(forge, serd_get_value(node).data.as_double);
} else if (!strcmp(type_uri, NS_XSD "float")) {
- ref = lv2_atom_forge_float(forge, serd_get_float(node));
+ ref = lv2_atom_forge_float(forge, serd_get_value(node).data.as_float);
} else if (!strcmp(type_uri, NS_XSD "boolean")) {
- ref = lv2_atom_forge_bool(forge, serd_get_boolean(node));
+ ref = lv2_atom_forge_bool(forge, serd_get_value(node).data.as_bool);
} else if (!strcmp(type_uri, NS_XSD "base64Binary")) {
- const size_t size = serd_get_base64_size(node);
+ const size_t size = serd_get_blob_size(node);
void* const body = malloc(size);
- const SerdWriteResult r = serd_get_base64(node, size, body);
+ const SerdWriteResult r = serd_get_blob(node, size, body);
if (r.status) {
return SRATOM_BAD_FORGE;
}
@@ -362,12 +361,14 @@ read_object(LoadContext* const ctx,
if ((time = serd_model_get(
model, node, loader->nodes.atom_frameTime, NULL, NULL))) {
- lv2_atom_forge_frame_time(forge, time ? serd_get_integer(time) : 0);
+ const SerdValue frameTime = serd_get_value_as(time, SERD_LONG, true);
+ lv2_atom_forge_frame_time(forge, frameTime.data.as_long);
seq_unit = loader->atom_frameTime;
} else if ((time = serd_model_get(
model, node, loader->nodes.atom_beatTime, NULL, NULL))) {
- lv2_atom_forge_beat_time(forge, serd_get_double(time));
+ const SerdValue beatTime = serd_get_value_as(time, SERD_DOUBLE, true);
+ lv2_atom_forge_beat_time(forge, beatTime.data.as_double);
seq_unit = loader->atom_beatTime;
}
@@ -410,9 +411,9 @@ read_object(LoadContext* const ctx,
} else if (value && serd_node_equals(serd_node_datatype(value),
loader->nodes.xsd_base64Binary)) {
- const size_t size = serd_get_base64_size(value);
+ const size_t size = serd_get_blob_size(value);
void* const body = malloc(size);
- const SerdWriteResult r = serd_get_base64(value, size, body);
+ const SerdWriteResult r = serd_get_blob(value, size, body);
if (r.status) {
return SRATOM_BAD_FORGE;
}
@@ -479,7 +480,7 @@ model_from_string(SratomLoader* const loader,
SerdModel* const model = serd_model_new(loader->world, SERD_ORDER_SPO, 0u);
SerdSink* const inserter = serd_inserter_new(model, NULL);
- SerdNode* const name = serd_new_string(NULL, SERD_STRING("string"));
+ SerdNode* const name = serd_new_string(NULL, serd_string("string"));
const char* position = str;
SerdInputStream in = serd_open_input_string(&position);
SerdReader* const reader = serd_reader_new(
@@ -547,7 +548,7 @@ sratom_forge_sink(const LV2_Atom_Forge_Sink_Handle handle,
const void* const buf,
const uint32_t size)
{
- SerdDynamicBuffer* const chunk = (SerdDynamicBuffer*)handle;
+ SerdBuffer* const chunk = (SerdBuffer*)handle;
const LV2_Atom_Forge_Ref ref = chunk->len + 1;
serd_buffer_write(buf, 1, size, chunk);
@@ -558,7 +559,7 @@ static LV2_Atom*
sratom_forge_deref(const LV2_Atom_Forge_Sink_Handle handle,
const LV2_Atom_Forge_Ref ref)
{
- SerdDynamicBuffer* const chunk = (SerdDynamicBuffer*)handle;
+ SerdBuffer* const chunk = (SerdBuffer*)handle;
return (LV2_Atom*)((char*)chunk->buf + ref - 1);
}
@@ -573,7 +574,7 @@ sratom_from_model(SratomLoader* const loader,
return NULL;
}
- SerdDynamicBuffer out = {NULL, NULL, 0};
+ SerdBuffer out = {NULL, NULL, 0};
lv2_atom_forge_set_sink(
&loader->forge, sratom_forge_sink, sratom_forge_deref, &out);
diff --git a/test/test_sratom.c b/test/test_sratom.c
index 4d0a2fe..f69f498 100644
--- a/test/test_sratom.c
+++ b/test/test_sratom.c
@@ -324,14 +324,14 @@ int
main(void)
{
SerdWorld* const world = serd_world_new(NULL);
- SerdEnv* const env = serd_env_new(world, SERD_STRING("file:///tmp/base/"));
+ SerdEnv* const env = serd_env_new(world, serd_string("file:///tmp/base/"));
serd_env_set_prefix(
- env, SERD_STRING("eg"), SERD_STRING("http://example.org/"));
+ env, serd_string("eg"), serd_string("http://example.org/"));
- serd_env_set_prefix(env, SERD_STRING("atom"), SERD_STRING(NS_ATOM));
- serd_env_set_prefix(env, SERD_STRING("rdf"), SERD_STRING(NS_RDF));
- serd_env_set_prefix(env, SERD_STRING("xsd"), SERD_STRING(NS_XSD));
+ serd_env_set_prefix(env, serd_string("atom"), serd_string(NS_ATOM));
+ serd_env_set_prefix(env, serd_string("rdf"), serd_string(NS_RDF));
+ serd_env_set_prefix(env, serd_string("xsd"), serd_string(NS_XSD));
const int st =
(test(env, "Default", 0) || //
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-23 15:43:40 +0000