From caa74939cba8b1cd357e553efca9bec5074b1c53 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 5 Apr 2023 17:26:04 -0400 Subject: Remove support for reading Turtle named inline nodes extension --- NEWS | 1 + src/n3.c | 20 -------------------- test/extra/bad/bad-ext-namedblank-op.ttl | 3 --- test/extra/bad/manifest.ttl | 6 ------ test/extra/good/manifest.ttl | 14 -------------- test/extra/good/test-ext-namedblank-iri.nt | 2 -- test/extra/good/test-ext-namedblank-iri.ttl | 7 ------- test/extra/good/test-ext-namedblank-prefix.nt | 2 -- test/extra/good/test-ext-namedblank-prefix.ttl | 7 ------- 9 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 test/extra/bad/bad-ext-namedblank-op.ttl delete mode 100644 test/extra/good/test-ext-namedblank-iri.nt delete mode 100644 test/extra/good/test-ext-namedblank-iri.ttl delete mode 100644 test/extra/good/test-ext-namedblank-prefix.nt delete mode 100644 test/extra/good/test-ext-namedblank-prefix.ttl diff --git a/NEWS b/NEWS index fdcc790e..61c78b7a 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ serd (1.1.1) unstable; urgency=medium * Remove SERD_DISABLE_DEPRECATED and SERD_DEPRECATED_BY * Remove serd_uri_to_path() + * Remove support for reading Turtle named inline nodes extension * Remove useless character counting from API -- David Robillard Wed, 13 Jul 2022 20:39:07 +0000 diff --git a/src/n3.c b/src/n3.c index e713a828..998dd2a6 100644 --- a/src/n3.c +++ b/src/n3.c @@ -1053,21 +1053,6 @@ read_BLANK_NODE_LABEL(SerdReader* const reader, return SERD_SUCCESS; } -static Ref -read_blankName(SerdReader* const reader) -{ - if (skip_byte(reader, '=') || eat_byte_check(reader, '=') != '=') { - r_err(reader, SERD_ERR_BAD_SYNTAX, "expected '='\n"); - return 0; - } - - Ref subject = 0; - bool ate_dot = false; - read_ws_star(reader); - read_iri(reader, &subject, &ate_dot); - return subject; -} - static SerdStatus read_anon(SerdReader* const reader, ReadContext ctx, @@ -1083,11 +1068,6 @@ read_anon(SerdReader* const reader, *ctx.flags |= empty ? SERD_EMPTY_S : SERD_ANON_S_BEGIN; } else { *ctx.flags |= empty ? SERD_EMPTY_O : SERD_ANON_O_BEGIN; - if (peek_delim(reader, '=')) { - if (!(*dest = read_blankName(reader)) || !eat_delim(reader, ';')) { - return SERD_ERR_BAD_SYNTAX; - } - } } if (!*dest) { diff --git a/test/extra/bad/bad-ext-namedblank-op.ttl b/test/extra/bad/bad-ext-namedblank-op.ttl deleted file mode 100644 index 5e648393..00000000 --- a/test/extra/bad/bad-ext-namedblank-op.ttl +++ /dev/null @@ -1,3 +0,0 @@ -@prefix eg: . - -eg:s eg:p [ =: _:o ; eg:name "o" ] . diff --git a/test/extra/bad/manifest.ttl b/test/extra/bad/manifest.ttl index 0ea3ccac..9dda56b2 100644 --- a/test/extra/bad/manifest.ttl +++ b/test/extra/bad/manifest.ttl @@ -43,7 +43,6 @@ <#bad-eof-in-uri-scheme> <#bad-equivalence> <#bad-escape> - <#bad-ext-namedblank-op> <#bad-false-predicate> <#bad-false-subject> <#bad-forAll> @@ -273,11 +272,6 @@ mf:action ; mf:name "bad-escape" . -<#bad-ext-namedblank-op> - a rdft:TestTurtleNegativeSyntax ; - mf:action ; - mf:name "bad-ext-namedblank-op" . - <#bad-false-predicate> a rdft:TestTurtleNegativeSyntax ; mf:action ; diff --git a/test/extra/good/manifest.ttl b/test/extra/good/manifest.ttl index 24b301e9..c8bfa6f8 100644 --- a/test/extra/good/manifest.ttl +++ b/test/extra/good/manifest.ttl @@ -23,8 +23,6 @@ <#test-double> <#test-empty-path-base> <#test-eof-at-page-end> - <#test-ext-namedblank-iri> - <#test-ext-namedblank-prefix> <#test-id> <#test-list-in-blank> <#test-list-subject> @@ -143,18 +141,6 @@ mf:name "test-eof-at-page-end" ; mf:result . -<#test-ext-namedblank-iri> - a rdft:TestTurtleEval ; - mf:action ; - mf:name "test-ext-namedblank-iri" ; - mf:result . - -<#test-ext-namedblank-prefix> - a rdft:TestTurtleEval ; - mf:action ; - mf:name "test-ext-namedblank-prefix" ; - mf:result . - <#test-id> a rdft:TestTurtleEval ; mf:action ; diff --git a/test/extra/good/test-ext-namedblank-iri.nt b/test/extra/good/test-ext-namedblank-iri.nt deleted file mode 100644 index 26075a73..00000000 --- a/test/extra/good/test-ext-namedblank-iri.nt +++ /dev/null @@ -1,2 +0,0 @@ - . - "o" . diff --git a/test/extra/good/test-ext-namedblank-iri.ttl b/test/extra/good/test-ext-namedblank-iri.ttl deleted file mode 100644 index e52dc874..00000000 --- a/test/extra/good/test-ext-namedblank-iri.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix eg: . - -eg:s - eg:p [ - == ; - eg:name "o" - ] . diff --git a/test/extra/good/test-ext-namedblank-prefix.nt b/test/extra/good/test-ext-namedblank-prefix.nt deleted file mode 100644 index 9a2710fb..00000000 --- a/test/extra/good/test-ext-namedblank-prefix.nt +++ /dev/null @@ -1,2 +0,0 @@ - . - "o" . diff --git a/test/extra/good/test-ext-namedblank-prefix.ttl b/test/extra/good/test-ext-namedblank-prefix.ttl deleted file mode 100644 index d53b50f1..00000000 --- a/test/extra/good/test-ext-namedblank-prefix.ttl +++ /dev/null @@ -1,7 +0,0 @@ -@prefix eg: . - -eg:s - eg:p [ - == eg:o ; - eg:name "o" - ] . -- cgit v1.2.1