From 2a1a2522b23122e2428019489df9ddb5b0ec30ea Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sun, 25 Nov 2018 18:08:54 +0100
Subject: Remove reader status and handle errors more precisely

---
 src/n3.c | 55 ++++++++++++++++++++++++++-----------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

(limited to 'src/n3.c')

diff --git a/src/n3.c b/src/n3.c
index 8a45c079..88b5e2f8 100644
--- a/src/n3.c
+++ b/src/n3.c
@@ -195,9 +195,10 @@ read_utf8_character(SerdReader* reader, SerdNode* dest, uint8_t c)
 	uint32_t   size;
 	uint8_t    bytes[4];
 	SerdStatus st = read_utf8_bytes(reader, bytes, &size, c);
-	if (st) {
-		push_bytes(reader, dest, replacement_char, 3);
+	if (st && reader->strict) {
 		return st;
+	} else if (st) {
+		return push_bytes(reader, dest, replacement_char, 3);
 	}
 
 	return push_bytes(reader, dest, bytes, size);
@@ -209,9 +210,10 @@ read_utf8_code(SerdReader* reader, SerdNode* dest, uint32_t* code, uint8_t c)
 	uint32_t   size;
 	uint8_t    bytes[4];
 	SerdStatus st = read_utf8_bytes(reader, bytes, &size, c);
-	if (st) {
-		push_bytes(reader, dest, replacement_char, 3);
+	if (st && reader->strict) {
 		return st;
+	} else if (st) {
+		return push_bytes(reader, dest, replacement_char, 3);
 	}
 
 	if (!(st = push_bytes(reader, dest, bytes, size))) {
@@ -299,7 +301,7 @@ static SerdStatus
 read_STRING_LITERAL_LONG(SerdReader* reader, SerdNode* dest, uint8_t q)
 {
 	SerdStatus st = SERD_SUCCESS;
-	while (!reader->status) {
+	while (!st) {
 		const uint8_t c = peek_byte(reader);
 		uint32_t      code;
 		switch (c) {
@@ -315,7 +317,10 @@ read_STRING_LITERAL_LONG(SerdReader* reader, SerdNode* dest, uint8_t q)
 			}
 			break;
 		default:
-			if (c == q) {
+			if (reader->source.eof) {
+				st = r_err(reader, SERD_ERR_BAD_SYNTAX,
+				           "unexpected end of file\n");
+			} else if (c == q) {
 				eat_byte_safe(reader, q);
 				const uint8_t q2 = eat_byte_safe(reader, peek_byte(reader));
 				const uint8_t q3 = peek_byte(reader);
@@ -332,6 +337,7 @@ read_STRING_LITERAL_LONG(SerdReader* reader, SerdNode* dest, uint8_t q)
 			}
 		}
 	}
+
 	return st;
 }
 
@@ -341,24 +347,25 @@ static SerdStatus
 read_STRING_LITERAL(SerdReader* reader, SerdNode* dest, uint8_t q)
 {
 	SerdStatus st = SERD_SUCCESS;
-	while (!reader->status) {
+	while (!st) {
 		const uint8_t c    = peek_byte(reader);
 		uint32_t      code = 0;
 		switch (c) {
 		case '\n': case '\r':
-			r_err(reader, SERD_ERR_BAD_SYNTAX, "line end in short string\n");
-			return SERD_ERR_BAD_SYNTAX;
+			st = r_err(reader, SERD_ERR_BAD_SYNTAX,
+			           "line end in short string\n");
+			break;
 		case '\\':
 			eat_byte_safe(reader, c);
 			if ((st = read_ECHAR(reader, dest, &dest->flags)) &&
 			    (st = read_UCHAR(reader, dest, &code))) {
-				return r_err(reader, st,
-				             "invalid escape `\\%c'\n", peek_byte(reader));
+				st = r_err(reader, st,
+				           "invalid escape `\\%c'\n", peek_byte(reader));
 			}
 			break;
 		default:
 			if (c == q) {
-				eat_byte_check(reader, q);
+				eat_byte_safe(reader, q);
 				return SERD_SUCCESS;
 			} else {
 				st = read_character(
@@ -367,8 +374,7 @@ read_STRING_LITERAL(SerdReader* reader, SerdNode* dest, uint8_t q)
 		}
 	}
 
-	return st ? st
-	          : eat_byte_check(reader, q) ? SERD_SUCCESS : SERD_ERR_BAD_SYNTAX;
+	return st;
 }
 
 static SerdStatus
@@ -671,10 +677,7 @@ read_IRIREF(SerdReader* reader, SerdNode** dest)
 			} else if (!(c & 0x80)) {
 				push_byte(reader, *dest, c);
 			} else if (read_utf8_character(reader, *dest, c)) {
-				if (reader->strict) {
-					return SERD_ERR_BAD_SYNTAX;
-				}
-				st = SERD_FAILURE;
+				st = reader->strict ? SERD_ERR_BAD_SYNTAX : SERD_FAILURE;
 			}
 		}
 	}
@@ -1457,8 +1460,6 @@ read_n3_statement(SerdReader* reader)
 			ctx.subject = subj = 0;
 			TRY(st, read_wrappedGraph(reader, &ctx));
 			read_ws_star(reader);
-		} else if (!ctx.subject) {
-			st = r_err(reader, SERD_ERR_BAD_SYNTAX, "bad subject\n");
 		} else if ((st = read_triples(reader, ctx, &ate_dot))) {
 			if (st == SERD_FAILURE && s_type == '[') {
 				return SERD_SUCCESS;
@@ -1493,23 +1494,22 @@ read_turtleTrigDoc(SerdReader* reader)
 		const size_t orig_stack_size = reader->stack.size;
 		const SerdStatus st = read_n3_statement(reader);
 		if (st > SERD_FAILURE) {
-			if (reader->strict) {
+			if (reader->strict || reader->source.eof) {
 				serd_stack_pop_to(&reader->stack, orig_stack_size);
 				return st;
 			}
 			skip_until(reader, '\n');
-			reader->status = SERD_SUCCESS;
 		}
 		serd_stack_pop_to(&reader->stack, orig_stack_size);
 	}
-	return reader->status;
+	return SERD_SUCCESS;
 }
 
 SerdStatus
 read_nquadsDoc(SerdReader* reader)
 {
 	SerdStatus st = SERD_SUCCESS;
-	while (!reader->source.eof) {
+	while (!st && !reader->source.eof) {
 		const size_t orig_stack_size = reader->stack.size;
 
 		SerdStatementFlags flags   = 0;
@@ -1554,11 +1554,8 @@ read_nquadsDoc(SerdReader* reader)
 			}
 		}
 
-		if (emit_statement(reader, ctx, ctx.object)) {
-			break;
-		}
-
+		st = emit_statement(reader, ctx, ctx.object);
 		serd_stack_pop_to(&reader->stack, orig_stack_size);
 	}
-	return reader->status;
+	return st;
 }
-- 
cgit v1.2.1