Update serd

source/includes/serd

@@ -1 +1 @@
-../modules/lilv/serd-0.21.1/serd/
+../modules/lilv/serd-0.22.0/serd/

source/modules/lilv/Makefile

@@ -10,7 +10,7 @@ include ../Makefile.mk
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-SERD_VERSION   = 0.21.1
+SERD_VERSION   = 0.22.0
 SORD_VERSION   = 0.13.0
 SRATOM_VERSION = 0.4.7
 LILV_VERSION   = 0.21.3

source/modules/lilv/serd-0.21.1/PACKAGING

@@ -1,29 +0,0 @@
-This library is designed to allow parallel installation of different major
-versions.  To facilitate this, the shared library name, include directory, and
-pkg-config file are suffixed with the major version number of the library.
-
-For example, if this library was named "foo" and at version 1.x.y:
-
-/usr/include/foo-1/foo/foo.h
-/usr/lib/foo-1.so.1.x.y
-/usr/lib/pkgconfig/foo-1.pc
-
-Dependencies check for pkg-config name "foo-1" and will build
-against a compatible version 1, regardless any other installed versions.
-
-*** IMPORTANT GUIDELINES FOR PACKAGERS ***
-
-Packages should follow the same conventions as above, i.e. include the major
-version (and only the major version) in the name of the package.  Continuing the
-example above, the package(s) would be named foo-1 and foo-1-dev.  This way,
-if/when version 2 comes out, it may be installed at the same time as version 1
-without breaking anything.
-
-Please do not create packages of this library that do not follow these
-guidelines, you will break things and cause unnecessary headaches.  Please do
-not use any number as a suffix other than the actual major version number of the
-upstream source package.
-
-Because program and documentation names are not versioned, these should be
-included in separate packages which may replace previous versions, since
-there is little use in having parallel installations of them.

source/modules/lilv/serd-0.21.1/COPYING → source/modules/lilv/serd-0.22.0/COPYING

@@ -1,4 +1,4 @@
-Copyright 2011-2014 David Robillard <http://drobilla.net>
+Copyright 2011-2015 David Robillard <http://drobilla.net>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

source/modules/lilv/serd-0.21.1/INSTALL → source/modules/lilv/serd-0.22.0/INSTALL

@@ -8,11 +8,7 @@ Building this software requires only Python.  To install with default options:
 
     ./waf configure
     ./waf
-    ./waf install
-
-You may need to become root for the install stage, for example:
-
-    sudo ./waf install
+    ./waf install # or sudo ./waf install
 
 Configuration Options
 ---------------------
@@ -40,12 +36,20 @@ invoked:
  * CPPFLAGS:  C preprocessor options
  * LINKFLAGS: Linker options
 
-Installation Directories
-------------------------
+Library Versioning
+------------------
+
+This library uses semantic versioning <http://semver.org/>.
+
+Several major versions can be installed in parallel.  The shared library name,
+include directory, and pkg-config file are suffixed with the major version
+number.  For example, a library named "foo" at version 1.x.y might install:
 
-The --prefix option (or the PREFIX environment variable) can be used to change
-the prefix which all files are installed under.  There are also several options
-allowing for more fine-tuned control, see the --help output for details.
+    /usr/include/foo-1/foo/foo.h
+    /usr/lib/foo-1.so.1.x.y
+    /usr/lib/pkgconfig/foo-1.pc
+
+Dependencies can check for the package "foo-1" with pkg-config.
 
 Packaging
 ---------
@@ -57,3 +61,6 @@ which adds a prefix to all install paths.  For example:
     ./waf configure --prefix=/usr
     ./waf
     ./waf install --destdir=/tmp/package
+
+Packages should allow parallel installation of several major versions.  For
+example, the above would be packaged as "foo-1".

source/modules/lilv/serd-0.21.1/NEWS → source/modules/lilv/serd-0.22.0/NEWS

@@ -1,16 +1,19 @@
-serd (0.21.1) unstable;
+serd (0.22.0) stable;
 
   * Remove dependence on fmax() to avoid portability issues
   * Fix serd_reader_read_file() for URIs with escaped characters (spaces)
   * Add serd_reader_set_strict() and -l (lax) option to serdi to tolerate
     parsing URIs with escaped characters
   * Fix reading statements ending with a blank then dot with no space
+  * Fix clash resolution when a blank node ID prefix is set
   * Fix serializing fractional decimals that would round up
   * Add support for Turtle named inline nodes extension
   * Report errors for invalid IRI characters and missing terminators
