Make a raptor_statement into a 3-tuple of raptor_term.

This is a short term stage before merging raptor_term with
raptor_identifier and getting rid of raptor_triple (in N3 and Turtle
parsers).  Also want to make the 3 raptor_terms in raptor_statement
as object references not statics, and add a graph term.
raptor_identifier_type should be raptor_term_type and have less
values: kill ordinal and predicate types.

Lots of structure name field changes everywhere statement is used.

1 files changed, 53 insertions, 53 deletions

diff --git a/utils/rdfdiff.c b/utils/rdfdiff.c
index 9859c211..f5d5e9cc 100644
--- a/utils/rdfdiff.c
+++ b/utils/rdfdiff.c
@@ -310,134 +310,134 @@ rdfdiff_statement_equals(raptor_world *world, const raptor_statement *s1, const
   raptor_print_statement(s2, stderr);
 #endif
 
-  if(s1->subject_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL &&
-     s2->subject_type == RAPTOR_IDENTIFIER_TYPE_RESOURCE) {
+  if(s1->subject.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL &&
+     s2->subject.type == RAPTOR_IDENTIFIER_TYPE_RESOURCE) {
 
     /* check for ordinal/resource equivalence */
     if(!rdfdiff_ordinal_equals_resource(world,
-                                        *(int *)s1->subject, 
-                                        (raptor_uri *)s2->subject)) {
+                                        *(int *)s1->subject.value,
+                                        (raptor_uri *)s2->subject.value)) {
       rv = 0;
       goto done;
     }
     
-  } else if(s1->subject_type == RAPTOR_IDENTIFIER_TYPE_RESOURCE &&
-            s2->subject_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
+  } else if(s1->subject.type == RAPTOR_IDENTIFIER_TYPE_RESOURCE &&
+            s2->subject.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
 
     /* check for ordinal/resource equivalence */
     if(!rdfdiff_ordinal_equals_resource(world,
-                                        *(int *)s2->subject,
-                                        (raptor_uri *)s1->subject)) {
+                                        *(int *)s2->subject.value,
+                                        (raptor_uri *)s1->subject.value)) {
       rv = 0;
       goto done;
     }
       
   } else {
     /* normal comparison */
-    if(s1->subject_type != s2->subject_type) {
+    if(s1->subject.type != s2->subject.type) {
       rv = 0;
       goto done;
     }
 
-    if(s1->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+    if(s1->subject.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
       /* Here for completeness. Anonymous nodes are taken care of
        * elsewhere */
-      /*if(strcmp((const char *)s1->subject, (const char *)s2->subject) != 0)
+      /*if(strcmp((const char *)s1->subject, (const char *)s2->subject.value) != 0)
         return 0;*/
     } else {
       if(!raptor_uri_equals_v2(world,
-                               (raptor_uri *)s1->subject,
-                               (raptor_uri *)s2->subject)) {
+                               (raptor_uri *)s1->subject.value,
+                               (raptor_uri *)s2->subject.value)) {
         rv = 0;
         goto done;
       }
     }
   }
 
-  if(s1->predicate_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL &&
-     s2->predicate_type == RAPTOR_IDENTIFIER_TYPE_PREDICATE) {
+  if(s1->predicate.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL &&
+     s2->predicate.type == RAPTOR_IDENTIFIER_TYPE_PREDICATE) {
 
     /* check for ordinal/resource equivalence */
     if(!rdfdiff_ordinal_equals_resource(world,
-                                        *(int *)s1->predicate, 
-                                        (raptor_uri *)s2->predicate)) {
+                                        *(int *)s1->predicate.value, 
+                                        (raptor_uri *)s2->predicate.value)) {
       rv = 0;
       goto done;
     }
 
-  } else if(s1->predicate_type == RAPTOR_IDENTIFIER_TYPE_PREDICATE &&
-            s2->predicate_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
+  } else if(s1->predicate.type == RAPTOR_IDENTIFIER_TYPE_PREDICATE &&
+            s2->predicate.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
 
     /* check for ordinal/resource equivalence */
     if(!rdfdiff_ordinal_equals_resource(world,
-                                        *(int *)s2->predicate,
-                                        (raptor_uri *)s1->predicate)) {
+                                        *(int *)s2->predicate.value,
+                                        (raptor_uri *)s1->predicate.value)) {
       rv = 0;
       goto done;
     }
       
   } else {
     
-    if(s1->predicate_type != s2->predicate_type) {
+    if(s1->predicate.type != s2->predicate.type) {
       rv = 0;
       goto done;
     }
   
-    if(s1->predicate_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
-      if(*(int *)s1->predicate != *(int *)s2->predicate) {
+    if(s1->predicate.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
+      if(*(int *)s1->predicate.value != *(int *)s2->predicate.value) {
         rv = 0;
         goto done;
       }
     } else {
       if(!raptor_uri_equals_v2(world,
-                               (raptor_uri *)s1->predicate,
-                               (raptor_uri *)s2->predicate)) {
+                               (raptor_uri *)s1->predicate.value,
+                               (raptor_uri *)s2->predicate.value)) {
         rv = 0;
         goto done;
       }
     }
   }
   
-  if(s1->object_type != s2->object_type) {
+  if(s1->object.type != s2->object.type) {
     rv = 0;
     goto done;
   }
   
-  if(s1->object_type == RAPTOR_IDENTIFIER_TYPE_LITERAL || 
-     s1->object_type == RAPTOR_IDENTIFIER_TYPE_XML_LITERAL) {
+  if(s1->object.type == RAPTOR_IDENTIFIER_TYPE_LITERAL || 
+     s1->object.type == RAPTOR_IDENTIFIER_TYPE_XML_LITERAL) {
     int equal;
     
-    equal=!safe_strcmp((char *)s1->object, (char *)s2->object);
+    equal=!safe_strcmp((char *)s1->object.value, (char *)s2->object.value);
 
     if(equal) {
-      if(s1->object_literal_language && s2->object_literal_language)
-        equal=!strcmp((char *)s1->object_literal_language,
-                      (char *)s2->object_literal_language);
-      else if(s1->object_literal_language || s2->object_literal_language)
+      if(s1->object.literal_language && s2->object.literal_language)
+        equal=!strcmp((char *)s1->object.literal_language,
+                      (char *)s2->object.literal_language);
+      else if(s1->object.literal_language || s2->object.literal_language)
         equal = 0;
       else
         equal = 1;
 
       if(equal)
         equal = raptor_uri_equals_v2(world,
-                                   s1->object_literal_datatype, 
-                                   s2->object_literal_datatype);
+                                     s1->object.literal_datatype, 
+                                     s2->object.literal_datatype);
     }
 
     rv = equal;
     goto done;
-  } else if(s1->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+  } else if(s1->object.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
     /* Here for completeness. Anonymous nodes are taken care of
      * elsewhere */
-    /* if(strcmp((const char *)s1->object, (const char *)s2->object) != 0)
+    /* if(strcmp((const char *)s1->object, (const char *)s2->object.value) != 0)
        return 0; */
-  } else if(s1->object_type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
-    if(*(int *)s1->object != *(int *)s2->object) {
+  } else if(s1->object.type == RAPTOR_IDENTIFIER_TYPE_ORDINAL) {
+    if(*(int *)s1->object.value != *(int *)s2->object.value) {
       rv = 0;
       goto done;
     }
   } else {
-    if(!raptor_uri_equals_v2(world, (raptor_uri *)s1->object, (raptor_uri *)s2->object))
+    if(!raptor_uri_equals_v2(world, (raptor_uri *)s1->object.value, (raptor_uri *)s2->object.value))
       rv = 0;
   }
 
@@ -466,15 +466,15 @@ rdfdiff_blank_equals(const rdfdiff_blank *b1, const rdfdiff_blank *b2,
     equal = 1;
   } else if(b1->owner == NULL || b2->owner == NULL) {
     equal = 0;
-  } else if(b1->owner->subject_type != RAPTOR_IDENTIFIER_TYPE_ANONYMOUS &&
-            b2->owner->subject_type != RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+  } else if(b1->owner->subject.type != RAPTOR_IDENTIFIER_TYPE_ANONYMOUS &&
+            b2->owner->subject.type != RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
     /* Neither are anonymous. Normal comparison. This will return
      * false if both the subject and the predicates don't match. We
      * know the objects are blank nodes. */
     equal = rdfdiff_statement_equals(b1->world, b1->owner, b2->owner);
     
-  } else if(b1->owner->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS &&
-            b2->owner->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+  } else if(b1->owner->subject.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS &&
+            b2->owner->subject.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
     rdfdiff_blank *p1;
     rdfdiff_blank *p2;
 
@@ -489,8 +489,8 @@ rdfdiff_blank_equals(const rdfdiff_blank *b1, const rdfdiff_blank *b2,
     raptor_print_statement(b2->owner, stderr);
     fprintf(stderr, "\n");
 #endif    
-    p1 = rdfdiff_find_blank(b1_file->first_blank, (char *)b1->owner->subject);
-    p2 = rdfdiff_find_blank(b2_file->first_blank, (char *)b2->owner->subject);
+    p1 = rdfdiff_find_blank(b1_file->first_blank, (char *)b1->owner->subject.value);
+    p2 = rdfdiff_find_blank(b2_file->first_blank, (char *)b2->owner->subject.value);
     equal = rdfdiff_blank_equals(p1, p2, b1_file, b2_file);
   } else {
     equal = 0;
@@ -617,7 +617,7 @@ rdfdiff_add_blank_statement(rdfdiff_file* file,
   rdfdiff_blank *blank;
   rdfdiff_link *dlink;
 
-  blank = rdfdiff_lookup_blank(file, (char *)statement->subject);
+  blank = rdfdiff_lookup_blank(file, (char *)statement->subject.value);
   if(!blank)
     goto failed;
 
@@ -654,7 +654,7 @@ rdfdiff_add_blank_statement_owner(rdfdiff_file* file,
 {
   rdfdiff_blank *blank;
 
-  blank = rdfdiff_lookup_blank(file, (char *)statement->object);
+  blank = rdfdiff_lookup_blank(file, (char *)statement->object.value);
   if(!blank)
     goto failed;
   
@@ -756,13 +756,13 @@ rdfdiff_collect_statements(void *user_data, const raptor_statement *statement)
   
   file->statement_count++;
 
-  if(statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS ||
-      statement->object_type  == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
+  if(statement->subject.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS ||
+      statement->object.type  == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS) {
 
-    if(statement->subject_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS)
+    if(statement->subject.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS)
       rv = rdfdiff_add_blank_statement(file, statement);
 
-    if(rv == 0 && statement->object_type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS)
+    if(rv == 0 && statement->object.type == RAPTOR_IDENTIFIER_TYPE_ANONYMOUS)
       rv = rdfdiff_add_blank_statement_owner(file, statement);
 
   } else {