aboutsummaryrefslogtreecommitdiffstats
path: root/src/n3.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/n3.c')
-rw-r--r--src/n3.c270
1 files changed, 142 insertions, 128 deletions
diff --git a/src/n3.c b/src/n3.c
index 439474dc..c33febeb 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -45,7 +45,7 @@ fancy_syntax(const SerdReader* reader)
}
static SerdStatus
-read_collection(SerdReader* reader, ReadContext ctx, Ref* dest);
+read_collection(SerdReader* reader, ReadContext ctx, SerdNode** dest);
static SerdStatus
read_predicateObjectList(SerdReader* reader, ReadContext ctx, bool* ate_dot);
@@ -64,7 +64,7 @@ read_HEX(SerdReader* reader)
// Read UCHAR escape, initial \ is already eaten by caller
static inline SerdStatus
-read_UCHAR(SerdReader* reader, Ref dest, uint32_t* char_code)
+read_UCHAR(SerdReader* reader, SerdNode* dest, uint32_t* char_code)
{
const int b = peek_byte(reader);
unsigned length = 0;
@@ -78,7 +78,6 @@ read_UCHAR(SerdReader* reader, Ref dest, uint32_t* char_code)
default:
return SERD_ERR_BAD_SYNTAX;
}
-
eat_byte_safe(reader, b);
uint8_t buf[9] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -106,9 +105,9 @@ read_UCHAR(SerdReader* reader, Ref dest, uint32_t* char_code)
SERD_ERR_BAD_SYNTAX,
"unicode character 0x%X out of range\n",
code);
- push_bytes(reader, dest, replacement_char, 3);
- *char_code = 0xFFFD;
- return SERD_SUCCESS;
+ *char_code = 0xFFFD;
+ const SerdStatus st = push_bytes(reader, dest, replacement_char, 3);
+ return st ? st : SERD_SUCCESS;
}
// Build output in buf
@@ -119,62 +118,55 @@ read_UCHAR(SerdReader* reader, Ref dest, uint32_t* char_code)
buf[3] = (uint8_t)(0x80u | (c & 0x3Fu));
c >>= 6;
c |= (16 << 12); // set bit 4
- /* fallthru */
+ // fallthru
case 3:
buf[2] = (uint8_t)(0x80u | (c & 0x3Fu));
c >>= 6;
c |= (32 << 6); // set bit 5
- /* fallthru */
+ // fallthru
case 2:
buf[1] = (uint8_t)(0x80u | (c & 0x3Fu));
c >>= 6;
c |= 0xC0; // set bits 6 and 7
- /* fallthru */
+ // fallthru
case 1:
buf[0] = (uint8_t)c;
- /* fallthru */
+ // fallthru
default:
break;
}
- push_bytes(reader, dest, buf, size);
*char_code = code;
- return SERD_SUCCESS;
+ return push_bytes(reader, dest, buf, size);
}
// Read ECHAR escape, initial \ is already eaten by caller
static inline SerdStatus
-read_ECHAR(SerdReader* reader, Ref dest, SerdNodeFlags* flags)
+read_ECHAR(SerdReader* reader, SerdNode* dest, SerdNodeFlags* flags)
{
const int c = peek_byte(reader);
switch (c) {
case 't':
eat_byte_safe(reader, 't');
- push_byte(reader, dest, '\t');
- return SERD_SUCCESS;
+ return push_byte(reader, dest, '\t');
case 'b':
eat_byte_safe(reader, 'b');
- push_byte(reader, dest, '\b');
- return SERD_SUCCESS;
+ return push_byte(reader, dest, '\b');
case 'n':
*flags |= SERD_HAS_NEWLINE;
eat_byte_safe(reader, 'n');
- push_byte(reader, dest, '\n');
- return SERD_SUCCESS;
+ return push_byte(reader, dest, '\n');
case 'r':
*flags |= SERD_HAS_NEWLINE;
eat_byte_safe(reader, 'r');
- push_byte(reader, dest, '\r');
- return SERD_SUCCESS;
+ return push_byte(reader, dest, '\r');
case 'f':
eat_byte_safe(reader, 'f');
- push_byte(reader, dest, '\f');
- return SERD_SUCCESS;
+ return push_byte(reader, dest, '\f');
case '\\':
case '"':
case '\'':
- push_byte(reader, dest, eat_byte_safe(reader, c));
- return SERD_SUCCESS;
+ return push_byte(reader, dest, eat_byte_safe(reader, c));
default:
return SERD_ERR_BAD_SYNTAX;
}
@@ -216,22 +208,21 @@ read_utf8_bytes(SerdReader* reader, uint8_t bytes[4], uint32_t* size, uint8_t c)
}
static SerdStatus
-read_utf8_character(SerdReader* reader, Ref dest, uint8_t c)
+read_utf8_character(SerdReader* reader, SerdNode* dest, uint8_t c)
{
uint32_t size = 0;
uint8_t bytes[4] = {0, 0, 0, 0};
SerdStatus st = read_utf8_bytes(reader, bytes, &size, c);
if (st) {
push_bytes(reader, dest, replacement_char, 3);
- } else {
- push_bytes(reader, dest, bytes, size);
+ return st;
}
- return st;
+ return push_bytes(reader, dest, bytes, size);
}
static SerdStatus
-read_utf8_code(SerdReader* reader, Ref dest, uint32_t* code, uint8_t c)
+read_utf8_code(SerdReader* reader, SerdNode* dest, uint32_t* code, uint8_t c)
{
uint32_t size = 0;
uint8_t bytes[4] = {0, 0, 0, 0};
@@ -241,15 +232,20 @@ read_utf8_code(SerdReader* reader, Ref dest, uint32_t* code, uint8_t c)
return st;
}
- push_bytes(reader, dest, bytes, size);
- *code = parse_counted_utf8_char(bytes, size);
+ if (!(st = push_bytes(reader, dest, bytes, size))) {
+ *code = parse_counted_utf8_char(bytes, size);
+ }
+
return st;
}
// Read one character (possibly multi-byte)
// The first byte, c, has already been eaten by caller
static inline SerdStatus
-read_character(SerdReader* reader, Ref dest, SerdNodeFlags* flags, uint8_t c)
+read_character(SerdReader* reader,
+ SerdNode* dest,
+ SerdNodeFlags* flags,
+ uint8_t c)
{
if (!(c & 0x80)) {
switch (c) {
@@ -264,9 +260,9 @@ read_character(SerdReader* reader, Ref dest, SerdNodeFlags* flags, uint8_t c)
default:
break;
}
+
return push_byte(reader, dest, c);
}
-
return read_utf8_character(reader, dest, c);
}
@@ -332,7 +328,7 @@ eat_delim(SerdReader* reader, const char delim)
// Initial triple quotes are already eaten by caller
static SerdStatus
read_STRING_LITERAL_LONG(SerdReader* reader,
- Ref ref,
+ SerdNode* ref,
SerdNodeFlags* flags,
uint8_t q)
{
@@ -373,7 +369,7 @@ read_STRING_LITERAL_LONG(SerdReader* reader,
// Initial quote is already eaten by caller
static SerdStatus
read_STRING_LITERAL(SerdReader* reader,
- Ref ref,
+ SerdNode* ref,
SerdNodeFlags* flags,
uint8_t q)
{
@@ -412,7 +408,7 @@ read_STRING_LITERAL(SerdReader* reader,
}
static SerdStatus
-read_String(SerdReader* reader, Ref node, SerdNodeFlags* flags)
+read_String(SerdReader* reader, SerdNode* node, SerdNodeFlags* flags)
{
const int q1 = peek_byte(reader);
eat_byte_safe(reader, q1);
@@ -457,7 +453,7 @@ is_PN_CHARS_BASE(const uint32_t c)
}
static SerdStatus
-read_PN_CHARS_BASE(SerdReader* reader, Ref dest)
+read_PN_CHARS_BASE(SerdReader* reader, SerdNode* dest)
{
uint32_t code = 0;
const int c = peek_byte(reader);
@@ -487,7 +483,7 @@ is_PN_CHARS(const uint32_t c)
}
static SerdStatus
-read_PN_CHARS(SerdReader* reader, Ref dest)
+read_PN_CHARS(SerdReader* reader, SerdNode* dest)
{
uint32_t code = 0;
const int c = peek_byte(reader);
@@ -507,7 +503,7 @@ read_PN_CHARS(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_PERCENT(SerdReader* reader, Ref dest)
+read_PERCENT(SerdReader* reader, SerdNode* dest)
{
push_byte(reader, dest, eat_byte_safe(reader, '%'));
const uint8_t h1 = read_HEX(reader);
@@ -521,7 +517,7 @@ read_PERCENT(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_PN_LOCAL_ESC(SerdReader* reader, Ref dest)
+read_PN_LOCAL_ESC(SerdReader* reader, SerdNode* dest)
{
eat_byte_safe(reader, '\\');
@@ -557,7 +553,7 @@ read_PN_LOCAL_ESC(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_PLX(SerdReader* reader, Ref dest)
+read_PLX(SerdReader* reader, SerdNode* dest)
{
const int c = peek_byte(reader);
switch (c) {
@@ -571,7 +567,7 @@ read_PLX(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_PN_LOCAL(SerdReader* reader, Ref dest, bool* ate_dot)
+read_PN_LOCAL(SerdReader* reader, SerdNode* dest, bool* ate_dot)
{
int c = peek_byte(reader);
SerdStatus st = SERD_SUCCESS;
@@ -610,10 +606,9 @@ read_PN_LOCAL(SerdReader* reader, Ref dest, bool* ate_dot)
trailing_unescaped_dot = (c == '.');
}
- SerdNode* const n = deref(reader, dest);
if (trailing_unescaped_dot) {
// Ate trailing dot, pop it from stack/node and inform caller
- --n->n_bytes;
+ --dest->n_bytes;
serd_stack_pop(&reader->stack, 1);
*ate_dot = true;
}
@@ -623,19 +618,21 @@ read_PN_LOCAL(SerdReader* reader, Ref dest, bool* ate_dot)
// Read the remainder of a PN_PREFIX after some initial characters
static SerdStatus
-read_PN_PREFIX_tail(SerdReader* reader, Ref dest)
+read_PN_PREFIX_tail(SerdReader* reader, SerdNode* dest)
{
- int c = 0;
+ SerdStatus st = SERD_SUCCESS;
+ int c = 0;
while ((c = peek_byte(reader))) { // Middle: (PN_CHARS | '.')*
if (c == '.') {
- push_byte(reader, dest, eat_byte_safe(reader, c));
- } else if (read_PN_CHARS(reader, dest)) {
+ if ((st = push_byte(reader, dest, eat_byte_safe(reader, c)))) {
+ return st;
+ }
+ } else if ((st = read_PN_CHARS(reader, dest))) {
break;
}
}
- const SerdNode* const n = deref(reader, dest);
- if (serd_node_string(n)[n->n_bytes - 1] == '.' &&
+ if (!st && serd_node_string(dest)[dest->n_bytes - 1] == '.' &&
read_PN_CHARS(reader, dest)) {
return r_err(reader, SERD_ERR_BAD_SYNTAX, "prefix ends with `.'\n");
}
@@ -644,7 +641,7 @@ read_PN_PREFIX_tail(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_PN_PREFIX(SerdReader* reader, Ref dest)
+read_PN_PREFIX(SerdReader* reader, SerdNode* dest)
{
if (!read_PN_CHARS_BASE(reader, dest)) {
return read_PN_PREFIX_tail(reader, dest);
@@ -654,33 +651,33 @@ read_PN_PREFIX(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_LANGTAG(SerdReader* reader, Ref* dest)
+read_LANGTAG(SerdReader* reader, SerdNode** dest)
{
int c = peek_byte(reader);
if (!is_alpha(c)) {
return r_err(reader, SERD_ERR_BAD_SYNTAX, "unexpected `%c'\n", c);
}
- *dest = push_node(reader, SERD_LITERAL, "", 0);
+ if (!(*dest = push_node(reader, SERD_LITERAL, "", 0))) {
+ return SERD_ERR_OVERFLOW;
+ }
SerdStatus st = SERD_SUCCESS;
TRY(st, push_byte(reader, *dest, eat_byte_safe(reader, c)));
while ((c = peek_byte(reader)) && is_alpha(c)) {
TRY(st, push_byte(reader, *dest, eat_byte_safe(reader, c)));
}
-
while (peek_byte(reader) == '-') {
TRY(st, push_byte(reader, *dest, eat_byte_safe(reader, '-')));
while ((c = peek_byte(reader)) && (is_alpha(c) || is_digit(c))) {
TRY(st, push_byte(reader, *dest, eat_byte_safe(reader, c)));
}
}
-
return SERD_SUCCESS;
}
static SerdStatus
-read_IRIREF_scheme(SerdReader* reader, Ref dest)
+read_IRIREF_scheme(SerdReader* reader, SerdNode* dest)
{
int c = peek_byte(reader);
if (!is_alpha(c)) {
@@ -710,7 +707,7 @@ read_IRIREF_scheme(SerdReader* reader, Ref dest)
}
static SerdStatus
-read_IRIREF(SerdReader* reader, Ref* dest)
+read_IRIREF(SerdReader* reader, SerdNode** dest)
{
if (!eat_byte_check(reader, '<')) {
return SERD_ERR_BAD_SYNTAX;
@@ -795,7 +792,10 @@ read_IRIREF(SerdReader* reader, Ref* dest)
}
static SerdStatus
-read_PrefixedName(SerdReader* reader, Ref dest, bool read_prefix, bool* ate_dot)
+read_PrefixedName(SerdReader* reader,
+ SerdNode* dest,
+ bool read_prefix,
+ bool* ate_dot)
{
SerdStatus st = SERD_SUCCESS;
if (read_prefix && ((st = read_PN_PREFIX(reader, dest)) > SERD_FAILURE)) {
@@ -814,7 +814,7 @@ read_PrefixedName(SerdReader* reader, Ref dest, bool read_prefix, bool* ate_dot)
}
static SerdStatus
-read_0_9(SerdReader* reader, Ref str, bool at_least_one)
+read_0_9(SerdReader* reader, SerdNode* str, bool at_least_one)
{
unsigned count = 0;
SerdStatus st = SERD_SUCCESS;
@@ -831,8 +831,8 @@ read_0_9(SerdReader* reader, Ref str, bool at_least_one)
static SerdStatus
read_number(SerdReader* reader,
- Ref* dest,
- Ref* datatype,
+ SerdNode** dest,
+ SerdNode** datatype,
SerdNodeFlags* flags,
bool* ate_dot)
{
@@ -845,9 +845,14 @@ read_number(SerdReader* reader,
SerdStatus st = SERD_SUCCESS;
int c = peek_byte(reader);
bool has_decimal = false;
+ if (!*dest) {
+ return SERD_ERR_OVERFLOW;
+ }
+
if (c == '-' || c == '+') {
push_byte(reader, *dest, eat_byte_safe(reader, c));
}
+
if ((c = peek_byte(reader)) == '.') {
has_decimal = true;
// decimal case 2 (e.g. '.0' or `-.0' or `+.0')
@@ -900,22 +905,24 @@ read_number(SerdReader* reader,
}
static SerdStatus
-read_iri(SerdReader* reader, Ref* dest, bool* ate_dot)
+read_iri(SerdReader* reader, SerdNode** dest, bool* ate_dot)
{
switch (peek_byte(reader)) {
case '<':
return read_IRIREF(reader, dest);
default:
- *dest = push_node(reader, SERD_CURIE, "", 0);
+ if (!(*dest = push_node(reader, SERD_CURIE, "", 0))) {
+ return SERD_ERR_OVERFLOW;
+ }
return read_PrefixedName(reader, *dest, true, ate_dot);
}
}
static SerdStatus
read_literal(SerdReader* reader,
- Ref* dest,
- Ref* datatype,
- Ref* lang,
+ SerdNode** dest,
+ SerdNode** datatype,
+ SerdNode** lang,
SerdNodeFlags* flags,
bool* ate_dot)
{
@@ -954,7 +961,7 @@ read_literal(SerdReader* reader,
}
static SerdStatus
-read_verb(SerdReader* reader, Ref* dest)
+read_verb(SerdReader* reader, SerdNode** dest)
{
if (peek_byte(reader) == '<') {
return read_IRIREF(reader, dest);
@@ -963,11 +970,13 @@ read_verb(SerdReader* reader, Ref* dest)
/* Either a qname, or "a". Read the prefix first, and if it is in fact
"a", produce that instead.
*/
- *dest = push_node(reader, SERD_CURIE, "", 0);
+ if (!(*dest = push_node(reader, SERD_CURIE, "", 0))) {
+ return SERD_ERR_OVERFLOW;
+ }
SerdStatus st = read_PN_PREFIX(reader, *dest);
bool ate_dot = false;
- SerdNode* node = deref(reader, *dest);
+ SerdNode* node = *dest;
const int next = peek_byte(reader);
if (!st && node->n_bytes == 1 && serd_node_string(node)[0] == 'a' &&
next != ':' && !is_PN_CHARS_BASE((uint32_t)next)) {
@@ -986,35 +995,34 @@ read_verb(SerdReader* reader, Ref* dest)
}
static SerdStatus
-read_BLANK_NODE_LABEL(SerdReader* reader, Ref* dest, bool* ate_dot)
+read_BLANK_NODE_LABEL(SerdReader* reader, SerdNode** dest, bool* ate_dot)
{
eat_byte_safe(reader, '_');
eat_byte_check(reader, ':');
- const Ref ref = *dest = push_node(reader,
- SERD_BLANK,
- reader->bprefix ? reader->bprefix : "",
- reader->bprefix_len);
+ SerdNode* n = *dest = push_node(reader,
+ SERD_BLANK,
+ reader->bprefix ? reader->bprefix : "",
+ reader->bprefix_len);
int c = peek_byte(reader); // First: (PN_CHARS | '_' | [0-9])
if (is_digit(c) || c == '_') {
- push_byte(reader, ref, eat_byte_safe(reader, c));
- } else if (read_PN_CHARS(reader, ref)) {
- *dest = pop_node(reader, *dest);
+ push_byte(reader, n, eat_byte_safe(reader, c));
+ } else if (read_PN_CHARS(reader, n)) {
+ *dest = pop_node(reader, n);
return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid name start\n");
}
while ((c = peek_byte(reader))) { // Middle: (PN_CHARS | '.')*
if (c == '.') {
- push_byte(reader, ref, eat_byte_safe(reader, c));
- } else if (read_PN_CHARS(reader, ref)) {
+ push_byte(reader, n, eat_byte_safe(reader, c));
+ } else if (read_PN_CHARS(reader, n)) {
break;
}
}
- SerdNode* n = deref(reader, ref);
- char* buf = serd_node_buffer(n);
- if (buf[n->n_bytes - 1] == '.' && read_PN_CHARS(reader, ref)) {
+ char* buf = serd_node_buffer(n);
+ if (buf[n->n_bytes - 1] == '.' && read_PN_CHARS(reader, n)) {
// Ate trailing dot, pop it from stack/node and inform caller
--n->n_bytes;
serd_stack_pop(&reader->stack, 1);
@@ -1027,7 +1035,7 @@ read_BLANK_NODE_LABEL(SerdReader* reader, Ref* dest, bool* ate_dot)
buf[reader->bprefix_len] = 'B'; // Prevent clash
reader->seen_genid = true;
} else if (reader->seen_genid && buf[reader->bprefix_len] == 'B') {
- *dest = pop_node(reader, *dest);
+ *dest = pop_node(reader, n);
return r_err(reader,
SERD_ERR_ID_CLASH,
"found both `b' and `B' blank IDs, prefix required\n");
@@ -1037,24 +1045,24 @@ read_BLANK_NODE_LABEL(SerdReader* reader, Ref* dest, bool* ate_dot)
return SERD_SUCCESS;
}
-static Ref
+static SerdNode*
read_blankName(SerdReader* reader)
{
eat_byte_safe(reader, '=');
if (eat_byte_check(reader, '=') != '=') {
r_err(reader, SERD_ERR_BAD_SYNTAX, "expected `='\n");
- return 0;
+ return NULL;
}
- Ref subject = 0;
- bool ate_dot = false;
+ SerdNode* subject = 0;
+ bool ate_dot = false;
read_ws_star(reader);
read_iri(reader, &subject, &ate_dot);
return subject;
}
static SerdStatus
-read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest)
+read_anon(SerdReader* reader, ReadContext ctx, bool subject, SerdNode** dest)
{
const SerdStatementFlags old_flags = *ctx.flags;
bool empty = false;
@@ -1091,7 +1099,7 @@ read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest)
return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n");
}
read_ws_star(reader);
- serd_sink_write_end(reader->sink, deref(reader, *dest));
+ serd_sink_write_end(reader->sink, *dest);
*ctx.flags = old_flags;
}
return (eat_byte_check(reader, ']') == ']') ? SERD_SUCCESS
@@ -1114,10 +1122,9 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
SerdStatus ret = SERD_FAILURE;
bool simple = (ctx->subject != 0);
- SerdNode* node = NULL;
- Ref o = 0;
- Ref datatype = 0;
- Ref lang = 0;
+ SerdNode* o = 0;
+ SerdNode* datatype = 0;
+ SerdNode* lang = 0;
uint32_t flags = 0;
const int c = peek_byte(reader);
if (!fancy_syntax(reader)) {
@@ -1173,16 +1180,18 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
/* Either a boolean literal, or a qname. Read the prefix first, and if
it is in fact a "true" or "false" literal, produce that instead.
*/
- o = push_node(reader, SERD_CURIE, "", 0);
+ if (!(o = push_node(reader, SERD_CURIE, "", 0))) {
+ return SERD_ERR_OVERFLOW;
+ }
+
while (!read_PN_CHARS_BASE(reader, o)) {
}
- node = deref(reader, o);
- if ((node->n_bytes == 4 && !memcmp(serd_node_string(node), "true", 4)) ||
- (node->n_bytes == 5 && !memcmp(serd_node_string(node), "false", 5))) {
- flags = flags | SERD_HAS_DATATYPE;
- node->type = SERD_LITERAL;
- datatype = push_node(reader, SERD_URI, XSD_BOOLEAN, XSD_BOOLEAN_LEN);
- ret = SERD_SUCCESS;
+ if ((o->n_bytes == 4 && !memcmp(serd_node_string(o), "true", 4)) ||
+ (o->n_bytes == 5 && !memcmp(serd_node_string(o), "false", 5))) {
+ flags = flags | SERD_HAS_DATATYPE;
+ o->type = SERD_LITERAL;
+ datatype = push_node(reader, SERD_URI, XSD_BOOLEAN, XSD_BOOLEAN_LEN);
+ ret = SERD_SUCCESS;
} else if (read_PN_PREFIX_tail(reader, o) > SERD_FAILURE) {
ret = SERD_ERR_BAD_SYNTAX;
} else {
@@ -1195,7 +1204,7 @@ read_object(SerdReader* reader, ReadContext* ctx, bool emit, bool* ate_dot)
}
if (!ret && simple && o) {
- deref(reader, o)->flags = flags;
+ o->flags = flags;
}
if (!ret && emit && simple) {
@@ -1273,8 +1282,8 @@ read_predicateObjectList(SerdReader* reader, ReadContext ctx, bool* ate_dot)
static SerdStatus
end_collection(SerdReader* reader,
ReadContext ctx,
- Ref n1,
- Ref n2,
+ SerdNode* n1,
+ SerdNode* n2,
SerdStatus st)
{
pop_node(reader, n2);
@@ -1289,7 +1298,7 @@ end_collection(SerdReader* reader,
}
static SerdStatus
-read_collection(SerdReader* reader, ReadContext ctx, Ref* dest)
+read_collection(SerdReader* reader, ReadContext ctx, SerdNode** dest)
{
SerdStatus st = SERD_SUCCESS;
eat_byte_safe(reader, '(');
@@ -1310,10 +1319,15 @@ read_collection(SerdReader* reader, ReadContext ctx, Ref* dest)
/* The order of node allocation here is necessarily not in stack order,
so we create two nodes and recycle them throughout. */
- Ref n1 = push_node_padded(reader, genid_size(reader), SERD_BLANK, "", 0);
- Ref n2 = 0;
- Ref node = n1;
- Ref rest = 0;
+ SerdNode* n1 =
+ push_node_padded(reader, genid_size(reader), SERD_BLANK, "", 0);
+ SerdNode* n2 = 0;
+ SerdNode* node = n1;
+ SerdNode* rest = 0;
+
+ if (!n1) {
+ return SERD_ERR_OVERFLOW;
+ }
ctx.subject = *dest;
while (!peek_delim(reader, ')')) {
@@ -1348,7 +1362,7 @@ read_collection(SerdReader* reader, ReadContext ctx, Ref* dest)
}
static SerdStatus
-read_subject(SerdReader* reader, ReadContext ctx, Ref* dest, int* s_type)
+read_subject(SerdReader* reader, ReadContext ctx, SerdNode** dest, int* s_type)
{
SerdStatus st = SERD_SUCCESS;
bool ate_dot = false;
@@ -1375,7 +1389,7 @@ read_subject(SerdReader* reader, ReadContext ctx, Ref* dest, int* s_type)
}
static SerdStatus
-read_labelOrSubject(SerdReader* reader, Ref* dest)
+read_labelOrSubject(SerdReader* reader, SerdNode** dest)
{
bool ate_dot = false;
switch (peek_byte(reader)) {
@@ -1428,9 +1442,9 @@ read_base(SerdReader* reader, bool sparql, bool token)
read_ws_star(reader);
- Ref uri = 0;
+ SerdNode* uri = NULL;
TRY(st, read_IRIREF(reader, &uri));
- TRY(st, serd_sink_write_base(reader->sink, deref(reader, uri)));
+ TRY(st, serd_sink_write_base(reader->sink, uri));
pop_node(reader, uri);
read_ws_star(reader);
@@ -1454,7 +1468,11 @@ read_prefixID(SerdReader* reader, bool sparql, bool token)
}
read_ws_star(reader);
- Ref name = push_node(reader, SERD_LITERAL, "", 0);
+ SerdNode* name = push_node(reader, SERD_LITERAL, "", 0);
+ if (!name) {
+ return SERD_ERR_OVERFLOW;
+ }
+
if ((st = read_PN_PREFIX(reader, name)) > SERD_FAILURE) {
return st;
}
@@ -1465,11 +1483,10 @@ read_prefixID(SerdReader* reader, bool sparql, bool token)
}
read_ws_star(reader);
- Ref uri = 0;
+ SerdNode* uri = NULL;
TRY(st, read_IRIREF(reader, &uri));
- st = serd_sink_write_prefix(
- reader->sink, deref(reader, name), deref(reader, uri));
+ st = serd_sink_write_prefix(reader->sink, name, uri);
pop_node(reader, uri);
pop_node(reader, name);
@@ -1547,14 +1564,11 @@ read_wrappedGraph(SerdReader* reader, ReadContext* ctx)
}
static int
-tokcmp(SerdReader* reader, Ref ref, const char* tok, size_t n)
+tokcmp(SerdNode* node, const char* tok, size_t n)
{
- SerdNode* node = deref(reader, ref);
- if (!node || node->n_bytes != n) {
- return -1;
- }
-
- return serd_strncasecmp(serd_node_string(node), tok, n);
+ return ((!node || node->n_bytes != n)
+ ? -1
+ : serd_strncasecmp(serd_node_string(node), tok, n));
}
SerdStatus
@@ -1595,11 +1609,11 @@ read_n3_statement(SerdReader* reader)
return st;
}
- if (!tokcmp(reader, ctx.subject, "base", 4)) {
+ if (!tokcmp(ctx.subject, "base", 4)) {
st = read_base(reader, true, false);
- } else if (!tokcmp(reader, ctx.subject, "prefix", 6)) {
+ } else if (!tokcmp(ctx.subject, "prefix", 6)) {
st = read_prefixID(reader, true, false);
- } else if (!tokcmp(reader, ctx.subject, "graph", 5)) {
+ } else if (!tokcmp(ctx.subject, "graph", 5)) {
read_ws_star(reader);
TRY(st, read_labelOrSubject(reader, &ctx.graph));
read_ws_star(reader);
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-19 12:13:44 +0000