Move syntax name/extension utilities to public API

4 files changed, 110 insertions, 51 deletions

diff --git a/include/serd/serd.h b/include/serd/serd.h
index 63d094ef..375a8c5d 100644
--- a/include/serd/serd.h
+++ b/include/serd/serd.h
@@ -23,6 +23,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <string.h>
 
 #if defined(_WIN32) && !defined(SERD_STATIC) && defined(SERD_INTERNAL)
 #  define SERD_API __declspec(dllexport)
@@ -393,6 +394,41 @@ typedef size_t (*SerdWriteFunc)(const void* SERD_NONNULL buf,
 
 /**
    @}
+   @defgroup serd_syntax Syntax Utilities
+   @{
+*/
+
+/**
+   Get a syntax by name.
+
+   Case-insensitive, supports "Turtle", "NTriples", "NQuads", and "TriG".  Zero
+   is returned if the name is not recognized.
+*/
+SERD_PURE_API
+SerdSyntax
+serd_syntax_by_name(const char* SERD_NONNULL name);
+
+/**
+   Guess a syntax from a filename.
+
+   This uses the file extension to guess the syntax of a file.  Zero is
+   returned if the extension is not recognized.
+*/
+SERD_PURE_API
+SerdSyntax
+serd_guess_syntax(const char* SERD_NONNULL filename);
+
+/**
+   Return whether a syntax can represent multiple graphs.
+
+   @return True for SERD_NQUADS and SERD_TRIG, false otherwise.
+*/
+SERD_CONST_API
+bool
+serd_syntax_has_graphs(SerdSyntax syntax);
+
+/**
+   @}
    @defgroup serd_uri URI
    @{
 */
diff --git a/meson.build b/meson.build
index a59ff31d..13e7ec3b 100644
--- a/meson.build
+++ b/meson.build
@@ -98,6 +98,7 @@ sources = [
   'src/reader.c',
   'src/sink.c',
   'src/string.c',
+  'src/syntax.c',
   'src/system.c',
   'src/uri.c',
   'src/writer.c',
diff --git a/src/serdi.c b/src/serdi.c
index d2828ea2..628ae004 100644
--- a/src/serdi.c
+++ b/src/serdi.c
@@ -15,7 +15,6 @@
 */
 
 #include "serd_config.h"
-#include "string_utils.h"
 #include "system.h"
 
 #include "serd/serd.h"
@@ -32,52 +31,10 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #define SERDI_ERROR(msg) fprintf(stderr, "serdi: " msg)
 #define SERDI_ERRORF(fmt, ...) fprintf(stderr, "serdi: " fmt, __VA_ARGS__)
 
-typedef struct {
-  SerdSyntax  syntax;
-  const char* name;
-  const char* extension;
-} Syntax;
-
-static const Syntax syntaxes[] = {{SERD_TURTLE, "turtle", ".ttl"},
-                                  {SERD_NTRIPLES, "ntriples", ".nt"},
-                                  {SERD_NQUADS, "nquads", ".nq"},
-                                  {SERD_TRIG, "trig", ".trig"},
-                                  {(SerdSyntax)0, NULL, NULL}};
-
-static SerdSyntax
-get_syntax(const char* name)
-{
-  for (const Syntax* s = syntaxes; s->name; ++s) {
-    if (!serd_strncasecmp(s->name, name, strlen(name))) {
-      return s->syntax;
-    }
-  }
-
-  SERDI_ERRORF("unknown syntax `%s'\n", name);
-  return (SerdSyntax)0;
-}
-
-static SERD_PURE_FUNC
-SerdSyntax
-guess_syntax(const char* filename)
-{
-  const char* ext = strrchr(filename, '.');
-  if (ext) {
-    for (const Syntax* s = syntaxes; s->name; ++s) {
-      if (!serd_strncasecmp(s->extension, ext, strlen(ext))) {
-        return s->syntax;
-      }
-    }
-  }
-
-  return (SerdSyntax)0;
-}
-
 static int
 print_version(void)
 {
@@ -213,7 +170,7 @@ main(int argc, char** argv)
         return missing_arg(argv[0], 'i');
       }
 
-      if (!(input_syntax = get_syntax(argv[a]))) {
+      if (!(input_syntax = serd_syntax_by_name(argv[a]))) {
         return print_usage(argv[0], true);
       }
     } else if (argv[a][1] == 'k') {
@@ -232,7 +189,7 @@ main(int argc, char** argv)
         return missing_arg(argv[0], 'o');
       }
 
-      if (!(output_syntax = get_syntax(argv[a]))) {
+      if (!(output_syntax = serd_syntax_by_name(argv[a]))) {
         return print_usage(argv[0], true);
       }
     } else if (argv[a][1] == 'p') {
@@ -271,15 +228,13 @@ main(int argc, char** argv)
 
   const char* input = argv[a++];
 
-  if (!input_syntax && !(input_syntax = guess_syntax(input))) {
+  if (!input_syntax && !(input_syntax = serd_guess_syntax(input))) {
     input_syntax = SERD_TRIG;
   }
 
+  const bool input_has_graphs = serd_syntax_has_graphs(input_syntax);
   if (!output_syntax) {
-    output_syntax =
-      ((input_syntax == SERD_TURTLE || input_syntax == SERD_NTRIPLES)
-         ? SERD_NTRIPLES
-         : SERD_NQUADS);
+    output_syntax = input_has_graphs ? SERD_NQUADS : SERD_NTRIPLES;
   }
 
   const SerdWriterFlags writer_flags =
@@ -287,7 +242,7 @@ main(int argc, char** argv)
 
   SerdNode* base = NULL;
   if (a < argc) { // Base URI given on command line
-    base = serd_new_uri(SERD_MEASURE_STRING((const char*)argv[a]));
+    base = serd_new_uri(SERD_MEASURE_STRING(argv[a]));
   } else if (!from_string && !from_stdin) { // Use input file URI
     base = serd_new_file_uri(SERD_MEASURE_STRING(input), SERD_EMPTY_STRING());
   }
diff --git a/src/syntax.c b/src/syntax.c
new file mode 100644
index 00000000..61814709
--- /dev/null
+++ b/src/syntax.c
@@ -0,0 +1,67 @@
+/*
+  Copyright 2011-2020 David Robillard <d@drobilla.net>
+
+  Permission to use, copy, modify, and/or distribute this software for any
+  purpose with or without fee is hereby granted, provided that the above
+  copyright notice and this permission notice appear in all copies.
+
+  THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+
+#include "string_utils.h"
+
+#include "serd/serd.h"
+
+#include <stdbool.h>
+#include <string.h>
+
+typedef struct {
+  const char* name;
+  const char* extension;
+  SerdSyntax  syntax;
+} Syntax;
+
+static const Syntax syntaxes[] = {
+  {"turtle", ".ttl", SERD_TURTLE},
+  {"ntriples", ".nt", SERD_NTRIPLES},
+  {"nquads", ".nq", SERD_NQUADS},
+  {"trig", ".trig", SERD_TRIG},
+  {NULL, NULL, (SerdSyntax)0},
+};
+
+SerdSyntax
+serd_syntax_by_name(const char* const name)
+{
+  for (const Syntax* s = syntaxes; s->name; ++s) {
+    if (!serd_strncasecmp(s->name, name, strlen(name))) {
+      return s->syntax;
+    }
+  }
+  return (SerdSyntax)0;
+}
+
+SerdSyntax
+serd_guess_syntax(const char* const filename)
+{
+  const char* ext = strrchr(filename, '.');
+  if (ext) {
+    for (const Syntax* s = syntaxes; s->name; ++s) {
+      if (!serd_strncasecmp(s->extension, ext, strlen(ext))) {
+        return s->syntax;
+      }
+    }
+  }
+  return (SerdSyntax)0;
+}
+
+bool
+serd_syntax_has_graphs(const SerdSyntax syntax)
+{
+  return syntax == SERD_NQUADS || syntax == SERD_TRIG;
+}