SerdNodeType => SerdType.

git-svn-id: http://svn.drobilla.net/serd/trunk@43 490d8e77-9747-427b-9fa3-0b8f29cee8a0

4 files changed, 30 insertions, 30 deletions

diff --git a/serd/serd.h b/serd/serd.h
index 8f8dfdf3..5258b4fb 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -68,7 +68,7 @@ typedef enum {
  * node is either a resource, literal, or blank. In syntax there are two
  * ways to refer to a resource (URI or CURIE), and two ways to refer to a
  * blank node (with a blank ID, or anonymously). Serd represents nodes as
- * an unquoted UTF-8 string "value" associated with a @ref SerdNodeType,
+ * an unquoted UTF-8 string "value" associated with a @ref SerdType,
  * which preserves syntactic information allowing for lossless abbreviation.
  * A non-abbreviating sink may simply consider @ref SERD_ANON_BEGIN and
  * @ref SERD_ANON equivalent to SERD_BLANK_ID.
@@ -107,7 +107,7 @@ typedef enum {
 	 */
 	SERD_ANON = 6
 	
-} SerdNodeType;
+} SerdType;
 
 /** @name SerdURI
  * A parsed URI.
@@ -248,11 +248,11 @@ typedef bool (*SerdPrefixSink)(void*             handle,
 typedef bool (*SerdStatementSink)(void*             handle,
                                   const SerdString* graph,
                                   const SerdString* subject,
-                                  SerdNodeType      subject_type,
+                                  SerdType      subject_type,
                                   const SerdString* predicate,
-                                  SerdNodeType      predicate_type,
+                                  SerdType      predicate_type,
                                   const SerdString* object,
-                                  SerdNodeType      object_type,
+                                  SerdType      object_type,
                                   const SerdString* object_lang,
                                   const SerdString* object_datatype);
 
@@ -331,11 +331,11 @@ bool
 serd_writer_write_statement(SerdWriter        writer,
                             const SerdString* graph,
                             const SerdString* subject,
-                            SerdNodeType      subject_type,
+                            SerdType          subject_type,
                             const SerdString* predicate,
-                            SerdNodeType      predicate_type,
+                            SerdType          predicate_type,
                             const SerdString* object,
-                            SerdNodeType      object_type,
+                            SerdType          object_type,
                             const SerdString* object_datatype,
                             const SerdString* object_lang);
 
diff --git a/src/reader.c b/src/reader.c
index 1c7f6f1c..c747ca38 100644
--- a/src/reader.c
+++ b/src/reader.c
@@ -46,10 +46,10 @@ typedef uint32_t uchar;
 typedef size_t Ref;
 
 typedef struct {
-	SerdNodeType type;
-	Ref          value;
-	Ref          datatype;
-	Ref          lang;
+	SerdType type;
+	Ref      value;
+	Ref      datatype;
+	Ref      lang;
 } Node;
 
 typedef struct {
@@ -103,7 +103,7 @@ error(SerdReader reader, const char* fmt, ...)
 }
 
 static Node
-make_node(SerdNodeType type, Ref value, Ref datatype, Ref lang)
+make_node(SerdType type, Ref value, Ref datatype, Ref lang)
 {
 	const Node ret = { type, value, datatype, lang };
 	return ret;
diff --git a/src/serdi.c b/src/serdi.c
index 2aa0a08e..5c176ce8 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -98,11 +98,11 @@ static bool
 event_statement(void*             handle,
                 const SerdString* graph,
                 const SerdString* subject,
-                SerdNodeType      subject_type,
+                SerdType          subject_type,
                 const SerdString* predicate,
-                SerdNodeType      predicate_type,
+                SerdType          predicate_type,
                 const SerdString* object,
-                SerdNodeType      object_type,
+                SerdType          object_type,
                 const SerdString* object_datatype,
                 const SerdString* object_lang)
 {
diff --git a/src/writer.c b/src/writer.c
index 3e91bcd2..aa9b7b76 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -33,16 +33,16 @@ static const WriteContext WRITE_CONTEXT_NULL = { 0, 0, 0 };
 typedef bool (*StatementWriter)(SerdWriter        writer,
                                 const SerdString* graph,
                                 const SerdString* subject,
-                                SerdNodeType      subject_type,
+                                SerdType          subject_type,
                                 const SerdString* predicate,
-                                SerdNodeType      predicate_type,
+                                SerdType          predicate_type,
                                 const SerdString* object,
-                                SerdNodeType      object_type,
+                                SerdType          object_type,
                                 const SerdString* object_datatype,
                                 const SerdString* object_lang);
 
 typedef bool (*NodeWriter)(SerdWriter        writer,
-                           SerdNodeType      type,
+                           SerdType          type,
                            const SerdString* str,
                            const SerdString* datatype,
                            const SerdString* lang);
@@ -183,7 +183,7 @@ serd_writer_write_delim(SerdWriter writer, const uint8_t delim)
 
 static bool
 write_node(SerdWriter        writer,
-           SerdNodeType      type,
+           SerdType          type,
            const SerdString* str,
            const SerdString* datatype,
            const SerdString* lang)
@@ -266,11 +266,11 @@ bool
 serd_writer_write_statement(SerdWriter        writer,
                             const SerdString* graph,
                             const SerdString* subject,
-                            SerdNodeType      subject_type,
+                            SerdType          subject_type,
                             const SerdString* predicate,
-                            SerdNodeType      predicate_type,
+                            SerdType          predicate_type,
                             const SerdString* object,
-                            SerdNodeType      object_type,
+                            SerdType          object_type,
                             const SerdString* object_datatype,
                             const SerdString* object_lang)
 {
@@ -285,11 +285,11 @@ static bool
 serd_writer_write_statement_abbrev(SerdWriter        writer,
                                    const SerdString* graph,
                                    const SerdString* subject,
-                                   SerdNodeType      subject_type,
+                                   SerdType          subject_type,
                                    const SerdString* predicate,
-                                   SerdNodeType      predicate_type,
+                                   SerdType          predicate_type,
                                    const SerdString* object,
-                                   SerdNodeType      object_type,
+                                   SerdType          object_type,
                                    const SerdString* object_datatype,
                                    const SerdString* object_lang)
 {
@@ -359,11 +359,11 @@ bool
 serd_writer_write_statement_flat(SerdWriter        writer,
                                  const SerdString* graph,
                                  const SerdString* subject,
-                                 SerdNodeType      subject_type,
+                                 SerdType          subject_type,
                                  const SerdString* predicate,
-                                 SerdNodeType      predicate_type,
+                                 SerdType          predicate_type,
                                  const SerdString* object,
-                                 SerdNodeType      object_type,
+                                 SerdType          object_type,
                                  const SerdString* object_datatype,
                                  const SerdString* object_lang)
 {