From 8346ac7f529f5aeb8d8b0e48837e680ea14e8893 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 12 Aug 2021 13:42:25 -0400 Subject: Make blank node prefixing automatic Though potentially useful, I don't think the complexity cost of the old interface (both to the implementation and to the user) is worth it. A special tool to transform blank node labels (for example with regular expressions) would be a better approach to this if it's ever needed in the future. --- test/extra/prefix/README.md | 4 ---- test/extra/prefix/manifest.ttl | 20 -------------------- test/extra/prefix/remove-prefixes.nt | 4 ---- test/extra/prefix/remove-prefixes.ttl | 7 ------- test/meson.build | 17 ----------------- test/multifile/output.nq | 4 ++-- test/test_overflow.c | 2 +- test/test_reader_writer.c | 14 -------------- 8 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 test/extra/prefix/README.md delete mode 100644 test/extra/prefix/manifest.ttl delete mode 100644 test/extra/prefix/remove-prefixes.nt delete mode 100644 test/extra/prefix/remove-prefixes.ttl (limited to 'test') diff --git a/test/extra/prefix/README.md b/test/extra/prefix/README.md deleted file mode 100644 index 56a07244..00000000 --- a/test/extra/prefix/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Prefix Test Suite -================= - -This small suite tests adding/chopping prefixes to/from blank node labels. diff --git a/test/extra/prefix/manifest.ttl b/test/extra/prefix/manifest.ttl deleted file mode 100644 index 12a0f9ca..00000000 --- a/test/extra/prefix/manifest.ttl +++ /dev/null @@ -1,20 +0,0 @@ -@prefix mf: . -@prefix rdfs: . -@prefix rdft: . -@prefix serd: . - -<> - a mf:Manifest ; - rdfs:comment "Serd blank node prefixing test suite" ; - mf:entries ( - <#remove-prefixes> - ) . - -<#remove-prefixes> - a rdft:TestTurtleEval ; - mf:action ; - mf:name "remove-prefixes" ; - mf:result . - -rdft:Test - rdfs:subClassOf mf:ManifestEntry . diff --git a/test/extra/prefix/remove-prefixes.nt b/test/extra/prefix/remove-prefixes.nt deleted file mode 100644 index 26ac46ee..00000000 --- a/test/extra/prefix/remove-prefixes.nt +++ /dev/null @@ -1,4 +0,0 @@ -_:s1 _:o1 . -_:s1 _:o3 . -_:s1 _:o4 . -_:b0 _:b1 . diff --git a/test/extra/prefix/remove-prefixes.ttl b/test/extra/prefix/remove-prefixes.ttl deleted file mode 100644 index f3002a59..00000000 --- a/test/extra/prefix/remove-prefixes.ttl +++ /dev/null @@ -1,7 +0,0 @@ -_:tests1 - _:testo1 ; - _:testo3 , - _:testo4 . - -_:testb0 - _:testb1 . diff --git a/test/meson.build b/test/meson.build index 2de2348f..d7dcfa05 100644 --- a/test/meson.build +++ b/test/meson.build @@ -35,7 +35,6 @@ ttl_metadata_file_paths = [ 'extra/lax/manifest.ttl', 'extra/pattern/manifest.ttl', 'extra/perfect/manifest.ttl', - 'extra/prefix/manifest.ttl', 'extra/pretty/manifest.ttl', 'extra/qualify/manifest.ttl', 'extra/root/manifest.ttl', @@ -189,12 +188,10 @@ simple_command_tests = { ['-b', '1024junk'], ['-b', '9223372036854775807'], ['-b'], - ['-c'], ['-k', '-1'], ['-k', '1024junk'], ['-k', '9223372036854775807'], ['-k'], - ['-p'], ['-qi'], ['-r'], ['-s', ' a .'], @@ -500,20 +497,6 @@ test_suites = { files('extra/perfect/manifest.ttl'), ns_serdtest + 'perfect/', ], - 'prefix_add': [ - '--reverse', - files('extra/prefix/manifest.ttl'), - ns_serdtest + 'prefix/', - '--', - ['-I', 'generated'], - ['-p', 'test'], - ], - 'prefix_remove': [ - files('extra/prefix/manifest.ttl'), - ns_serdtest + 'prefix/', - '--', - ['-c', 'test'], - ], 'pretty': [ files('extra/pretty/manifest.ttl'), ns_serdtest + 'pretty/', diff --git a/test/multifile/output.nq b/test/multifile/output.nq index dd35dc4d..cf3ea93e 100644 --- a/test/multifile/output.nq +++ b/test/multifile/output.nq @@ -1,3 +1,3 @@ -_:f0b1 . _:f1b1 . -_:f1b2 . +_:f2b1 . +_:f2b2 . diff --git a/test/test_overflow.c b/test/test_overflow.c index 8b47cd2b..62a77022 100644 --- a/test/test_overflow.c +++ b/test/test_overflow.c @@ -9,7 +9,7 @@ #include static const size_t min_stack_size = 4U * sizeof(size_t) + 238U; -static const size_t max_stack_size = 1024U; +static const size_t max_stack_size = 2048U; static SerdStatus test_size(SerdWorld* const world, diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c index aea0976d..9a4c988f 100644 --- a/test/test_reader_writer.c +++ b/test/test_reader_writer.c @@ -151,9 +151,6 @@ test_writer(const char* const path) assert(writer); - serd_writer_chop_blank_prefix(writer, "tmp"); - serd_writer_chop_blank_prefix(writer, NULL); - SerdNode* lit = serd_node_new(NULL, serd_a_string("hello")); const SerdSink* const iface = serd_writer_sink(writer); @@ -273,17 +270,6 @@ test_reader(const char* path) assert(serd_reader_read_chunk(reader) == SERD_BAD_CALL); assert(serd_reader_read_document(reader) == SERD_BAD_CALL); - serd_reader_add_blank_prefix(reader, "tmp"); - -#if defined(__GNUC__) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wnonnull" -#endif - serd_reader_add_blank_prefix(reader, NULL); -#if defined(__GNUC__) -# pragma GCC diagnostic pop -#endif - SerdInputStream in = serd_open_input_file(path); assert(!serd_reader_start(reader, &in, NULL, 4096)); assert(!serd_reader_read_document(reader)); -- cgit v1.2.1