1 files changed, 24 insertions, 15 deletions

diff --git a/src/reader.h b/src/reader.h
index 9b558d1f..74255862 100644
--- a/src/reader.h
+++ b/src/reader.h
@@ -8,16 +8,16 @@
 #include "byte_source.h"
 #include "stack.h"
 
-#include "serd/serd.h"
+#include <serd/serd.h>
 
 #include <assert.h>
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
-#include <stdio.h>
 
 #ifdef SERD_STACK_CHECK
 #  define SERD_STACK_ASSERT_TOP(reader, ref) \
-    assert(ref == reader->allocs[reader->n_allocs - 1]);
+    assert(ref == reader->allocs[reader->n_allocs - 1])
 #else
 #  define SERD_STACK_ASSERT_TOP(reader, ref)
 #endif
@@ -69,6 +69,9 @@ SERD_LOG_FUNC(3, 4)
 SerdStatus
 r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...);
 
+SerdStatus
+r_err_char(SerdReader* reader, const char* kind, int c);
+
 Ref
 push_node_padded(SerdReader* reader,
                  size_t      maxlen,
@@ -91,6 +94,9 @@ set_blank_id(SerdReader* reader, Ref ref, size_t buf_size);
 SerdNode*
 deref(SerdReader* reader, Ref ref);
 
+bool
+pop_last_node_char(SerdReader* reader, SerdNode* node);
+
 Ref
 pop_node(SerdReader* reader, Ref ref);
 
@@ -110,15 +116,15 @@ SerdStatus
 read_turtleTrigDoc(SerdReader* reader);
 
 static inline int
-peek_byte(SerdReader* reader)
+peek_byte(SerdReader* const reader)
 {
   SerdByteSource* source = &reader->source;
 
-  return source->eof ? EOF : (int)source->read_buf[source->read_head];
+  return source->eof ? -1 : (int)source->read_buf[source->read_head];
 }
 
 static inline SerdStatus
-skip_byte(SerdReader* reader, const int byte)
+skip_byte(SerdReader* const reader, const int byte)
 {
   (void)byte;
 
@@ -127,8 +133,8 @@ skip_byte(SerdReader* reader, const int byte)
   return serd_byte_source_advance(&reader->source);
 }
 
-static inline int SERD_NODISCARD
-eat_byte_safe(SerdReader* reader, const int byte)
+SERD_NODISCARD static inline int
+eat_byte_safe(SerdReader* const reader, const int byte)
 {
   (void)byte;
 
@@ -138,19 +144,19 @@ eat_byte_safe(SerdReader* reader, const int byte)
   return byte;
 }
 
-static inline int SERD_NODISCARD
-eat_byte_check(SerdReader* reader, const int byte)
+SERD_NODISCARD static inline int
+eat_byte_check(SerdReader* const reader, const int byte)
 {
   const int c = peek_byte(reader);
   if (c != byte) {
-    r_err(reader, SERD_ERR_BAD_SYNTAX, "expected '%c', not '%c'\n", byte, c);
+    r_err(reader, SERD_ERR_BAD_SYNTAX, "expected '%c'\n", byte);
     return 0;
   }
   return eat_byte_safe(reader, byte);
 }
 
 static inline SerdStatus
-eat_string(SerdReader* reader, const char* str, unsigned n)
+eat_string(SerdReader* const reader, const char* const str, const unsigned n)
 {
   for (unsigned i = 0; i < n; ++i) {
     if (!eat_byte_check(reader, ((const uint8_t*)str)[i])) {
@@ -161,9 +167,9 @@ eat_string(SerdReader* reader, const char* str, unsigned n)
 }
 
 static inline SerdStatus
-push_byte(SerdReader* reader, Ref ref, const int c)
+push_byte(SerdReader* const reader, const Ref ref, const int c)
 {
-  assert(c != EOF);
+  assert(c >= 0);
   SERD_STACK_ASSERT_TOP(reader, ref);
 
   uint8_t* const  s    = (uint8_t*)serd_stack_push(&reader->stack, 1);
@@ -180,7 +186,10 @@ push_byte(SerdReader* reader, Ref ref, const int c)
 }
 
 static inline void
-push_bytes(SerdReader* reader, Ref ref, const uint8_t* bytes, unsigned len)
+push_bytes(SerdReader* const    reader,
+           const Ref            ref,
+           const uint8_t* const bytes,
+           const unsigned       len)
 {
   for (unsigned i = 0; i < len; ++i) {
     push_byte(reader, ref, bytes[i]);