diff --git a/c++/carla-includes/serd b/c++/carla-includes/serd index 5f016fc..bc8f030 120000 --- a/c++/carla-includes/serd +++ b/c++/carla-includes/serd @@ -1 +1 @@ -../carla-lilv/serd-0.18.0/serd \ No newline at end of file +../carla-lilv/serd-0.18.2/serd \ No newline at end of file diff --git a/c++/carla-lilv/Makefile b/c++/carla-lilv/Makefile index 13d9781..df2f418 100644 --- a/c++/carla-lilv/Makefile +++ b/c++/carla-lilv/Makefile @@ -8,7 +8,7 @@ include ../Makefile.mk # -------------------------------------------------------------- -SERD_VERSION = 0.18.0 +SERD_VERSION = 0.18.2 SORD_VERSION = 0.10.4 SRATOM_VERSION = 0.4.0 LILV_VERSION = 0.14.4 @@ -29,92 +29,67 @@ all: carla_lilv.a carla_lilv.a: $(OBJS) $(AR) rs $@ $^ -serd.o: serd.c - $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@ - -sord.o: sord.c - $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@ - -sratom.o: sratom.c - $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@ - -lilv.o: lilv.c - $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@ - # -------------------------------------------------------------- posix32: carla_lilv_posix32.a +posix64: carla_lilv_posix64.a +win32: carla_lilv_win32.a +win64: carla_lilv_win64.a + +# -------------------------------------------------------------- carla_lilv_posix32.a: $(OBJS_posix32) $(AR) rs $@ $^ -serd_posix32.o: serd.c - $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ - -sord_posix32.o: sord.c - $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ +carla_lilv_posix64.a: $(OBJS_posix64) + $(AR) rs $@ $^ -sratom_posix32.o: sratom.c - $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ +carla_lilv_win32.a: $(OBJS_win32) + $(AR) rs $@ $^ -lilv_posix32.o: lilv.c - $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ +carla_lilv_win64.a: $(OBJS_win64) + $(AR) rs $@ $^ # -------------------------------------------------------------- -posix64: carla_lilv_posix64.a - -carla_lilv_posix64.a: $(OBJS_posix64) - $(AR) rs $@ $^ - -serd_posix64.o: serd.c - $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ +serd.o: serd.c + $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@ -sord_posix64.o: sord.c - $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ +sord.o: sord.c + $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@ -sratom_posix64.o: sratom.c - $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ +sratom.o: sratom.c + $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@ -lilv_posix64.o: lilv.c - $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ +lilv.o: lilv.c + $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src -c -o $@ # -------------------------------------------------------------- -win32: carla_lilv_win32.a - -carla_lilv_win32.a: $(OBJS_win32) - $(AR) rs $@ $^ - -serd_win32.o: serd.c +serd_%32.o: serd.c $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@ -sord_win32.o: sord.c +sord_%32.o: sord.c $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@ -sratom_win32.o: sratom.c +sratom_%32.o: sratom.c $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@ -lilv_win32.o: lilv.c +lilv_%32.o: lilv.c $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- -win64: carla_lilv_win64.a - -carla_lilv_win64.a: $(OBJS_win64) - $(AR) rs $@ $^ - -serd_win64.o: serd.c +serd_%64.o: serd.c $(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@ -sord_win64.o: sord.c +sord_%64.o: sord.c $(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@ -sratom_win64.o: sratom.c +sratom_%64.o: sratom.c $(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@ -lilv_win64.o: lilv.c +lilv_%64.o: lilv.c $(CC) $< $(BUILD_C_FLAGS) -Ililv-$(LILV_VERSION) -Ililv-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@ # -------------------------------------------------------------- diff --git a/c++/carla-lilv/custom-patches/serd_static-fix.patch b/c++/carla-lilv/custom-patches/serd_static-fix.patch deleted file mode 100644 index bcf7639..0000000 --- a/c++/carla-lilv/custom-patches/serd_static-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -U 3 -H -d -r -N -- serd-0.18.0/src/writer.c serd-0.18.0.orig/src/writer.c ---- serd-0.18.0/src/writer.c 2012-09-07 18:12:02.886064145 +0100 -+++ serd-0.18.0.orig/src/writer.c 2012-09-07 18:11:16.000000000 +0100 -@@ -103,7 +103,7 @@ - } TextContext; - - static void --error2(SerdWriter* writer, SerdStatus st, const char* fmt, ...) -+error(SerdWriter* writer, SerdStatus st, const char* fmt, ...) - { - va_list args; - va_start(args, fmt); -@@ -219,7 +219,7 @@ - size = 4; - c = in & 0x07; - } else { -- error2(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in); -+ error(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in); - const uint8_t replacement_char[] = { 0xEF, 0xBF, 0xBD }; - len += sink(replacement_char, sizeof(replacement_char), writer); - return len; -@@ -364,7 +364,7 @@ - switch (writer->syntax) { - case SERD_NTRIPLES: - if (serd_env_expand(writer->env, node, &uri_prefix, &uri_suffix)) { -- error2(writer, SERD_ERR_BAD_CURIE, -+ error(writer, SERD_ERR_BAD_CURIE, - "undefined namespace prefix `%s'\n", node->buf); - return false; - } -@@ -603,7 +603,7 @@ - return SERD_SUCCESS; - } - if (serd_stack_is_empty(&writer->anon_stack)) { -- error2(writer, SERD_ERR_UNKNOWN, -+ error(writer, SERD_ERR_UNKNOWN, - "unexpected end of anonymous node\n"); - return SERD_ERR_UNKNOWN; - } diff --git a/c++/carla-lilv/serd-0.18.0/waf b/c++/carla-lilv/serd-0.18.0/waf deleted file mode 100755 index 3088b02..0000000 Binary files a/c++/carla-lilv/serd-0.18.0/waf and /dev/null differ diff --git a/c++/carla-lilv/serd-0.18.0/AUTHORS b/c++/carla-lilv/serd-0.18.2/AUTHORS similarity index 100% rename from c++/carla-lilv/serd-0.18.0/AUTHORS rename to c++/carla-lilv/serd-0.18.2/AUTHORS diff --git a/c++/carla-lilv/serd-0.18.0/COPYING b/c++/carla-lilv/serd-0.18.2/COPYING similarity index 100% rename from c++/carla-lilv/serd-0.18.0/COPYING rename to c++/carla-lilv/serd-0.18.2/COPYING diff --git a/c++/carla-lilv/serd-0.18.0/INSTALL b/c++/carla-lilv/serd-0.18.2/INSTALL similarity index 100% rename from c++/carla-lilv/serd-0.18.0/INSTALL rename to c++/carla-lilv/serd-0.18.2/INSTALL diff --git a/c++/carla-lilv/serd-0.18.0/NEWS b/c++/carla-lilv/serd-0.18.2/NEWS similarity index 89% rename from c++/carla-lilv/serd-0.18.0/NEWS rename to c++/carla-lilv/serd-0.18.2/NEWS index d16d511..a91a6a7 100644 --- a/c++/carla-lilv/serd-0.18.0/NEWS +++ b/c++/carla-lilv/serd-0.18.2/NEWS @@ -1,3 +1,14 @@ +serd (0.18.2) stable; + + * Fix crash when serd_node_new_decimal is called with infinity or NaN + * Fix crash when resolving against non-standard base URIs + * Fix bug that caused "a" abbreviation in non-predicate position + * Disable timestamps in HTML documentation for reproducible build + * Fix clashing symbol "error" in amalgamation build + * Update to waf 1.7.8 and autowaf r90 (install docs to versioned directory) + + -- David Robillard Sat, 22 Dec 2012 21:32:15 -0500 + serd (0.18.0) stable; * Support digits at start of local names as per new Turtle grammar diff --git a/c++/carla-lilv/serd-0.18.0/PACKAGING b/c++/carla-lilv/serd-0.18.2/PACKAGING similarity index 100% rename from c++/carla-lilv/serd-0.18.0/PACKAGING rename to c++/carla-lilv/serd-0.18.2/PACKAGING diff --git a/c++/carla-lilv/serd-0.18.0/README b/c++/carla-lilv/serd-0.18.2/README similarity index 100% rename from c++/carla-lilv/serd-0.18.0/README rename to c++/carla-lilv/serd-0.18.2/README diff --git a/c++/carla-lilv/serd-0.18.2/doc/layout.xml b/c++/carla-lilv/serd-0.18.2/doc/layout.xml new file mode 100644 index 0000000..74a109f --- /dev/null +++ b/c++/carla-lilv/serd-0.18.2/doc/layout.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/c++/carla-lilv/serd-0.18.0/doc/reference.doxygen.in b/c++/carla-lilv/serd-0.18.2/doc/reference.doxygen.in similarity index 99% rename from c++/carla-lilv/serd-0.18.0/doc/reference.doxygen.in rename to c++/carla-lilv/serd-0.18.2/doc/reference.doxygen.in index 8ff954a..a4dde9a 100644 --- a/c++/carla-lilv/serd-0.18.0/doc/reference.doxygen.in +++ b/c++/carla-lilv/serd-0.18.2/doc/reference.doxygen.in @@ -939,7 +939,7 @@ HTML_COLORSTYLE_GAMMA = 80 # page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the diff --git a/c++/carla-lilv/serd-0.18.0/doc/serdi.1 b/c++/carla-lilv/serd-0.18.2/doc/serdi.1 similarity index 100% rename from c++/carla-lilv/serd-0.18.0/doc/serdi.1 rename to c++/carla-lilv/serd-0.18.2/doc/serdi.1 diff --git a/c++/carla-lilv/serd-0.18.0/doc/style.css b/c++/carla-lilv/serd-0.18.2/doc/style.css similarity index 100% rename from c++/carla-lilv/serd-0.18.0/doc/style.css rename to c++/carla-lilv/serd-0.18.2/doc/style.css diff --git a/c++/carla-lilv/serd-0.18.0/serd.pc.in b/c++/carla-lilv/serd-0.18.2/serd.pc.in similarity index 100% rename from c++/carla-lilv/serd-0.18.0/serd.pc.in rename to c++/carla-lilv/serd-0.18.2/serd.pc.in diff --git a/c++/carla-lilv/serd-0.18.0/serd/serd.h b/c++/carla-lilv/serd-0.18.2/serd/serd.h similarity index 100% rename from c++/carla-lilv/serd-0.18.0/serd/serd.h rename to c++/carla-lilv/serd-0.18.2/serd/serd.h diff --git a/c++/carla-lilv/serd-0.18.0/src/env.c b/c++/carla-lilv/serd-0.18.2/src/env.c similarity index 100% rename from c++/carla-lilv/serd-0.18.0/src/env.c rename to c++/carla-lilv/serd-0.18.2/src/env.c diff --git a/c++/carla-lilv/serd-0.18.0/src/node.c b/c++/carla-lilv/serd-0.18.2/src/node.c similarity index 98% rename from c++/carla-lilv/serd-0.18.0/src/node.c rename to c++/carla-lilv/serd-0.18.2/src/node.c index 7f6e986..065ff87 100644 --- a/c++/carla-lilv/serd-0.18.0/src/node.c +++ b/c++/carla-lilv/serd-0.18.2/src/node.c @@ -22,6 +22,11 @@ #include #include +#ifdef _WIN32 +# define isnan(x) _isnan(x) +# define isinf(x) (!_finite(x)) +#endif + SERD_API SerdNode serd_node_from_string(SerdType type, const uint8_t* buf) @@ -211,6 +216,10 @@ SERD_API SerdNode serd_node_new_decimal(double d, unsigned frac_digits) { + if (isnan(d) || isinf(d)) { + return SERD_NODE_NULL; + } + const double abs_d = fabs(d); const unsigned int_digits = (unsigned)fmax(1.0, ceil(log10(abs_d + 1))); char* buf = (char*)calloc(int_digits + frac_digits + 3, 1); diff --git a/c++/carla-lilv/serd-0.18.0/src/reader.c b/c++/carla-lilv/serd-0.18.2/src/reader.c similarity index 98% rename from c++/carla-lilv/serd-0.18.0/src/reader.c rename to c++/carla-lilv/serd-0.18.2/src/reader.c index d17b80a..c97228d 100644 --- a/c++/carla-lilv/serd-0.18.0/src/reader.c +++ b/c++/carla-lilv/serd-0.18.2/src/reader.c @@ -92,7 +92,7 @@ struct SerdReaderImpl { }; static int -error(SerdReader* reader, SerdStatus st, const char* fmt, ...) +r_err(SerdReader* reader, SerdStatus st, const char* fmt, ...) { va_list args; va_start(args, fmt); @@ -152,7 +152,7 @@ eat_byte_check(SerdReader* reader, const uint8_t byte) { const uint8_t c = peek_byte(reader); if (c != byte) { - return error(reader, SERD_ERR_BAD_SYNTAX, + return r_err(reader, SERD_ERR_BAD_SYNTAX, "expected `%c', not `%c'\n", byte, c); } return eat_byte_safe(reader, byte); @@ -275,7 +275,7 @@ read_hex(SerdReader* reader) if (in_range(c, 0x30, 0x39) || in_range(c, 0x41, 0x46)) { return eat_byte_safe(reader, c); } else { - return error(reader, SERD_ERR_BAD_SYNTAX, + return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid hexadecimal digit `%c'\n", c); } } @@ -303,7 +303,7 @@ read_hex_escape(SerdReader* reader, unsigned length, Ref dest) } else if (c < 0x00110000) { size = 4; } else { - error(reader, SERD_ERR_BAD_SYNTAX, + r_err(reader, SERD_ERR_BAD_SYNTAX, "unicode character 0x%X out of range\n", c); push_replacement(reader, dest); return true; @@ -404,7 +404,7 @@ read_ucharacter_escape(SerdReader* reader, Ref dest) static inline SerdStatus bad_char(SerdReader* reader, Ref dest, const char* fmt, uint8_t c) { - error(reader, SERD_ERR_BAD_SYNTAX, fmt, c); + r_err(reader, SERD_ERR_BAD_SYNTAX, fmt, c); push_replacement(reader, dest); // Skip bytes until the next start byte @@ -460,7 +460,7 @@ read_character(SerdReader* reader, Ref dest) const uint8_t c = peek_byte(reader); assert(c != '\\'); // Only called from methods that handle escapes first if (c == '\0') { - error(reader, SERD_ERR_BAD_SYNTAX, "unexpected end of input\n", c); + r_err(reader, SERD_ERR_BAD_SYNTAX, "unexpected end of input\n", c); return SERD_ERR_BAD_SYNTAX; } else if (c < 0x20) { return bad_char(reader, dest, @@ -499,7 +499,7 @@ read_lcharacter(SerdReader* reader, Ref dest, SerdNodeFlags* flags) if (read_scharacter_escape(reader, dest, flags)) { return SERD_SUCCESS; } else { - error(reader, SERD_ERR_BAD_SYNTAX, + r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid escape `\\%c'\n", peek_byte(reader)); return SERD_ERR_BAD_SYNTAX; } @@ -524,7 +524,7 @@ read_scharacter(SerdReader* reader, Ref dest, SerdNodeFlags* flags) if (read_scharacter_escape(reader, dest, flags)) { return SERD_SUCCESS; } else { - error(reader, SERD_ERR_BAD_SYNTAX, + r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid escape `\\%c'\n", peek_byte(reader)); return SERD_ERR_BAD_SYNTAX; } @@ -547,7 +547,7 @@ read_ucharacter(SerdReader* reader, Ref dest) if (read_ucharacter_escape(reader, dest)) { return SERD_SUCCESS; } else { - error(reader, SERD_ERR_BAD_SYNTAX, + r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid escape `\\%c'\n", peek_byte(reader)); return SERD_FAILURE; } @@ -716,7 +716,7 @@ read_prefixName(SerdReader* reader, Ref dest) { uint8_t c = peek_byte(reader); if (c == '_') { - error(reader, SERD_ERR_BAD_SYNTAX, "unexpected `_'\n"); + r_err(reader, SERD_ERR_BAD_SYNTAX, "unexpected `_'\n"); return pop_node(reader, dest); } TRY_RET(c = read_nameStartChar(reader)); @@ -750,7 +750,7 @@ read_language(SerdReader* reader) { uint8_t c = peek_byte(reader); if (!in_range(c, 'a', 'z')) { - return error(reader, SERD_ERR_BAD_SYNTAX, "unexpected `%c'\n", c); + return r_err(reader, SERD_ERR_BAD_SYNTAX, "unexpected `%c'\n", c); } Ref ref = push_node(reader, SERD_LITERAL, "", 0); push_byte(reader, ref, eat_byte_safe(reader, c)); @@ -804,7 +804,7 @@ read_0_9(SerdReader* reader, Ref str, bool at_least_one) uint8_t c; if (at_least_one) { if (!is_digit((c = peek_byte(reader)))) { - return error(reader, SERD_ERR_BAD_SYNTAX, "expected digit\n"); + return r_err(reader, SERD_ERR_BAD_SYNTAX, "expected digit\n"); } push_byte(reader, str, eat_byte_safe(reader, c)); } @@ -966,7 +966,7 @@ read_nodeID(SerdReader* reader) reader->bprefix ? (char*)reader->bprefix : "", reader->bprefix_len); if (!read_name(reader, ref)) { - return error(reader, SERD_ERR_BAD_SYNTAX, + return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid character at start of name\n"); } if (reader->syntax == SERD_TURTLE) { @@ -975,7 +975,7 @@ read_nodeID(SerdReader* reader) memcpy((char*)buf, "docid", 5); // Prevent clash reader->seen_genid = true; } else if (reader->seen_genid && !strncmp(buf, "docid", 5)) { - error(reader, SERD_ERR_ID_CLASH, + r_err(reader, SERD_ERR_ID_CLASH, "found both `genid' and `docid' IDs, prefix required\n"); return pop_node(reader, ref); } @@ -1049,7 +1049,7 @@ read_blank(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest) case '(': return read_collection(reader, ctx, dest); default: - return error(reader, SERD_ERR_BAD_SYNTAX, "invalid blank node\n"); + return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid blank node\n"); } } @@ -1321,7 +1321,7 @@ read_directive(SerdReader* reader) switch (peek_byte(reader)) { case 'b': return read_base(reader); case 'p': return read_prefixID(reader); - default: return error(reader, SERD_ERR_BAD_SYNTAX, "invalid directive\n"); + default: return r_err(reader, SERD_ERR_BAD_SYNTAX, "invalid directive\n"); } } diff --git a/c++/carla-lilv/serd-0.18.0/src/serd_internal.h b/c++/carla-lilv/serd-0.18.2/src/serd_internal.h similarity index 100% rename from c++/carla-lilv/serd-0.18.0/src/serd_internal.h rename to c++/carla-lilv/serd-0.18.2/src/serd_internal.h diff --git a/c++/carla-lilv/serd-0.18.0/src/serdi.c b/c++/carla-lilv/serd-0.18.2/src/serdi.c similarity index 100% rename from c++/carla-lilv/serd-0.18.0/src/serdi.c rename to c++/carla-lilv/serd-0.18.2/src/serdi.c diff --git a/c++/carla-lilv/serd-0.18.0/src/string.c b/c++/carla-lilv/serd-0.18.2/src/string.c similarity index 100% rename from c++/carla-lilv/serd-0.18.0/src/string.c rename to c++/carla-lilv/serd-0.18.2/src/string.c diff --git a/c++/carla-lilv/serd-0.18.0/src/uri.c b/c++/carla-lilv/serd-0.18.2/src/uri.c similarity index 99% rename from c++/carla-lilv/serd-0.18.0/src/uri.c rename to c++/carla-lilv/serd-0.18.2/src/uri.c index 1812bb9..3294f96 100644 --- a/c++/carla-lilv/serd-0.18.0/src/uri.c +++ b/c++/carla-lilv/serd-0.18.2/src/uri.c @@ -325,10 +325,7 @@ merge(SerdChunk* base, SerdChunk* path) const uint8_t* begin = remove_dot_segments(path->buf, path->len, &up); const uint8_t* end = path->buf + path->len; - if (base->buf) { - assert(base->len > 0); - assert(base->buf[0] == '/'); - + if (base->buf && base->len > 0) { // Find the up'th last slash const uint8_t* base_last = (base->buf + base->len - 1); ++up; diff --git a/c++/carla-lilv/serd-0.18.0/src/writer.c b/c++/carla-lilv/serd-0.18.2/src/writer.c similarity index 98% rename from c++/carla-lilv/serd-0.18.0/src/writer.c rename to c++/carla-lilv/serd-0.18.2/src/writer.c index 6546572..c6f010c 100644 --- a/c++/carla-lilv/serd-0.18.0/src/writer.c +++ b/c++/carla-lilv/serd-0.18.2/src/writer.c @@ -103,7 +103,7 @@ typedef enum { } TextContext; static void -error2(SerdWriter* writer, SerdStatus st, const char* fmt, ...) +w_err(SerdWriter* writer, SerdStatus st, const char* fmt, ...) { va_list args; va_start(args, fmt); @@ -219,7 +219,7 @@ write_text(SerdWriter* writer, TextContext ctx, size = 4; c = in & 0x07; } else { - error2(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in); + w_err(writer, SERD_ERR_BAD_ARG, "invalid UTF-8: %X\n", in); const uint8_t replacement_char[] = { 0xEF, 0xBF, 0xBD }; len += sink(replacement_char, sizeof(replacement_char), writer); return len; @@ -364,7 +364,7 @@ write_node(SerdWriter* writer, switch (writer->syntax) { case SERD_NTRIPLES: if (serd_env_expand(writer->env, node, &uri_prefix, &uri_suffix)) { - error2(writer, SERD_ERR_BAD_CURIE, + w_err(writer, SERD_ERR_BAD_CURIE, "undefined namespace prefix `%s'\n", node->buf); return false; } @@ -408,7 +408,7 @@ write_node(SerdWriter* writer, break; case SERD_URI: has_scheme = serd_uri_string_has_scheme(node->buf); - if ((writer->syntax == SERD_TURTLE) + if (field == FIELD_PREDICATE && (writer->syntax == SERD_TURTLE) && !strcmp((const char*)node->buf, NS_RDF "type")) { sink("a", 1, writer); break; @@ -603,7 +603,7 @@ serd_writer_end_anon(SerdWriter* writer, return SERD_SUCCESS; } if (serd_stack_is_empty(&writer->anon_stack)) { - error2(writer, SERD_ERR_UNKNOWN, + w_err(writer, SERD_ERR_UNKNOWN, "unexpected end of anonymous node\n"); return SERD_ERR_UNKNOWN; } diff --git a/c++/carla-lilv/serd-0.18.0/tests/README.txt b/c++/carla-lilv/serd-0.18.2/tests/README.txt similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/README.txt rename to c++/carla-lilv/serd-0.18.2/tests/README.txt diff --git a/c++/carla-lilv/serd-0.18.0/tests/UTF-8.ttl b/c++/carla-lilv/serd-0.18.2/tests/UTF-8.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/UTF-8.ttl rename to c++/carla-lilv/serd-0.18.2/tests/UTF-8.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-00.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-00.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-00.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-00.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-01.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-01.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-01.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-01.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-02.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-02.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-02.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-02.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-03.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-03.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-03.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-03.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-04.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-04.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-04.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-04.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-05.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-05.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-05.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-05.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-06.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-06.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-06.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-06.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-07.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-07.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-07.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-07.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-08.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-08.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-08.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-08.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-09.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-09.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-09.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-09.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-10.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-10.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-10.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-10.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-11.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-11.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-11.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-11.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-12.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-12.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-12.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-12.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-13.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-13.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-13.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-13.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-14.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-14.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-14.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-14.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-base.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-base.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-base.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-base.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-blank.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-blank.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-blank.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-blank.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-datatype.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-datatype.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-datatype.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-datatype.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-blank.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-blank.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-blank.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-escape.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-escape.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-escape.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-lang-suffix.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-lang-suffix.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-lang-suffix.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-lang.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-lang.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-lang.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-object-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-object-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-object-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-object-list2.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-object-list2.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-object-list2.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-predicate-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-predicate-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-predicate-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-string.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-string.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-string.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-string.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-triple-quote.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-triple-quote.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-triple-quote.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-uri.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-eof-in-uri.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-eof-in-uri.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-escape.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-escape.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-escape.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-escape.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-hex-digit.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-hex-digit.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-hex-digit.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-hex-digit.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-id-clash.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-id-clash.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-id-clash.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-id-clash.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-lang.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-lang.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-lang.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-lang.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-list2.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-list2.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-list2.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-list2.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-namespace.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-namespace.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-namespace.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-namespace.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-ns.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-ns.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-ns.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-ns.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-num.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-num.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-num.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-num.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-object.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-object.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-object.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-object.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-object2.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-object2.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-object2.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-object2.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-prefix.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-prefix.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-prefix.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-prefix.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-string.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-string.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-string.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-string.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-uri-escape.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-uri-escape.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-uri-escape.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-uri-escape.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/bad-verb.ttl b/c++/carla-lilv/serd-0.18.2/tests/bad-verb.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/bad-verb.ttl rename to c++/carla-lilv/serd-0.18.2/tests/bad-verb.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/base.out b/c++/carla-lilv/serd-0.18.2/tests/base.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/base.out rename to c++/carla-lilv/serd-0.18.2/tests/base.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/base.ttl b/c++/carla-lilv/serd-0.18.2/tests/base.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/base.ttl rename to c++/carla-lilv/serd-0.18.2/tests/base.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/manifest-bad.ttl b/c++/carla-lilv/serd-0.18.2/tests/manifest-bad.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/manifest-bad.ttl rename to c++/carla-lilv/serd-0.18.2/tests/manifest-bad.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/manifest.ttl b/c++/carla-lilv/serd-0.18.2/tests/manifest.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/manifest.ttl rename to c++/carla-lilv/serd-0.18.2/tests/manifest.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdf-schema.out b/c++/carla-lilv/serd-0.18.2/tests/rdf-schema.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdf-schema.out rename to c++/carla-lilv/serd-0.18.2/tests/rdf-schema.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdf-schema.ttl b/c++/carla-lilv/serd-0.18.2/tests/rdf-schema.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdf-schema.ttl rename to c++/carla-lilv/serd-0.18.2/tests/rdf-schema.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdfq-results.out b/c++/carla-lilv/serd-0.18.2/tests/rdfq-results.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdfq-results.out rename to c++/carla-lilv/serd-0.18.2/tests/rdfq-results.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdfq-results.ttl b/c++/carla-lilv/serd-0.18.2/tests/rdfq-results.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdfq-results.ttl rename to c++/carla-lilv/serd-0.18.2/tests/rdfq-results.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdfs-namespace.out b/c++/carla-lilv/serd-0.18.2/tests/rdfs-namespace.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdfs-namespace.out rename to c++/carla-lilv/serd-0.18.2/tests/rdfs-namespace.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/rdfs-namespace.ttl b/c++/carla-lilv/serd-0.18.2/tests/rdfs-namespace.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/rdfs-namespace.ttl rename to c++/carla-lilv/serd-0.18.2/tests/rdfs-namespace.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/serd_test.c b/c++/carla-lilv/serd-0.18.2/tests/serd_test.c similarity index 97% rename from c++/carla-lilv/serd-0.18.0/tests/serd_test.c rename to c++/carla-lilv/serd-0.18.2/tests/serd_test.c index 7ce2aa5..259f244 100644 --- a/c++/carla-lilv/serd-0.18.0/tests/serd_test.c +++ b/c++/carla-lilv/serd-0.18.2/tests/serd_test.c @@ -25,6 +25,11 @@ #define USTR(s) ((const uint8_t*)(s)) +#ifdef _WIN32 +# define INFINITY (DBL_MAX + DBL_MAX) +# define NAN (INFINITY - INFINITY) +#endif + static int failure(const char* fmt, ...) { @@ -114,20 +119,23 @@ main(void) // Test serd_node_new_decimal const double dbl_test_nums[] = { - 0.0, 9.0, 10.0, .01, 2.05, -16.00001, 5.000000005, 0.0000000001 + 0.0, 9.0, 10.0, .01, 2.05, -16.00001, 5.000000005, 0.0000000001, NAN, INFINITY }; const char* dbl_test_strs[] = { - "0.0", "9.0", "10.0", "0.01", "2.05", "-16.00001", "5.00000001", "0.0" + "0.0", "9.0", "10.0", "0.01", "2.05", "-16.00001", "5.00000001", "0.0", NULL, NULL }; for (unsigned i = 0; i < sizeof(dbl_test_nums) / sizeof(double); ++i) { - SerdNode node = serd_node_new_decimal(dbl_test_nums[i], 8); - if (strcmp((const char*)node.buf, (const char*)dbl_test_strs[i])) { + SerdNode node = serd_node_new_decimal(dbl_test_nums[i], 8); + const bool pass = (node.buf && dbl_test_strs[i]) + ? !strcmp((const char*)node.buf, (const char*)dbl_test_strs[i]) + : ((const char*)node.buf == dbl_test_strs[i]); + if (!pass) { return failure("Serialised `%s' != %s\n", node.buf, dbl_test_strs[i]); } - const size_t len = strlen((const char*)node.buf); + const size_t len = node.buf ? strlen((const char*)node.buf) : 0; if (node.n_bytes != len || node.n_chars != len) { return failure("Length %zu,%zu != %zu\n", node.n_bytes, node.n_chars, len); diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-00.out b/c++/carla-lilv/serd-0.18.2/tests/test-00.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-00.out rename to c++/carla-lilv/serd-0.18.2/tests/test-00.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-00.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-00.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-00.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-00.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-01.out b/c++/carla-lilv/serd-0.18.2/tests/test-01.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-01.out rename to c++/carla-lilv/serd-0.18.2/tests/test-01.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-01.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-01.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-01.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-01.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-02.out b/c++/carla-lilv/serd-0.18.2/tests/test-02.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-02.out rename to c++/carla-lilv/serd-0.18.2/tests/test-02.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-02.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-02.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-02.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-02.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-03.out b/c++/carla-lilv/serd-0.18.2/tests/test-03.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-03.out rename to c++/carla-lilv/serd-0.18.2/tests/test-03.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-03.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-03.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-03.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-03.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-04.out b/c++/carla-lilv/serd-0.18.2/tests/test-04.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-04.out rename to c++/carla-lilv/serd-0.18.2/tests/test-04.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-04.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-04.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-04.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-04.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-05.out b/c++/carla-lilv/serd-0.18.2/tests/test-05.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-05.out rename to c++/carla-lilv/serd-0.18.2/tests/test-05.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-05.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-05.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-05.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-05.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-06.out b/c++/carla-lilv/serd-0.18.2/tests/test-06.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-06.out rename to c++/carla-lilv/serd-0.18.2/tests/test-06.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-06.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-06.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-06.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-06.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-07.out b/c++/carla-lilv/serd-0.18.2/tests/test-07.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-07.out rename to c++/carla-lilv/serd-0.18.2/tests/test-07.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-07.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-07.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-07.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-07.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-08.out b/c++/carla-lilv/serd-0.18.2/tests/test-08.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-08.out rename to c++/carla-lilv/serd-0.18.2/tests/test-08.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-08.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-08.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-08.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-08.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-09.out b/c++/carla-lilv/serd-0.18.2/tests/test-09.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-09.out rename to c++/carla-lilv/serd-0.18.2/tests/test-09.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-09.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-09.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-09.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-09.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-10.out b/c++/carla-lilv/serd-0.18.2/tests/test-10.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-10.out rename to c++/carla-lilv/serd-0.18.2/tests/test-10.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-10.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-10.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-10.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-10.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-11.out b/c++/carla-lilv/serd-0.18.2/tests/test-11.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-11.out rename to c++/carla-lilv/serd-0.18.2/tests/test-11.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-11.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-11.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-11.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-11.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-12.out b/c++/carla-lilv/serd-0.18.2/tests/test-12.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-12.out rename to c++/carla-lilv/serd-0.18.2/tests/test-12.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-12.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-12.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-12.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-12.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-13.out b/c++/carla-lilv/serd-0.18.2/tests/test-13.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-13.out rename to c++/carla-lilv/serd-0.18.2/tests/test-13.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-13.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-13.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-13.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-13.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-14.out b/c++/carla-lilv/serd-0.18.2/tests/test-14.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-14.out rename to c++/carla-lilv/serd-0.18.2/tests/test-14.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-14.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-14.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-14.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-14.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-15.out b/c++/carla-lilv/serd-0.18.2/tests/test-15.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-15.out rename to c++/carla-lilv/serd-0.18.2/tests/test-15.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-15.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-15.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-15.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-15.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-16.out b/c++/carla-lilv/serd-0.18.2/tests/test-16.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-16.out rename to c++/carla-lilv/serd-0.18.2/tests/test-16.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-16.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-16.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-16.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-16.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-17.out b/c++/carla-lilv/serd-0.18.2/tests/test-17.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-17.out rename to c++/carla-lilv/serd-0.18.2/tests/test-17.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-17.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-17.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-17.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-17.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-18.out b/c++/carla-lilv/serd-0.18.2/tests/test-18.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-18.out rename to c++/carla-lilv/serd-0.18.2/tests/test-18.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-18.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-18.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-18.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-18.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-19.out b/c++/carla-lilv/serd-0.18.2/tests/test-19.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-19.out rename to c++/carla-lilv/serd-0.18.2/tests/test-19.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-19.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-19.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-19.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-19.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-20.out b/c++/carla-lilv/serd-0.18.2/tests/test-20.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-20.out rename to c++/carla-lilv/serd-0.18.2/tests/test-20.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-20.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-20.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-20.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-20.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-21.out b/c++/carla-lilv/serd-0.18.2/tests/test-21.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-21.out rename to c++/carla-lilv/serd-0.18.2/tests/test-21.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-21.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-21.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-21.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-21.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-22.out b/c++/carla-lilv/serd-0.18.2/tests/test-22.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-22.out rename to c++/carla-lilv/serd-0.18.2/tests/test-22.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-22.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-22.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-22.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-22.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-23.out b/c++/carla-lilv/serd-0.18.2/tests/test-23.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-23.out rename to c++/carla-lilv/serd-0.18.2/tests/test-23.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-23.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-23.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-23.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-23.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-24.out b/c++/carla-lilv/serd-0.18.2/tests/test-24.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-24.out rename to c++/carla-lilv/serd-0.18.2/tests/test-24.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-24.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-24.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-24.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-24.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-25.out b/c++/carla-lilv/serd-0.18.2/tests/test-25.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-25.out rename to c++/carla-lilv/serd-0.18.2/tests/test-25.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-25.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-25.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-25.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-25.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-26.out b/c++/carla-lilv/serd-0.18.2/tests/test-26.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-26.out rename to c++/carla-lilv/serd-0.18.2/tests/test-26.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-26.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-26.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-26.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-26.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-27.out b/c++/carla-lilv/serd-0.18.2/tests/test-27.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-27.out rename to c++/carla-lilv/serd-0.18.2/tests/test-27.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-27.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-27.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-27.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-27.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-29.out b/c++/carla-lilv/serd-0.18.2/tests/test-29.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-29.out rename to c++/carla-lilv/serd-0.18.2/tests/test-29.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-29.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-29.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-29.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-29.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-30.out b/c++/carla-lilv/serd-0.18.2/tests/test-30.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-30.out rename to c++/carla-lilv/serd-0.18.2/tests/test-30.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-30.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-30.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-30.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-30.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-backspace.out b/c++/carla-lilv/serd-0.18.2/tests/test-backspace.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-backspace.out rename to c++/carla-lilv/serd-0.18.2/tests/test-backspace.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-backspace.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-backspace.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-backspace.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-backspace.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-bad-utf8.out b/c++/carla-lilv/serd-0.18.2/tests/test-bad-utf8.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-bad-utf8.out rename to c++/carla-lilv/serd-0.18.2/tests/test-bad-utf8.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-bad-utf8.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-bad-utf8.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-bad-utf8.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-bad-utf8.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-base-query.out b/c++/carla-lilv/serd-0.18.2/tests/test-base-query.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-base-query.out rename to c++/carla-lilv/serd-0.18.2/tests/test-base-query.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-base-query.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-base-query.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-base-query.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-base-query.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-blank-cont.out b/c++/carla-lilv/serd-0.18.2/tests/test-blank-cont.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-blank-cont.out rename to c++/carla-lilv/serd-0.18.2/tests/test-blank-cont.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-blank-cont.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-blank-cont.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-blank-cont.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-blank-cont.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-blank-in-list.out b/c++/carla-lilv/serd-0.18.2/tests/test-blank-in-list.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-blank-in-list.out rename to c++/carla-lilv/serd-0.18.2/tests/test-blank-in-list.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-blank-in-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-blank-in-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-blank-in-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-blank-in-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-bom.out b/c++/carla-lilv/serd-0.18.2/tests/test-bom.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-bom.out rename to c++/carla-lilv/serd-0.18.2/tests/test-bom.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-bom.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-bom.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-bom.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-bom.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-cr.out b/c++/carla-lilv/serd-0.18.2/tests/test-cr.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-cr.out rename to c++/carla-lilv/serd-0.18.2/tests/test-cr.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-cr.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-cr.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-cr.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-cr.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-delete.out b/c++/carla-lilv/serd-0.18.2/tests/test-delete.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-delete.out rename to c++/carla-lilv/serd-0.18.2/tests/test-delete.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-delete.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-delete.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-delete.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-delete.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-digit-start-pname.out b/c++/carla-lilv/serd-0.18.2/tests/test-digit-start-pname.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-digit-start-pname.out rename to c++/carla-lilv/serd-0.18.2/tests/test-digit-start-pname.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-digit-start-pname.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-digit-start-pname.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-digit-start-pname.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-digit-start-pname.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-eof-at-page-end.out b/c++/carla-lilv/serd-0.18.2/tests/test-eof-at-page-end.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-eof-at-page-end.out rename to c++/carla-lilv/serd-0.18.2/tests/test-eof-at-page-end.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-eof-at-page-end.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-eof-at-page-end.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-eof-at-page-end.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-escapes.out b/c++/carla-lilv/serd-0.18.2/tests/test-escapes.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-escapes.out rename to c++/carla-lilv/serd-0.18.2/tests/test-escapes.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-escapes.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-escapes.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-escapes.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-escapes.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-id.out b/c++/carla-lilv/serd-0.18.2/tests/test-id.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-id.out rename to c++/carla-lilv/serd-0.18.2/tests/test-id.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-id.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-id.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-id.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-id.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-lang.out b/c++/carla-lilv/serd-0.18.2/tests/test-lang.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-lang.out rename to c++/carla-lilv/serd-0.18.2/tests/test-lang.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-lang.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-lang.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-lang.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-lang.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list-in-blank.out b/c++/carla-lilv/serd-0.18.2/tests/test-list-in-blank.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list-in-blank.out rename to c++/carla-lilv/serd-0.18.2/tests/test-list-in-blank.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list-in-blank.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-list-in-blank.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list-in-blank.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-list-in-blank.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list-subject.out b/c++/carla-lilv/serd-0.18.2/tests/test-list-subject.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list-subject.out rename to c++/carla-lilv/serd-0.18.2/tests/test-list-subject.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list-subject.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-list-subject.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list-subject.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-list-subject.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list.out b/c++/carla-lilv/serd-0.18.2/tests/test-list.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list.out rename to c++/carla-lilv/serd-0.18.2/tests/test-list.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-list.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-list.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-list.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-list.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-long-string.out b/c++/carla-lilv/serd-0.18.2/tests/test-long-string.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-long-string.out rename to c++/carla-lilv/serd-0.18.2/tests/test-long-string.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-long-string.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-long-string.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-long-string.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-long-string.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-no-spaces.out b/c++/carla-lilv/serd-0.18.2/tests/test-no-spaces.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-no-spaces.out rename to c++/carla-lilv/serd-0.18.2/tests/test-no-spaces.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-no-spaces.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-no-spaces.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-no-spaces.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-no-spaces.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-num.out b/c++/carla-lilv/serd-0.18.2/tests/test-num.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-num.out rename to c++/carla-lilv/serd-0.18.2/tests/test-num.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-num.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-num.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-num.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-num.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-out-of-range-unicode.out b/c++/carla-lilv/serd-0.18.2/tests/test-out-of-range-unicode.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-out-of-range-unicode.out rename to c++/carla-lilv/serd-0.18.2/tests/test-out-of-range-unicode.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-out-of-range-unicode.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-out-of-range-unicode.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-out-of-range-unicode.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-prefix.out b/c++/carla-lilv/serd-0.18.2/tests/test-prefix.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-prefix.out rename to c++/carla-lilv/serd-0.18.2/tests/test-prefix.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-prefix.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-prefix.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-prefix.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-prefix.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-pretty.out b/c++/carla-lilv/serd-0.18.2/tests/test-pretty.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-pretty.out rename to c++/carla-lilv/serd-0.18.2/tests/test-pretty.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-pretty.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-pretty.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-pretty.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-pretty.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-rel.out b/c++/carla-lilv/serd-0.18.2/tests/test-rel.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-rel.out rename to c++/carla-lilv/serd-0.18.2/tests/test-rel.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-rel.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-rel.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-rel.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-rel.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-semi-dot.out b/c++/carla-lilv/serd-0.18.2/tests/test-semi-dot.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-semi-dot.out rename to c++/carla-lilv/serd-0.18.2/tests/test-semi-dot.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-semi-dot.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-semi-dot.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-semi-dot.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-semi-dot.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-uri.out b/c++/carla-lilv/serd-0.18.2/tests/test-uri.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-uri.out rename to c++/carla-lilv/serd-0.18.2/tests/test-uri.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-uri.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-uri.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-uri.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-uri.ttl diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-utf8-uri.out b/c++/carla-lilv/serd-0.18.2/tests/test-utf8-uri.out similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-utf8-uri.out rename to c++/carla-lilv/serd-0.18.2/tests/test-utf8-uri.out diff --git a/c++/carla-lilv/serd-0.18.0/tests/test-utf8-uri.ttl b/c++/carla-lilv/serd-0.18.2/tests/test-utf8-uri.ttl similarity index 100% rename from c++/carla-lilv/serd-0.18.0/tests/test-utf8-uri.ttl rename to c++/carla-lilv/serd-0.18.2/tests/test-utf8-uri.ttl diff --git a/c++/carla-lilv/serd-0.18.2/waf b/c++/carla-lilv/serd-0.18.2/waf new file mode 100755 index 0000000..3945ced Binary files /dev/null and b/c++/carla-lilv/serd-0.18.2/waf differ diff --git a/c++/carla-lilv/serd-0.18.0/wscript b/c++/carla-lilv/serd-0.18.2/wscript similarity index 87% rename from c++/carla-lilv/serd-0.18.0/wscript rename to c++/carla-lilv/serd-0.18.2/wscript index 206a8d9..bb7fb0d 100644 --- a/c++/carla-lilv/serd-0.18.0/wscript +++ b/c++/carla-lilv/serd-0.18.2/wscript @@ -3,28 +3,22 @@ import glob import os import shutil import subprocess +import waflib.Logs as Logs +import waflib.Options as Options +import waflib.extras.autowaf as autowaf -from waflib.extras import autowaf as autowaf -import waflib.Logs as Logs, waflib.Options as Options - -# Version of this package (even if built as a child) -SERD_VERSION = '0.18.0' -SERD_MAJOR_VERSION = '0' - -# Library version (UNIX style major, minor, micro) +# Library and package version (UNIX style major, minor, micro) # major increment <=> incompatible changes # minor increment <=> compatible changes (additions) # micro increment <=> no interface changes -# Serd uses the same version number for both library and package -SERD_LIB_VERSION = SERD_VERSION - -# Variables for 'waf dist' -APPNAME = 'serd' -VERSION = SERD_VERSION +SERD_VERSION = '0.18.2' +SERD_MAJOR_VERSION = '0' -# Mandatory variables -top = '.' -out = 'build' +# Mandatory waf variables +APPNAME = 'serd' # Package name for waf dist +VERSION = SERD_VERSION # Package version for waf dist +top = '.' # Source directory +out = 'build' # Build directory def options(opt): opt.load('compiler_c') @@ -66,48 +60,39 @@ def configure(conf): if Options.options.largefile: conf.env.append_unique('DEFINES', ['_FILE_OFFSET_BITS=64']) - # Check for gcov library (for test coverage) if conf.env.BUILD_TESTS: - conf.check_cc(lib='gcov', - define_name='HAVE_GCOV', - mandatory=False) - - # Check for fmax - conf.check(function_name='fmax', - header_name='math.h', - define_name='HAVE_FMAX', - lib=['m'], - mandatory=False) - - # Check for posix_memalign - conf.check(function_name='posix_memalign', - header_name='stdlib.h', - define_name='HAVE_POSIX_MEMALIGN', - defines=['_POSIX_C_SOURCE=201112L'], - mandatory=False) - - # Check for posix_fadvise - conf.check(function_name='posix_fadvise', - header_name='fcntl.h', - define_name='HAVE_POSIX_FADVISE', - defines=['_POSIX_C_SOURCE=201112L'], - mandatory=False) - - # Check for fileno - conf.check(function_name='fileno', - header_name='stdio.h', - define_name='HAVE_FILENO', - defines=['_POSIX_C_SOURCE=201112L'], - mandatory=False) + conf.check(lib = 'gcov', + define_name = 'HAVE_GCOV', + mandatory = False) + + conf.check(function_name = 'fmax', + header_name = 'math.h', + define_name = 'HAVE_FMAX', + lib = ['m'], + mandatory = False) + + conf.check(function_name = 'posix_memalign', + header_name = 'stdlib.h', + define_name = 'HAVE_POSIX_MEMALIGN', + defines = ['_POSIX_C_SOURCE=201112L'], + mandatory = False) + + conf.check(function_name = 'posix_fadvise', + header_name = 'fcntl.h', + define_name = 'HAVE_POSIX_FADVISE', + defines = ['_POSIX_C_SOURCE=201112L'], + mandatory = False) + + conf.check(function_name = 'fileno', + header_name = 'stdio.h', + define_name = 'HAVE_FILENO', + defines = ['_POSIX_C_SOURCE=201112L'], + mandatory = False) autowaf.define(conf, 'SERD_VERSION', SERD_VERSION) + autowaf.set_lib_env(conf, 'serd', SERD_VERSION) conf.write_config_header('serd_config.h', remove=False) - conf.env.INCLUDES_SERD = ['%s/serd-%s' % (conf.env.INCLUDEDIR, - SERD_MAJOR_VERSION)] - conf.env.LIBPATH_SERD = [conf.env.LIBDIR] - conf.env.LIB_SERD = ['serd-%s' % SERD_MAJOR_VERSION]; - autowaf.display_msg(conf, 'Utilities', str(conf.env.BUILD_UTILS)) autowaf.display_msg(conf, 'Unit tests', str(conf.env.BUILD_TESTS)) print('') @@ -147,7 +132,7 @@ def build(bld): lib = libs, name = 'libserd', target = 'serd-%s' % SERD_MAJOR_VERSION, - vnum = SERD_LIB_VERSION, + vnum = SERD_VERSION, install_path = '${LIBDIR}', defines = defines + ['SERD_SHARED', 'SERD_INTERNAL'], cflags = libflags) @@ -161,7 +146,7 @@ def build(bld): lib = libs, name = 'libserd_static', target = 'serd-%s' % SERD_MAJOR_VERSION, - vnum = SERD_LIB_VERSION, + vnum = SERD_VERSION, install_path = '${LIBDIR}', defines = defines + ['SERD_INTERNAL'])