aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-12-29 19:56:13 -0500
committerDavid Robillard <d@drobilla.net>2023-12-02 16:27:02 -0500
commit7a179e568a3576819d0e600cf35c94051e107d33 (patch)
treeadbd2666b07fc2811987760d73139499be842efc
parent53c28210b9e81ba33fddce89b2d61fb7c99445dc (diff)
downloadserd-7a179e568a3576819d0e600cf35c94051e107d33.tar.gz
serd-7a179e568a3576819d0e600cf35c94051e107d33.tar.bz2
serd-7a179e568a3576819d0e600cf35c94051e107d33.zip
Rename SerdType to SerdNodeType
The old name will be even more ambiguous with the increased scope.
-rw-r--r--include/serd/serd.h8
-rw-r--r--src/node.c8
-rw-r--r--src/node.h4
-rw-r--r--src/reader.c18
-rw-r--r--src/reader.h15
5 files changed, 28 insertions, 25 deletions
diff --git a/include/serd/serd.h b/include/serd/serd.h
index bf0740b6..c2308b16 100644
--- a/include/serd/serd.h
+++ b/include/serd/serd.h
@@ -343,14 +343,14 @@ typedef enum {
Turtle](http://www.w3.org/TR/turtle/#grammar-production-BLANK_NODE_LABEL)
*/
SERD_BLANK = 4,
-} SerdType;
+} SerdNodeType;
/// A syntactic RDF node
typedef struct {
const char* SERD_NULLABLE buf; ///< Value string
size_t n_bytes; ///< Size in bytes (excluding null)
SerdNodeFlags flags; ///< Node flags (string properties)
- SerdType type; ///< Node type
+ SerdNodeType type; ///< Node type
} SerdNode;
static const SerdNode SERD_NODE_NULL = {NULL, 0, 0, SERD_NOTHING};
@@ -361,7 +361,7 @@ static const SerdNode SERD_NODE_NULL = {NULL, 0, 0, SERD_NOTHING};
This measures, but does not copy, `str`. No memory is allocated.
*/
SERD_API SerdNode
-serd_node_from_string(SerdType type, const char* SERD_NULLABLE str);
+serd_node_from_string(SerdNodeType type, const char* SERD_NULLABLE str);
/**
Make a (shallow) node from a prefix of `str`.
@@ -370,7 +370,7 @@ serd_node_from_string(SerdType type, const char* SERD_NULLABLE str);
Note that the returned node may not be null terminated.
*/
SERD_API SerdNode
-serd_node_from_substring(SerdType type,
+serd_node_from_substring(SerdNodeType type,
const char* SERD_NULLABLE str,
size_t len);
diff --git a/src/node.c b/src/node.c
index b2cca085..015901f5 100644
--- a/src/node.c
+++ b/src/node.c
@@ -54,7 +54,7 @@ string_sink(const void* const buf, const size_t len, void* const stream)
}
SerdNode
-serd_node_from_string(SerdType type, const char* const str)
+serd_node_from_string(const SerdNodeType type, const char* const str)
{
if (!str) {
return SERD_NODE_NULL;
@@ -67,9 +67,9 @@ serd_node_from_string(SerdType type, const char* const str)
}
SerdNode
-serd_node_from_substring(const SerdType type,
- const char* const str,
- const size_t len)
+serd_node_from_substring(const SerdNodeType type,
+ const char* const str,
+ const size_t len)
{
if (!str) {
return SERD_NODE_NULL;
diff --git a/src/node.h b/src/node.h
index a4d5dcd5..5d0e9c80 100644
--- a/src/node.h
+++ b/src/node.h
@@ -11,7 +11,7 @@
struct SerdNodeImpl {
size_t n_bytes; /**< Size in bytes (not including null) */
SerdNodeFlags flags; /**< Node flags (e.g. string properties) */
- SerdType type; /**< Node type */
+ SerdNodeType type; /**< Node type */
};
static inline char* SERD_NONNULL
@@ -27,7 +27,7 @@ serd_node_buffer_c(const SerdNode* SERD_NONNULL node)
}
SerdNode* SERD_ALLOCATED
-serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdType type);
+serd_node_malloc(size_t n_bytes, SerdNodeFlags flags, SerdNodeType type);
void
serd_node_set(SerdNode* SERD_NULLABLE* SERD_NONNULL dst,
diff --git a/src/reader.c b/src/reader.c
index 45f5f157..8bd80d37 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -71,11 +71,11 @@ serd_file_read_byte(void* const buf,
}
Ref
-push_node_padded(SerdReader* const reader,
- const size_t maxlen,
- const SerdType type,
- const char* const str,
- const size_t n_bytes)
+push_node_padded(SerdReader* const reader,
+ const size_t maxlen,
+ const SerdNodeType type,
+ const char* const str,
+ const size_t n_bytes)
{
void* mem = serd_stack_push_aligned(
&reader->stack, sizeof(SerdNode) + maxlen + 1, sizeof(SerdNode));
@@ -98,10 +98,10 @@ push_node_padded(SerdReader* const reader,
}
Ref
-push_node(SerdReader* const reader,
- const SerdType type,
- const char* const str,
- const size_t n_bytes)
+push_node(SerdReader* const reader,
+ const SerdNodeType type,
+ const char* const str,
+ const size_t n_bytes)
{
return push_node_padded(reader, n_bytes, type, str, n_bytes);
}
diff --git a/src/reader.h b/src/reader.h
index 05774abe..ce2d1a59 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -70,14 +70,17 @@ SerdStatus
r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...);
Ref
-push_node_padded(SerdReader* reader,
- size_t maxlen,
- SerdType type,
- const char* str,
- size_t n_bytes);
+push_node_padded(SerdReader* reader,
+ size_t maxlen,
+ SerdNodeType type,
+ const char* str,
+ size_t n_bytes);
Ref
-push_node(SerdReader* reader, SerdType type, const char* str, size_t n_bytes);
+push_node(SerdReader* reader,
+ SerdNodeType type,
+ const char* str,
+ size_t n_bytes);
SERD_PURE_FUNC size_t
genid_size(const SerdReader* reader);