aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-05-27 15:32:12 +0200
committerDavid Robillard <d@drobilla.net>2018-11-25 22:12:47 +0100
commitd6f1e256ad3fc59160f5cf60820572cc8b83ec7c (patch)
tree399ac0acb5198b7068c7765ccc90b6667d4d7e4a
parent3401e9c9b4d317c5b38e9f4aa48ce016871c9e99 (diff)
downloadserd-d6f1e256ad3fc59160f5cf60820572cc8b83ec7c.tar.gz
serd-d6f1e256ad3fc59160f5cf60820572cc8b83ec7c.tar.bz2
serd-d6f1e256ad3fc59160f5cf60820572cc8b83ec7c.zip
Move syntax name/extension utilities to public API
-rw-r--r--serd/serd.h36
-rw-r--r--src/serdi.c53
-rw-r--r--src/syntax.c64
-rw-r--r--wscript1
4 files changed, 106 insertions, 48 deletions
diff --git a/serd/serd.h b/serd/serd.h
index 4a6ac7a9..139578c0 100644
--- a/serd/serd.h
+++ b/serd/serd.h
@@ -407,6 +407,42 @@ typedef size_t (*SerdWriteFunc)(const void* buf,
/**
@}
+ @name 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_API
+SerdSyntax
+serd_syntax_by_name(const char* 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_API
+SerdSyntax
+serd_guess_syntax(const char* filename);
+
+/**
+ 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_API
+bool
+serd_syntax_has_graphs(SerdSyntax syntax);
+
+/**
+ @}
@name URI
@{
*/
diff --git a/src/serdi.c b/src/serdi.c
index 45bfc5e7..a7fb802d 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"
@@ -29,46 +28,6 @@
#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 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)
{
@@ -168,7 +127,7 @@ main(int argc, char** argv)
} else if (argv[a][1] == 'i') {
if (++a == argc) {
return missing_arg(argv[0], 'i');
- } else if (!(input_syntax = get_syntax(argv[a]))) {
+ } else if (!(input_syntax = serd_syntax_by_name(argv[a]))) {
return print_usage(argv[0], true);
}
} else if (argv[a][1] == 'k') {
@@ -183,7 +142,7 @@ main(int argc, char** argv)
} else if (argv[a][1] == 'o') {
if (++a == argc) {
return missing_arg(argv[0], 'o');
- } else if (!(output_syntax = get_syntax(argv[a]))) {
+ } else if (!(output_syntax = serd_syntax_by_name(argv[a]))) {
return print_usage(argv[0], true);
}
} else if (argv[a][1] == 'p') {
@@ -214,15 +173,13 @@ main(int argc, char** argv)
const char* input = (const char*)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;
}
SerdNode* base = NULL;
diff --git a/src/syntax.c b/src/syntax.c
new file mode 100644
index 00000000..abf75817
--- /dev/null
+++ b/src/syntax.c
@@ -0,0 +1,64 @@
+/*
+ Copyright 2011-2018 David Robillard <http://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"
+
+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}
+};
+
+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;
+}
diff --git a/wscript b/wscript
index 34480677..a1c42a33 100644
--- a/wscript
+++ b/wscript
@@ -81,6 +81,7 @@ lib_source = ['src/base64.c',
'src/node.c',
'src/reader.c',
'src/string.c',
+ 'src/syntax.c',
'src/system.c',
'src/uri.c',
'src/world.c',