Use opaque node API

1 files changed, 17 insertions, 11 deletions

diff --git a/src/n3.c b/src/n3.c
index fcd78bc3..22398604 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -15,6 +15,7 @@
 */
 
 #include "byte_source.h"
+#include "node.h"
 #include "reader.h"
 #include "serd_internal.h"
 #include "stack.h"
@@ -604,7 +605,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_string(n)[n->n_bytes - 1] == '.' &&
+	    read_PN_CHARS(reader, dest)) {
 		return r_err(reader, SERD_ERR_BAD_SYNTAX, "prefix ends with `.'\n");
 	}
 
@@ -900,7 +902,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_string(node)[0] == 'a' &&
 	    next != ':' && !is_PN_CHARS_BASE((uint32_t)next)) {
 		pop_node(reader, *dest);
 		*dest = push_node(reader, SERD_URI, NS_RDF "type", 47);
@@ -943,8 +946,9 @@ read_BLANK_NODE_LABEL(SerdReader* reader, Ref* dest, 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);
@@ -952,12 +956,12 @@ read_BLANK_NODE_LABEL(SerdReader* reader, Ref* dest, 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') {
+			           buf[reader->bprefix_len] == 'B') {
 				*dest = pop_node(reader, *dest);
 				return r_err(
 					reader, SERD_ERR_ID_CLASH,
@@ -1094,8 +1098,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_string(node), "true", 4)) ||
+		    (node->n_bytes == 5 &&
+		     !memcmp(serd_node_string(node), "false", 5))) {
 			node->type = SERD_LITERAL;
 			datatype   = push_node(
 				reader, SERD_URI, XSD_BOOLEAN, XSD_BOOLEAN_LEN);
@@ -1459,7 +1465,7 @@ tokcmp(SerdReader* reader, Ref ref, const char* tok, size_t n)
 	if (!node || node->n_bytes != n) {
 		return -1;
 	}
-	return serd_strncasecmp(node->buf, tok, n);
+	return serd_strncasecmp(serd_node_string(node), tok, n);
 }
 
 SerdStatus