aboutsummaryrefslogtreecommitdiffstats
path: root/src/n3.c
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-02-04 15:33:36 +0100
committerDavid Robillard <d@drobilla.net>2019-12-19 08:43:27 -0500
commit745d214ba0a1c0cdbfece6bd52a96f08a1c74b52 (patch)
treecd34daa3cb1272b4b81f2a6ca244b0a2234c3855 /src/n3.c
parent12f165575f75916d4ec6fe6f200810b27c5c084f (diff)
downloadserd-745d214ba0a1c0cdbfece6bd52a96f08a1c74b52.tar.gz
serd-745d214ba0a1c0cdbfece6bd52a96f08a1c74b52.tar.bz2
serd-745d214ba0a1c0cdbfece6bd52a96f08a1c74b52.zip
Use opaque node API
Diffstat (limited to 'src/n3.c')
-rw-r--r--src/n3.c28
1 files changed, 16 insertions, 12 deletions
diff --git a/src/n3.c b/src/n3.c
index 4223961d..9239f67c 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -565,7 +565,8 @@ read_PN_PREFIX_tail(SerdReader* reader, Ref dest)
}
const SerdNode* const n = deref(reader, dest);
- if (n->buf[n->n_bytes - 1] == '.' && read_PN_CHARS(reader, dest)) {
+ if (serd_node_get_string(n)[n->n_bytes - 1] == '.' &&
+ read_PN_CHARS(reader, dest)) {
r_err(reader, SERD_ERR_BAD_SYNTAX, "prefix ends with `.'\n");
return SERD_ERR_BAD_SYNTAX;
}
@@ -839,7 +840,8 @@ read_verb(SerdReader* reader, Ref* dest)
bool ate_dot = false;
SerdNode* node = deref(reader, *dest);
const int next = peek_byte(reader);
- if (!st && node->n_bytes == 1 && node->buf[0] == 'a' &&
+ if (!st && node->n_bytes == 1 &&
+ serd_node_get_string(node)[0] == 'a' &&
next != ':' && !is_PN_CHARS_BASE((uint32_t)next)) {
pop_node(reader, *dest);
return (*dest = push_node(reader, SERD_URI, NS_RDF "type", 47));
@@ -878,8 +880,9 @@ read_BLANK_NODE_LABEL(SerdReader* reader, bool* ate_dot)
}
}
- SerdNode* n = deref(reader, ref);
- if (n->buf[n->n_bytes - 1] == '.' && read_PN_CHARS(reader, ref)) {
+ SerdNode* n = deref(reader, ref);
+ char* buf = serd_node_buffer(n);
+ if (buf[n->n_bytes - 1] == '.' && read_PN_CHARS(reader, ref)) {
// Ate trailing dot, pop it from stack/node and inform caller
--n->n_bytes;
serd_stack_pop(&reader->stack, 1);
@@ -887,12 +890,11 @@ read_BLANK_NODE_LABEL(SerdReader* reader, bool* ate_dot)
}
if (fancy_syntax(reader)) {
- if (is_digit(n->buf[reader->bprefix_len + 1])) {
- if ((n->buf[reader->bprefix_len]) == 'b') {
- ((char*)n->buf)[reader->bprefix_len] = 'B'; // Prevent clash
+ if (is_digit(buf[reader->bprefix_len + 1])) {
+ if ((buf[reader->bprefix_len]) == 'b') {
+ buf[reader->bprefix_len] = 'B'; // Prevent clash
reader->seen_genid = true;
- } else if (reader->seen_genid &&
- n->buf[reader->bprefix_len] == 'B') {
+ } else if (reader->seen_genid && buf[reader->bprefix_len] == 'B') {
r_err(reader, SERD_ERR_ID_CLASH,
"found both `b' and `B' blank IDs, prefix required\n");
return pop_node(reader, ref);
@@ -1022,8 +1024,10 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
o = push_node(reader, SERD_CURIE, "", 0);
while (!read_PN_CHARS_BASE(reader, o)) {}
node = deref(reader, o);
- if ((node->n_bytes == 4 && !memcmp(node->buf, "true", 4)) ||
- (node->n_bytes == 5 && !memcmp(node->buf, "false", 5))) {
+ if ((node->n_bytes == 4 &&
+ !memcmp(serd_node_get_string(node), "true", 4)) ||
+ (node->n_bytes == 5 &&
+ !memcmp(serd_node_get_string(node), "false", 5))) {
node->type = SERD_LITERAL;
datatype = push_node(
reader, SERD_URI, XSD_BOOLEAN, XSD_BOOLEAN_LEN);
@@ -1358,7 +1362,7 @@ tokcmp(SerdReader* reader, Ref ref, const char* tok, size_t n)
if (!node || node->n_bytes != n) {
return -1;
}
- return serd_strncasecmp((const char*)node->buf, tok, n);
+ return serd_strncasecmp(serd_node_get_string(node), tok, n);
}
bool