Cache commonly used nodes in the world

1 files changed, 8 insertions, 10 deletions

diff --git a/src/writer.c b/src/writer.c
index eb9d79ea..14793112 100644
--- a/src/writer.c
+++ b/src/writer.c
@@ -16,7 +16,6 @@
 
 #include "env.h"
 #include "node.h"
-#include "serd_internal.h"
 #include "sink.h"
 #include "stack.h"
 #include "string_utils.h"
@@ -439,13 +438,11 @@ write_literal(SerdWriter*        writer,
 	const char*     node_str = serd_node_string(node);
 	const char*     type_uri = serd_node_string(datatype);
 	if (supports_abbrev(writer) && type_uri) {
-		if (!strncmp(type_uri, NS_XSD, sizeof(NS_XSD) - 1) && (
-			    !strcmp(type_uri + sizeof(NS_XSD) - 1, "boolean") ||
-			    !strcmp(type_uri + sizeof(NS_XSD) - 1, "integer"))) {
+		if (serd_node_equals(datatype, writer->world->xsd_boolean) ||
+		    serd_node_equals(datatype, writer->world->xsd_integer)) {
 			sink(node_str, node->n_bytes, writer);
 			return true;
-		} else if (!strncmp(type_uri, NS_XSD, sizeof(NS_XSD) - 1) &&
-		           !strcmp(type_uri + sizeof(NS_XSD) - 1, "decimal") &&
+		} else if (serd_node_equals(datatype, writer->world->xsd_decimal) &&
 		           strchr(node_str, '.') &&
 		           node_str[node->n_bytes - 1] != '.') {
 			/* xsd:decimal literals without trailing digits, e.g. "5.", can
@@ -508,9 +505,10 @@ write_uri_node(SerdWriter* const        writer,
 	const char* node_str   = serd_node_string(node);
 	const bool  has_scheme = serd_uri_string_has_scheme(node_str);
 	if (field == SERD_PREDICATE && supports_abbrev(writer)
-	    && !strcmp(node_str, NS_RDF "type")) {
+	    && serd_node_equals(node, writer->world->rdf_type)) {
 		return sink("a", 1, writer) == 1;
-	} else if (supports_abbrev(writer) && !strcmp(node_str, NS_RDF "nil")) {
+	} else if (supports_abbrev(writer) &&
+	           serd_node_equals(node, writer->world->rdf_nil)) {
 		return sink("()", 2, writer) == 2;
 	} else if (has_scheme && supports_abbrev(writer) &&
 	           !(writer->style & SERD_STYLE_UNQUALIFIED) &&
@@ -679,11 +677,11 @@ write_list_obj(SerdWriter*        writer,
                const SerdNode*    predicate,
                const SerdNode*    object)
 {
-	if (!strcmp(serd_node_string(object), NS_RDF "nil")) {
+	if (serd_node_equals(object, writer->world->rdf_nil)) {
 		--writer->indent;
 		write_sep(writer, SEP_LIST_END);
 		return true;
-	} else if (!strcmp(serd_node_string(predicate), NS_RDF "first")) {
+	} else if (serd_node_equals(predicate, writer->world->rdf_first)) {
 		write_sep(writer, SEP_LIST_SEP);
 		write_node(writer, object, SERD_OBJECT, flags);
 	}