From 79ced0696cce127cb387a5eb44e254cf9ca6d683 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 16 Feb 2011 20:04:14 +0000
Subject: Sord::Resource => Sord::URI (consistency with C API).

git-svn-id: http://svn.drobilla.net/sord/trunk@37 3d64ff67-21c5-427c-a301-fe4f08042e5a
---
 sord/sordmm.hpp | 22 +++++++++++-----------
 src/syntax.c    |  1 -
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sord/sordmm.hpp b/sord/sordmm.hpp
index 4661458..af2a064 100644
--- a/sord/sordmm.hpp
+++ b/sord/sordmm.hpp
@@ -131,7 +131,7 @@ class Node : public Wrapper<SordNode> {
 public:
 	enum Type {
 		UNKNOWN  = 0,
-		RESOURCE = SORD_URI,
+		URI      = SORD_URI,
 		BLANK    = SORD_BLANK,
 		LITERAL  = SORD_LITERAL
 	};
@@ -178,11 +178,11 @@ public:
 
 	inline bool is_literal_type(const char* type_uri) const;
 
-	inline bool is_resource() const { return _c_obj && type() == RESOURCE; }
-	inline bool is_blank()    const { return _c_obj && type() == BLANK; }
-	inline bool is_int()      const { return is_literal_type(SORD_NS_XSD "integer"); }
-	inline bool is_float()    const { return is_literal_type(SORD_NS_XSD "decimal"); }
-	inline bool is_bool()     const { return is_literal_type(SORD_NS_XSD "boolean"); }
+	inline bool is_uri()   const { return _c_obj && type() == URI; }
+	inline bool is_blank() const { return _c_obj && type() == BLANK; }
+	inline bool is_int()   const { return is_literal_type(SORD_NS_XSD "integer"); }
+	inline bool is_float() const { return is_literal_type(SORD_NS_XSD "decimal"); }
+	inline bool is_bool()  const { return is_literal_type(SORD_NS_XSD "boolean"); }
 
 	inline int   to_int()   const;
 	inline float to_float() const;
@@ -205,15 +205,15 @@ operator<<(std::ostream& os, const Node& node)
 	return os << node.to_string() << std::endl;
 }
 
-class Resource : public Node {
+class URI : public Node {
 public:
-	inline Resource(World& world, const std::string& s) : Node(world, Node::RESOURCE, s) {}
+	inline URI(World& world, const std::string& s) : Node(world, Node::URI, s) {}
 };
 
 class Curie : public Node {
 public:
 	inline Curie(World& world, const std::string& s)
-		: Node(world, Node::RESOURCE, world.prefixes().expand(s)) {}
+		: Node(world, Node::URI, world.prefixes().expand(s)) {}
 };
 
 class Literal : public Node {
@@ -226,7 +226,7 @@ Node::Node(World& world, Type type, const std::string& s)
 	: _world(&world)
 {
 	switch (type) {
-	case RESOURCE:
+	case URI:
 		assert(s.find(":") == std::string::npos
 		       || s.substr(0, 5) == "http:"
 		       || s.substr(0, 5) == "file:"
@@ -415,7 +415,7 @@ private:
 inline
 Model::Model(World& world, const Glib::ustring& base_uri)
 	: _world(world)
-	, _base(world, Node::RESOURCE, base_uri)
+	, _base(world, Node::URI, base_uri)
 	, _writer(NULL)
 {
 	// FIXME: parameters
diff --git a/src/syntax.c b/src/syntax.c
index 0666ecd..6542071 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -228,7 +228,6 @@ sord_read_file(SordModel      model,
 
 	FILE* const fd = fopen((const char*)path,  "r");
 	if (!fd) {
-		fprintf(stderr, "failed to open file %s\n", path);
 		return false;
 	}
 
-- 
cgit v1.2.1