+  * Show serdi errors in standard format
   * Fix warnings when building with ISO C++ compilers
+  * Upgrade to waf 1.8.14
 
- -- David Robillard <d@drobilla.net>  Sat, 04 Apr 2015 16:22:17 -0400
+ -- David Robillard <d@drobilla.net>  Thu, 08 Oct 2015 15:34:18 -0400
 
 serd (0.20.0) stable;
 

source/modules/lilv/serd-0.21.1/serd.pc.in → source/modules/lilv/serd-0.22.0/serd.pc.in

@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@
 Name: Serd
 Version: @SERD_VERSION@
 Description: Lightweight RDF syntax library
-Libs: -L${libdir} -l@LIB_SERD@ -lm
+Libs: -L${libdir} -l@LIB_SERD@
 Libs.private: -lm
 Cflags: -I${includedir}/serd-@SERD_MAJOR_VERSION@

source/modules/lilv/serd-0.21.1/serd/serd.h → source/modules/lilv/serd-0.22.0/serd/serd.h

@@ -1,5 +1,5 @@
 /*
-  Copyright 2011-2014 David Robillard <http://drobilla.net>
+  Copyright 2011-2015 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above

source/modules/lilv/serd-0.21.1/src/node.c → source/modules/lilv/serd-0.22.0/src/node.c

@@ -1,5 +1,5 @@
 /*
-  Copyright 2011-2014 David Robillard <http://drobilla.net>
+  Copyright 2011-2015 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above

source/modules/lilv/serd-0.21.1/src/reader.c → source/modules/lilv/serd-0.22.0/src/reader.c

@@ -1,5 +1,5 @@
 /*
-  Copyright 2011-2014 David Robillard <http://drobilla.net>
+  Copyright 2011-2015 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -635,7 +635,7 @@ read_PN_CHARS(SerdReader* reader, Ref dest)
 	if ((c & 0x80)) {  // Multi-byte character
 		return !read_utf8_character(reader, dest, eat_byte_safe(reader, c));
 	}
-	
+
 	if (is_alpha(c) || is_digit(c) || c == '_' || c == '-') {
 		push_byte(reader, dest, eat_byte_safe(reader, c));
 		return true;
@@ -656,7 +656,7 @@ read_PERCENT(SerdReader* reader, Ref dest)
 	}
 	return false;
 }
-	
+
 static SerdStatus
 read_PLX(SerdReader* reader, Ref dest)
 {
@@ -884,7 +884,7 @@ read_number(SerdReader* reader, Ref* dest, Ref* datatype, bool* ate_dot)
 				*ate_dot = true;  // Force caller to deal with stupid grammar
 				return true;  // Next byte is not a number character, done
 			}
-			
+
 			push_byte(reader, ref, '.');
 			read_0_9(reader, ref, false);
 		}
@@ -1035,11 +1035,12 @@ read_BLANK_NODE_LABEL(SerdReader* reader, bool* ate_dot)
 	}
 
 	if (reader->syntax == SERD_TURTLE) {
-		if (is_digit(n->buf[1])) {
-			if (n->buf[0] == 'b') {
-				((char*)n->buf)[0] = 'B';  // Prevent clash
+		if (is_digit(n->buf[reader->bprefix_len + 1])) {
+			if ((n->buf[reader->bprefix_len]) == 'b') {
+				((char*)n->buf)[reader->bprefix_len] = 'B';  // Prevent clash
 				reader->seen_genid = true;
-			} else if (reader->seen_genid && n->buf[0] == 'B') {
+			} else if (reader->seen_genid &&
+			           n->buf[reader->bprefix_len] == 'B') {
 				r_err(reader, SERD_ERR_ID_CLASH,
 				      "found both `b' and `B' blank IDs, prefix required\n");
 				return pop_node(reader, ref);
@@ -1088,56 +1089,48 @@ read_blankName(SerdReader* reader)
 }
 
 static bool
-read_blank(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest, bool* ate_dot)
+read_anon(SerdReader* reader, ReadContext ctx, bool subject, Ref* dest)
 {
 	const SerdStatementFlags old_flags = *ctx.flags;
 	bool empty;
-	switch (peek_byte(reader)) {
-	case '_':
-		return (*dest = read_BLANK_NODE_LABEL(reader, ate_dot));
-	case '[':
-		eat_byte_safe(reader, '[');
-		if ((empty = peek_delim(reader, ']'))) {
-			*ctx.flags |= (subject) ? SERD_EMPTY_S : SERD_EMPTY_O;
-		} else {
-			*ctx.flags |= (subject) ? SERD_ANON_S_BEGIN : SERD_ANON_O_BEGIN;
-			if (peek_delim(reader, '=')) {
-				if (!(*dest = read_blankName(reader)) ||
-				    !eat_delim(reader, ';')) {
-					return false;
-				}
+	eat_byte_safe(reader, '[');
+	if ((empty = peek_delim(reader, ']'))) {
+		*ctx.flags |= (subject) ? SERD_EMPTY_S : SERD_EMPTY_O;
+	} else {
+		*ctx.flags |= (subject) ? SERD_ANON_S_BEGIN : SERD_ANON_O_BEGIN;
+		if (peek_delim(reader, '=')) {
+			if (!(*dest = read_blankName(reader)) ||
+			    !eat_delim(reader, ';')) {
+				return false;
 			}
 		}
+	}
+
+	if (!*dest) {
+		*dest = blank_id(reader);
+	}
+	if (ctx.subject) {
+		TRY_RET(emit_statement(reader, ctx, *dest, 0, 0));
+	}
 
-		if (!*dest) {
-			*dest = blank_id(reader);
+	ctx.subject = *dest;
+	if (!empty) {
+		*ctx.flags &= ~(SERD_LIST_CONT);
+		if (!subject) {
+			*ctx.flags |= SERD_ANON_CONT;
 		}
-		if (ctx.subject) {
-			TRY_RET(emit_statement(reader, ctx, *dest, 0, 0));
+		bool ate_dot_in_list = false;
+		read_predicateObjectList(reader, ctx, &ate_dot_in_list);
+		if (ate_dot_in_list) {
+			return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n");
 		}
-
-		ctx.subject = *dest;
-		if (!empty) {
-			*ctx.flags &= ~(SERD_LIST_CONT);
-			if (!subject) {
-				*ctx.flags |= SERD_ANON_CONT;
-			}
-			bool ate_dot_in_list = false;
-			read_predicateObjectList(reader, ctx, &ate_dot_in_list);
-			if (ate_dot_in_list) {
-				return r_err(reader, SERD_ERR_BAD_SYNTAX, "`.' inside blank\n");
-			}
-			read_ws_star(reader);
-			if (reader->end_sink) {
-				reader->end_sink(reader->handle, deref(reader, *dest));
-			}
-			*ctx.flags = old_flags;
+		read_ws_star(reader);
+		if (reader->end_sink) {
+			reader->end_sink(reader->handle, deref(reader, *dest));
 		}
-		return (eat_byte_check(reader, ']') == ']');
-	case '(':
-		return read_collection(reader, ctx, dest);
-	default: return false;  // never reached
+		*ctx.flags = old_flags;
 	}
+	return (eat_byte_check(reader, ']') == ']');
 }
 
 // Recurses, calling statement_sink for every statement encountered.
@@ -1164,11 +1157,16 @@ read_object(SerdReader* reader, ReadContext ctx, bool* ate_dot)
 	case '\0':
 	case ')':
 		return false;
-	case '[': case '(':
+	case '[':
 		emit = false;
-		// fall through
+		TRY_THROW(ret = read_anon(reader, ctx, false, &o));
+		break;
+	case '(':
+		emit = false;
+		TRY_THROW(ret = read_collection(reader, ctx, &o));
+		break;
 	case '_':
-		TRY_THROW(ret = read_blank(reader, ctx, false, &o, ate_dot));
+		TRY_THROW(ret = (o = read_BLANK_NODE_LABEL(reader, ate_dot)));
 		break;
 	case '<': case ':':
 		TRY_THROW(ret = read_iri(reader, &o, ate_dot));
@@ -1333,11 +1331,17 @@ read_subject(SerdReader* reader, ReadContext ctx, bool* nested)
 	Ref  subject = 0;
 	bool ate_dot = false;
 	switch (peek_byte(reader)) {
-	case '[': case '(':
+	case '[':
 		*nested = true;
-		// nobreak
+		read_anon(reader, ctx, true, &subject);
+		break;
+	case '(':
+		*nested = true;
+		read_collection(reader, ctx, &subject);
+		break;
 	case '_':
-		read_blank(reader, ctx, true, &subject, &ate_dot);
+		*nested = false;
+		subject = read_BLANK_NODE_LABEL(reader, &ate_dot);
 		break;
 	default:
 		read_iri(reader, &subject, &ate_dot);

source/modules/lilv/serd-0.21.1/src/serdi.c → source/modules/lilv/serd-0.22.0/src/serdi.c

@@ -1,5 +1,5 @@
 /*
-  Copyright 2011-2013 David Robillard <http://drobilla.net>
+  Copyright 2011-2015 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -21,6 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define SERDI_ERROR(msg)       fprintf(stderr, "serdi: " msg);
+#define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serdi: " fmt, __VA_ARGS__);
+
 typedef struct {
 	SerdEnv*    env;
 	SerdWriter* writer;
@@ -41,6 +44,7 @@ static int
 print_usage(const char* name, bool error)
 {
 	FILE* const os = error ? stderr : stdout;
+	fprintf(os, "%s", error ? "\n" : "");
 	fprintf(os, "Usage: %s [OPTION]... INPUT [BASE_URI]\n", name);
 	fprintf(os, "Read and write RDF syntax.\n");
 	fprintf(os, "Use - for INPUT to read from standard input.\n\n");
@@ -68,17 +72,17 @@ set_syntax(SerdSyntax* syntax, const char* name)
 	} else if (!strcmp(name, "ntriples")) {
 		*syntax = SERD_NTRIPLES;
 	} else {
-		fprintf(stderr, "Unknown input format `%s'\n", name);
+		SERDI_ERRORF("unknown syntax `%s'\n", name);
 		return false;
 	}
 	return true;
 }
 
 static int
-bad_arg(const char* name, char opt)
+missing_arg(const char* name, char opt)
 {
-	fprintf(stderr, "%s: Bad or missing value for -%c\n", name, opt);
-	return 1;
+	SERDI_ERRORF("option requires an argument -- '%c'\n", opt);
+	return print_usage(name, true);
 }
 
 static SerdStatus
@@ -133,36 +137,40 @@ main(int argc, char** argv)
 			++a;
 			break;
 		} else if (argv[a][1] == 'i') {
-			if (++a == argc || !set_syntax(&input_syntax, argv[a])) {
-				return bad_arg(argv[0], 'i');
+			if (++a == argc) {
+				return missing_arg(argv[0], 'i');
+			} else if (!set_syntax(&input_syntax, argv[a])) {
+				return print_usage(argv[0], true);
 			}
 		} else if (argv[a][1] == 'o') {
-			if (++a == argc || !set_syntax(&output_syntax, argv[a])) {
-				return bad_arg(argv[0], 'o');
+			if (++a == argc) {
+				return missing_arg(argv[0], 'o');
+			} else if (!set_syntax(&output_syntax, argv[a])) {
+				return print_usage(argv[0], true);
 			}
 		} else if (argv[a][1] == 'p') {
 			if (++a == argc) {
-				return bad_arg(argv[0], 'p');
+				return missing_arg(argv[0], 'p');
 			}
 			add_prefix = (const uint8_t*)argv[a];
 		} else if (argv[a][1] == 'c') {
 			if (++a == argc) {
-				return bad_arg(argv[0], 'c');
+				return missing_arg(argv[0], 'c');
 			}
 			chop_prefix = (const uint8_t*)argv[a];
 		} else if (argv[a][1] == 'r') {
 			if (++a == argc) {
-				return bad_arg(argv[0], 'r');
+				return missing_arg(argv[0], 'r');
 			}
 			root_uri = (const uint8_t*)argv[a];
 		} else {
-			fprintf(stderr, "%s: Unknown option `%s'\n", argv[0], argv[a]);
+			SERDI_ERRORF("invalid option -- '%s'\n", argv[a] + 1);
 			return print_usage(argv[0], true);
 		}
 	}
 
 	if (a == argc) {
-		fprintf(stderr, "%s: Missing input\n", argv[0]);
+		SERDI_ERROR("missing input\n");
 		return 1;
 	}
 

source/modules/lilv/serd-0.21.1/src/writer.c → source/modules/lilv/serd-0.22.0/src/writer.c

@@ -1,5 +1,5 @@
 /*
-  Copyright 2011-2014 David Robillard <http://drobilla.net>
+  Copyright 2011-2015 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
@@ -177,7 +177,7 @@ parse_utf8_char(SerdWriter* writer, const uint8_t* utf8, size_t* size)
 
 	size_t  i  = 0;
 	uint8_t in = utf8[i++];
-	
+
 #define READ_BYTE() \
 	in = utf8[i++] & 0x3F; \
 	c  = (c << 6) | in;
@@ -237,7 +237,7 @@ uri_must_escape(const uint8_t c)
 		return !in_range(c, 0x20, 0x7E);
 	}
 }
-	
+
 static size_t
 write_uri(SerdWriter* writer, const uint8_t* utf8, size_t n_bytes)
 {