[WIP] Remove SERD_CURIE node datatype entirely

1 files changed, 6 insertions, 4 deletions

diff --git a/src/read_turtle.c b/src/read_turtle.c
index fa7b9731..042393e0 100644
--- a/src/read_turtle.c
+++ b/src/read_turtle.c
@@ -513,7 +513,7 @@ read_turtle_iri(SerdReader* const reader,
     return read_IRIREF(reader, dest);
   }
 
-  if (!(*dest = push_node(reader, SERD_CURIE, "", 0))) {
+  if (!(*dest = push_node(reader, SERD_LITERAL, "", 0))) {
     return SERD_BAD_STACK;
   }
 
@@ -567,7 +567,7 @@ read_verb(SerdReader* reader, SerdNode** const dest)
   /* Either a qname, or "a".  Read the prefix first, and if it is in fact
      "a", produce that instead.
   */
-  if (!(*dest = push_node(reader, SERD_CURIE, "", 0))) {
+  if (!(*dest = push_node(reader, SERD_URI, "", 0))) {
     return SERD_BAD_STACK;
   }
 
@@ -671,7 +671,7 @@ read_named_object(SerdReader* const reader,
      Deal with this here by trying to read a prefixed node, then if it turns
      out to actually be "true" or "false", switch it to a boolean literal. */
 
-  if (!(*dest = push_node(reader, SERD_CURIE, "", 0))) {
+  if (!(*dest = push_node(reader, SERD_URI, "", 0))) {
     return SERD_BAD_STACK;
   }
 
@@ -935,7 +935,9 @@ read_turtle_subject(SerdReader* const reader,
     st = read_BLANK_NODE_LABEL(reader, dest, &ate_dot);
     break;
   default:
-    TRY(st, read_turtle_iri(reader, dest, &ate_dot));
+    if ((st = read_turtle_iri(reader, dest, &ate_dot))) {
+      return r_err(reader, st, "expected subject");
+    }
   }
 
   if (ate_dot) {