aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/serd/reader.h80
-rw-r--r--src/byte_source.c15
-rw-r--r--src/byte_source.h8
-rw-r--r--src/reader.c166
-rw-r--r--src/serdi.c89
-rw-r--r--src/system.h17
-rw-r--r--test/test_reader_writer.c70
7 files changed, 179 insertions, 266 deletions
diff --git a/include/serd/reader.h b/include/serd/reader.h
index 779505cf..61b553db 100644
--- a/include/serd/reader.h
+++ b/include/serd/reader.h
@@ -13,8 +13,8 @@
#include "serd/syntax.h"
#include <stdbool.h>
+#include <stddef.h>
#include <stdint.h>
-#include <stdio.h>
SERD_BEGIN_DECLS
@@ -76,38 +76,30 @@ SERD_API void
serd_reader_set_default_graph(SerdReader* SERD_NONNULL reader,
const SerdNode* SERD_NULLABLE graph);
-/// Read a file at a given `uri`
+/// Prepare to read from the file at a local file `uri`
SERD_API SerdStatus
-serd_reader_read_file(SerdReader* SERD_NONNULL reader,
- const char* SERD_NONNULL uri);
+serd_reader_start_file(SerdReader* SERD_NONNULL reader,
+ const char* SERD_NONNULL uri,
+ bool bulk);
/**
- Start an incremental read from a file handle.
-
- Iff `bulk` is true, `file` will be read a page at a time. This is more
- efficient, but uses a page of memory and means that an entire page of input
- must be ready before any callbacks will fire. To react as soon as input
- arrives, set `bulk` to false.
-*/
-SERD_API SerdStatus
-serd_reader_start_stream(SerdReader* SERD_NONNULL reader,
- FILE* SERD_NONNULL file,
- const char* SERD_NULLABLE name,
- bool bulk);
-
-/**
- Start an incremental read from a user-specified source.
+ Prepare to read from a stream.
The `read_func` is guaranteed to only be called for `page_size` elements
with size 1 (i.e. `page_size` bytes).
*/
SERD_API SerdStatus
-serd_reader_start_source_stream(SerdReader* SERD_NONNULL reader,
- SerdReadFunc SERD_NONNULL read_func,
- SerdStreamErrorFunc SERD_NONNULL error_func,
- void* SERD_NONNULL stream,
- const char* SERD_NULLABLE name,
- size_t page_size);
+serd_reader_start_stream(SerdReader* SERD_NONNULL reader,
+ SerdReadFunc SERD_NONNULL read_func,
+ SerdStreamErrorFunc SERD_NONNULL error_func,
+ void* SERD_NONNULL stream,
+ const char* SERD_NULLABLE name,
+ size_t page_size);
+
+/// Prepare to read from a string
+SERD_API SerdStatus
+serd_reader_start_string(SerdReader* SERD_NONNULL reader,
+ const char* SERD_NONNULL utf8);
/**
Read a single "chunk" of data during an incremental read.
@@ -120,29 +112,23 @@ serd_reader_start_source_stream(SerdReader* SERD_NONNULL reader,
SERD_API SerdStatus
serd_reader_read_chunk(SerdReader* SERD_NONNULL reader);
-/// Finish an incremental read from a file handle
-SERD_API SerdStatus
-serd_reader_end_stream(SerdReader* SERD_NONNULL reader);
+/**
+ Read a complete document from the source.
-/// Read `file`
+ This function will continue pulling from the source until a complete
+ document has been read. Note that this may block when used with streams,
+ for incremental reading use serd_reader_read_chunk().
+*/
SERD_API SerdStatus
-serd_reader_read_file_handle(SerdReader* SERD_NONNULL reader,
- FILE* SERD_NONNULL file,
- const char* SERD_NULLABLE name);
+serd_reader_read_document(SerdReader* SERD_NONNULL reader);
-/// Read a user-specified byte source
-SERD_API SerdStatus
-serd_reader_read_source(SerdReader* SERD_NONNULL reader,
- SerdReadFunc SERD_NONNULL source,
- SerdStreamErrorFunc SERD_NONNULL error,
- void* SERD_NONNULL stream,
- const char* SERD_NULLABLE name,
- size_t page_size);
-
-/// Read `utf8`
+/**
+ Finish reading from the source.
+
+ This should be called before starting to read from another source.
+*/
SERD_API SerdStatus
-serd_reader_read_string(SerdReader* SERD_NONNULL reader,
- const char* SERD_NONNULL utf8);
+serd_reader_finish(SerdReader* SERD_NONNULL reader);
/**
Skip over bytes in the input until a specific byte is encountered.
@@ -156,7 +142,11 @@ serd_reader_read_string(SerdReader* SERD_NONNULL reader,
SERD_API SerdStatus
serd_reader_skip_until_byte(SerdReader* SERD_NONNULL reader, uint8_t byte);
-/// Free `reader`
+/**
+ Free `reader`.
+
+ The reader will be finished via `serd_reader_finish()` if necessary.
+*/
SERD_API void
serd_reader_free(SerdReader* SERD_NULLABLE reader);
diff --git a/src/byte_source.c b/src/byte_source.c
index 3a2f10b6..d6510eb9 100644
--- a/src/byte_source.c
+++ b/src/byte_source.c
@@ -35,6 +35,7 @@ SerdStatus
serd_byte_source_open_source(SerdByteSource* const source,
const SerdReadFunc read_func,
const SerdStreamErrorFunc error_func,
+ const SerdStreamCloseFunc close_func,
void* const stream,
const char* const name,
const size_t page_size)
@@ -42,13 +43,14 @@ serd_byte_source_open_source(SerdByteSource* const source,
const Cursor cur = {name, 1, 1};
memset(source, '\0', sizeof(*source));
+ source->read_func = read_func;
+ source->error_func = error_func;
+ source->close_func = close_func;
source->stream = stream;
- source->from_stream = true;
source->page_size = page_size;
source->buf_size = page_size;
source->cur = cur;
- source->error_func = error_func;
- source->read_func = read_func;
+ source->from_stream = true;
if (page_size > 1) {
source->file_buf = (uint8_t*)serd_allocate_buffer(page_size);
@@ -94,10 +96,15 @@ serd_byte_source_open_string(SerdByteSource* const source,
SerdStatus
serd_byte_source_close(SerdByteSource* const source)
{
+ SerdStatus st = SERD_SUCCESS;
+ if (source->close_func) {
+ st = source->close_func(source->stream) ? SERD_BAD_STREAM : SERD_SUCCESS;
+ }
+
if (source->page_size > 1) {
serd_free_aligned(source->file_buf);
}
memset(source, '\0', sizeof(*source));
- return SERD_SUCCESS;
+ return st;
}
diff --git a/src/byte_source.h b/src/byte_source.h
index 5290dca2..e2697bd2 100644
--- a/src/byte_source.h
+++ b/src/byte_source.h
@@ -12,7 +12,8 @@
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
-#include <stdio.h>
+
+typedef int (*SerdStreamCloseFunc)(void*);
typedef struct {
const char* filename;
@@ -23,6 +24,7 @@ typedef struct {
typedef struct {
SerdReadFunc read_func; ///< Read function (e.g. fread)
SerdStreamErrorFunc error_func; ///< Error function (e.g. ferror)
+ SerdStreamCloseFunc close_func; ///< Function for closing stream
void* stream; ///< Stream (e.g. FILE)
size_t page_size; ///< Number of bytes to read at a time
size_t buf_size; ///< Number of bytes in file_buf
@@ -37,15 +39,13 @@ typedef struct {
} SerdByteSource;
SerdStatus
-serd_byte_source_open_file(SerdByteSource* source, FILE* file, bool bulk);
-
-SerdStatus
serd_byte_source_open_string(SerdByteSource* source, const char* utf8);
SerdStatus
serd_byte_source_open_source(SerdByteSource* source,
SerdReadFunc read_func,
SerdStreamErrorFunc error_func,
+ SerdStreamCloseFunc close_func,
void* stream,
const char* name,
size_t page_size);
diff --git a/src/reader.c b/src/reader.c
index 284de45d..944c8d09 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -5,22 +5,22 @@
#include "byte_source.h"
#include "node.h"
+#include "serd_internal.h"
#include "stack.h"
#include "system.h"
-#include "serd_internal.h"
-
-#include "serd/memory.h"
#include "serd/stream.h"
#include "serd/uri.h"
#include <errno.h>
#include <stdarg.h>
-#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+static SerdStatus
+serd_reader_prepare(SerdReader* reader);
+
SerdStatus
r_err(SerdReader* const reader, const SerdStatus st, const char* const fmt, ...)
{
@@ -58,25 +58,6 @@ blank_id(SerdReader* const reader)
return ref;
}
-/** fread-like wrapper for getc (which is faster). */
-static size_t
-serd_file_read_byte(void* const buf,
- const size_t size,
- const size_t nmemb,
- void* const stream)
-{
- (void)size;
- (void)nmemb;
-
- const int c = getc((FILE*)stream);
- if (c == EOF) {
- *((uint8_t*)buf) = 0;
- return 0;
- }
- *((uint8_t*)buf) = (uint8_t)c;
- return 1;
-}
-
Ref
push_node_padded(SerdReader* const reader,
const size_t maxlen,
@@ -154,9 +135,16 @@ emit_statement(SerdReader* const reader, const ReadContext ctx, const Ref o)
return st;
}
-static SerdStatus
-read_doc(SerdReader* const reader)
+SerdStatus
+serd_reader_read_document(SerdReader* const reader)
{
+ if (!reader->source.prepared) {
+ SerdStatus st = serd_reader_prepare(reader);
+ if (st) {
+ return st;
+ }
+ }
+
return ((reader->syntax == SERD_NQUADS) ? read_nquadsDoc(reader)
: read_turtleTrigDoc(reader));
}
@@ -205,6 +193,7 @@ serd_reader_free(SerdReader* const reader)
pop_node(reader, reader->rdf_nil);
pop_node(reader, reader->rdf_rest);
pop_node(reader, reader->rdf_first);
+ serd_reader_finish(reader);
serd_node_free(reader->default_graph);
#ifdef SERD_STACK_CHECK
@@ -238,26 +227,6 @@ serd_reader_set_default_graph(SerdReader* const reader,
reader->default_graph = serd_node_copy(graph);
}
-SerdStatus
-serd_reader_read_file(SerdReader* const reader, const char* const uri)
-{
- char* const path = serd_parse_file_uri(uri, NULL);
- if (!path) {
- return SERD_BAD_ARG;
- }
-
- FILE* fd = serd_fopen(path, "rb");
- if (!fd) {
- serd_free(path);
- return SERD_BAD_STREAM;
- }
-
- SerdStatus ret = serd_reader_read_file_handle(reader, fd, path);
- fclose(fd);
- free(path);
- return ret;
-}
-
static SerdStatus
skip_bom(SerdReader* const me)
{
@@ -276,30 +245,45 @@ skip_bom(SerdReader* const me)
}
SerdStatus
-serd_reader_start_stream(SerdReader* const reader,
- FILE* const file,
- const char* const name,
- const bool bulk)
+serd_reader_start_stream(SerdReader* const reader,
+ const SerdReadFunc read_func,
+ const SerdStreamErrorFunc error_func,
+ void* const stream,
+ const char* const name,
+ const size_t page_size)
{
- return serd_reader_start_source_stream(reader,
- bulk ? (SerdReadFunc)fread
- : serd_file_read_byte,
- (SerdStreamErrorFunc)ferror,
- file,
- name,
- bulk ? SERD_PAGE_SIZE : 1);
+ return serd_byte_source_open_source(
+ &reader->source, read_func, error_func, NULL, stream, name, page_size);
}
SerdStatus
-serd_reader_start_source_stream(SerdReader* const reader,
- const SerdReadFunc read_func,
- const SerdStreamErrorFunc error_func,
- void* const stream,
- const char* const name,
- const size_t page_size)
+serd_reader_start_file(SerdReader* reader, const char* uri, bool bulk)
{
- return serd_byte_source_open_source(
- &reader->source, read_func, error_func, stream, name, page_size);
+ char* const path = serd_parse_file_uri(uri, NULL);
+ if (!path) {
+ return SERD_BAD_ARG;
+ }
+
+ FILE* fd = serd_fopen(path, "rb");
+ free(path);
+ if (!fd) {
+ return SERD_BAD_STREAM;
+ }
+
+ return serd_byte_source_open_source(&reader->source,
+ bulk ? (SerdReadFunc)fread
+ : serd_file_read_byte,
+ (SerdStreamErrorFunc)ferror,
+ (SerdStreamCloseFunc)fclose,
+ fd,
+ uri,
+ bulk ? SERD_PAGE_SIZE : 1);
+}
+
+SerdStatus
+serd_reader_start_string(SerdReader* const reader, const char* const utf8)
+{
+ return serd_byte_source_open_string(&reader->source, utf8);
}
static SerdStatus
@@ -337,59 +321,7 @@ serd_reader_read_chunk(SerdReader* const reader)
}
SerdStatus
-serd_reader_end_stream(SerdReader* const reader)
+serd_reader_finish(SerdReader* const reader)
{
return serd_byte_source_close(&reader->source);
}
-
-SerdStatus
-serd_reader_read_file_handle(SerdReader* const reader,
- FILE* const file,
- const char* const name)
-{
- return serd_reader_read_source(reader,
- (SerdReadFunc)fread,
- (SerdStreamErrorFunc)ferror,
- file,
- name,
- SERD_PAGE_SIZE);
-}
-
-SerdStatus
-serd_reader_read_source(SerdReader* const reader,
- const SerdReadFunc source,
- const SerdStreamErrorFunc error,
- void* const stream,
- const char* const name,
- const size_t page_size)
-{
- SerdStatus st = serd_reader_start_source_stream(
- reader, source, error, stream, name, page_size);
-
- if (st || (st = serd_reader_prepare(reader))) {
- serd_reader_end_stream(reader);
- return st;
- }
-
- if ((st = read_doc(reader))) {
- serd_reader_end_stream(reader);
- return st;
- }
-
- return serd_reader_end_stream(reader);
-}
-
-SerdStatus
-serd_reader_read_string(SerdReader* const reader, const char* const utf8)
-{
- serd_byte_source_open_string(&reader->source, utf8);
-
- SerdStatus st = serd_reader_prepare(reader);
- if (!st) {
- st = read_doc(reader);
- }
-
- serd_byte_source_close(&reader->source);
-
- return st;
-}
diff --git a/src/serdi.c b/src/serdi.c
index 0de64b81..8ed02dfc 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -1,8 +1,8 @@
// Copyright 2011-2023 David Robillard <d@drobilla.net>
// SPDX-License-Identifier: ISC
-#include "serd_config.h"
#include "string_utils.h"
+#include "system.h"
#include "serd/attributes.h"
#include "serd/env.h"
@@ -13,7 +13,6 @@
#include "serd/stream.h"
#include "serd/string_view.h"
#include "serd/syntax.h"
-#include "serd/uri.h"
#include "serd/version.h"
#include "serd/writer.h"
@@ -25,14 +24,8 @@
# include <io.h>
#endif
-#if USE_POSIX_FADVISE && USE_FILENO
-# include <fcntl.h>
-#endif
-
-#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#define SERDI_ERROR(msg) fprintf(stderr, "serdi: " msg)
@@ -137,23 +130,6 @@ quiet_error_sink(void* const handle, const SerdError* const e)
return SERD_SUCCESS;
}
-static FILE*
-serd_fopen(const char* const path, const char* const mode)
-{
- FILE* fd = fopen(path, mode);
- if (!fd) {
- SERDI_ERRORF("failed to open file %s (%s)\n", path, strerror(errno));
- return NULL;
- }
-
-#if USE_POSIX_FADVISE && USE_FILENO
- (void)posix_fadvise(
- fileno(fd), 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE);
-#endif
-
- return fd;
-}
-
static SerdWriterFlags
choose_style(const SerdSyntax input_syntax,
const SerdSyntax output_syntax,
@@ -194,25 +170,23 @@ main(int argc, char** argv)
{
const char* const prog = argv[0];
- FILE* in_fd = NULL;
SerdSyntax input_syntax = (SerdSyntax)0;
SerdSyntax output_syntax = (SerdSyntax)0;
- bool from_file = true;
+ bool from_string = false;
+ bool from_stdin = false;
bool ascii = false;
bool bulk_read = true;
bool bulk_write = false;
bool full_uris = false;
bool lax = false;
bool quiet = false;
- const char* in_name = NULL;
const char* add_prefix = NULL;
const char* chop_prefix = NULL;
const char* root_uri = NULL;
int a = 1;
- for (; a < argc && from_file && argv[a][0] == '-'; ++a) {
+ for (; a < argc && !from_string && argv[a][0] == '-'; ++a) {
if (argv[a][1] == '\0') {
- in_name = (const char*)"(stdin)";
- in_fd = stdin;
+ from_stdin = true;
break;
}
@@ -244,8 +218,7 @@ main(int argc, char** argv)
} else if (opt == 'v') {
return print_version();
} else if (opt == 's') {
- in_name = "(string)";
- from_file = false;
+ from_string = true;
break;
} else if (opt == 'c') {
if (argv[a][o + 1] || ++a == argc) {
@@ -303,22 +276,9 @@ main(int argc, char** argv)
_setmode(_fileno(stdout), _O_BINARY);
#endif
- char* input_path = NULL;
- const char* input = (const char*)argv[a++];
- if (from_file) {
- in_name = in_name ? in_name : input;
- if (!in_fd) {
- if (!strncmp(input, "file:", 5)) {
- input_path = serd_parse_file_uri(input, NULL);
- input = input_path;
- }
- if (!input || !(in_fd = serd_fopen(input, "rb"))) {
- return 1;
- }
- }
- }
+ const char* input = argv[a++];
- if (!input_syntax && !(input_syntax = guess_syntax(in_name))) {
+ if (!input_syntax && !(input_syntax = guess_syntax(input))) {
input_syntax = SERD_TRIG;
}
@@ -335,7 +295,7 @@ main(int argc, char** argv)
SerdNode* base = NULL;
if (a < argc) { // Base URI given on command line
base = serd_new_uri(serd_string((const char*)argv[a]));
- } else if (from_file && in_fd != stdin) { // Use input file URI
+ } else if (!from_string && !from_stdin) { // Use input file URI
base = serd_new_file_uri(serd_string(input), serd_empty_string());
}
@@ -365,30 +325,31 @@ main(int argc, char** argv)
serd_reader_add_blank_prefix(reader, add_prefix);
SerdStatus st = SERD_SUCCESS;
- if (!from_file) {
- st = serd_reader_read_string(reader, input);
- } else if (bulk_read) {
- st = serd_reader_read_file_handle(reader, in_fd, in_name);
+ if (from_string) {
+ st = serd_reader_start_string(reader, input);
+ } else if (from_stdin) {
+ st = serd_reader_start_stream(reader,
+ serd_file_read_byte,
+ (SerdStreamErrorFunc)ferror,
+ stdin,
+ "(stdin)",
+ 1);
} else {
- st = serd_reader_start_stream(reader, in_fd, in_name, false);
- while (!st) {
- st = serd_reader_read_chunk(reader);
- }
- serd_reader_end_stream(reader);
+ st = serd_reader_start_file(reader, input, bulk_read);
}
+ if (!st) {
+ st = serd_reader_read_document(reader);
+ }
+
+ serd_reader_finish(reader);
serd_reader_free(reader);
serd_writer_finish(writer);
serd_writer_free(writer);
serd_env_free(env);
serd_node_free(base);
- free(input_path);
-
- if (from_file) {
- fclose(in_fd);
- }
- if (fclose(out_fd)) {
+ if (fclose(stdout)) {
perror("serdi: write error");
st = SERD_BAD_STREAM;
}
diff --git a/src/system.h b/src/system.h
index 15f93363..315ea681 100644
--- a/src/system.h
+++ b/src/system.h
@@ -6,6 +6,7 @@
#include "serd/attributes.h"
+#include <stdint.h>
#include <stdio.h>
/// Open a file configured for fast sequential reading
@@ -28,4 +29,20 @@ serd_allocate_buffer(size_t size);
void
serd_free_aligned(void* ptr);
+/// Wrapper for getc that is compatible with SerdReadFunc
+static inline size_t
+serd_file_read_byte(void* buf, size_t size, size_t nmemb, void* stream)
+{
+ (void)size;
+ (void)nmemb;
+
+ const int c = getc((FILE*)stream);
+ if (c == EOF) {
+ *((uint8_t*)buf) = 0;
+ return 0;
+ }
+ *((uint8_t*)buf) = (uint8_t)c;
+ return 1;
+}
+
#endif // SERD_SRC_SYSTEM_H
diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index 96c81d12..1c028080 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -196,7 +196,8 @@ test_read_nquads_chunks(const char* const path)
serd_sink_set_statement_func(sink, test_statement_sink);
serd_sink_set_end_func(sink, test_end_sink);
- SerdStatus st = serd_reader_start_stream(reader, f, NULL, false);
+ SerdStatus st = serd_reader_start_stream(
+ reader, (SerdReadFunc)fread, (SerdStreamErrorFunc)ferror, f, NULL, 1);
assert(st == SERD_SUCCESS);
// Read first statement
@@ -277,7 +278,8 @@ test_read_turtle_chunks(const char* const path)
serd_sink_set_statement_func(sink, test_statement_sink);
serd_sink_set_end_func(sink, test_end_sink);
- SerdStatus st = serd_reader_start_stream(reader, f, NULL, false);
+ SerdStatus st = serd_reader_start_stream(
+ reader, (SerdReadFunc)fread, (SerdStreamErrorFunc)ferror, f, NULL, 1);
assert(st == SERD_SUCCESS);
// Read base
@@ -361,16 +363,17 @@ test_read_string(void)
serd_sink_set_end_func(sink, test_end_sink);
// Test reading a string that ends exactly at the end of input (no newline)
- const SerdStatus st =
- serd_reader_read_string(reader,
- "<http://example.org/s> <http://example.org/p> "
- "<http://example.org/o> .");
+ assert(
+ !serd_reader_start_string(reader,
+ "<http://example.org/s> <http://example.org/p> "
+ "<http://example.org/o> ."));
- assert(!st);
+ assert(!serd_reader_read_document(reader));
assert(rt->n_base == 0);
assert(rt->n_prefix == 0);
assert(rt->n_statement == 1);
assert(rt->n_end == 0);
+ assert(!serd_reader_finish(reader));
serd_reader_free(reader);
serd_sink_free(sink);
@@ -435,7 +438,9 @@ test_write_errors(void)
serd_reader_set_error_sink(reader, quiet_error_sink, NULL);
serd_writer_set_error_sink(writer, quiet_error_sink, NULL);
- const SerdStatus st = serd_reader_read_string(reader, doc_string);
+ SerdStatus st = serd_reader_start_string(reader, doc_string);
+ assert(!st);
+ st = serd_reader_read_document(reader);
assert(st == SERD_BAD_WRITE);
serd_reader_free(reader);
@@ -537,8 +542,8 @@ test_writer(const char* const path)
static void
test_reader(const char* path)
{
- ReaderTest* rt = (ReaderTest*)calloc(1, sizeof(ReaderTest));
- SerdSink* const sink = serd_sink_new(rt, NULL);
+ ReaderTest rt = {0, 0, 0, 0, NULL};
+ SerdSink* const sink = serd_sink_new(&rt, NULL);
SerdReader* reader = serd_reader_new(SERD_TURTLE, sink);
assert(sink);
assert(reader);
@@ -549,6 +554,7 @@ test_reader(const char* path)
serd_sink_set_end_func(sink, test_end_sink);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);
+ assert(serd_reader_read_document(reader) == SERD_FAILURE);
SerdNode* g = serd_new_uri(serd_string("http://example.org/"));
serd_reader_set_default_graph(reader, g);
@@ -565,43 +571,44 @@ test_reader(const char* path)
serd_node_free(g);
- assert(serd_reader_read_file(reader, "http://notafile"));
- assert(serd_reader_read_file(reader, "file:///better/not/exist"));
- assert(serd_reader_read_file(reader, "file://"));
+ assert(serd_reader_start_file(reader, "http://notafile", false));
+ assert(serd_reader_start_file(reader, "file://invalid", false));
+ assert(serd_reader_start_file(reader, "file:///nonexistant", false));
- const SerdStatus st = serd_reader_read_file(reader, path);
- assert(!st);
- assert(rt->n_base == 0);
- assert(rt->n_prefix == 0);
- assert(rt->n_statement == 6);
- assert(rt->n_end == 0);
- assert(rt->graph && serd_node_string(rt->graph) &&
- !strcmp(serd_node_string(rt->graph), "http://example.org/"));
-
- assert(serd_reader_read_string(reader, "This isn't Turtle at all."));
+ assert(!serd_reader_start_file(reader, path, true));
+ assert(!serd_reader_read_document(reader));
+ assert(rt.n_base == 0);
+ assert(rt.n_prefix == 0);
+ assert(rt.n_statement == 6);
+ assert(rt.n_end == 0);
+ assert(rt.graph && serd_node_string(rt.graph) &&
+ !strcmp(serd_node_string(rt.graph), "http://example.org/"));
+ serd_reader_finish(reader);
// A read of a big page hits EOF then fails to read chunks immediately
{
FILE* const in = fopen(path, "rb");
- serd_reader_start_stream(reader, in, "test", true);
+
+ serd_reader_start_stream(
+ reader, (SerdReadFunc)fread, (SerdStreamErrorFunc)ferror, in, NULL, 4096);
assert(serd_reader_read_chunk(reader) == SERD_SUCCESS);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);
- serd_reader_end_stream(reader);
+ serd_reader_finish(reader);
fclose(in);
}
// A byte-wise reader that hits EOF once then continues (like a socket)
{
size_t n_reads = 0;
- serd_reader_start_source_stream(reader,
- (SerdReadFunc)eof_test_read,
- (SerdStreamErrorFunc)eof_test_error,
- &n_reads,
- NULL,
- 1);
+ serd_reader_start_stream(reader,
+ (SerdReadFunc)eof_test_read,
+ (SerdStreamErrorFunc)eof_test_error,
+ &n_reads,
+ NULL,
+ 1);
assert(serd_reader_read_chunk(reader) == SERD_SUCCESS);
assert(serd_reader_read_chunk(reader) == SERD_FAILURE);
@@ -611,7 +618,6 @@ test_reader(const char* path)
serd_reader_free(reader);
serd_sink_free(sink);
- free(rt);
}
int