summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-13 15:47:32 +0000
committerDavid Robillard <d@drobilla.net>2011-05-13 15:47:32 +0000
commitc99d1b4e0037d2add04310b8b72aa9242e89f570 (patch)
treef8f9c995cfa3f4e49df5f82a2fe600f0f819c1f9
parent78f77da4ceeddd757cb971315f185a163c5b456d (diff)
downloadsord-c99d1b4e0037d2add04310b8b72aa9242e89f570.tar.gz
sord-c99d1b4e0037d2add04310b8b72aa9242e89f570.tar.bz2
sord-c99d1b4e0037d2add04310b8b72aa9242e89f570.zip
Tidy.
git-svn-id: http://svn.drobilla.net/sord/trunk@114 3d64ff67-21c5-427c-a301-fe4f08042e5a
-rw-r--r--src/sord.c61
-rw-r--r--src/sord_test.c3
-rw-r--r--src/sordi.c25
3 files changed, 37 insertions, 52 deletions
diff --git a/src/sord.c b/src/sord.c
index 1189c7e..fdd7b84 100644
--- a/src/sord.c
+++ b/src/sord.c
@@ -88,9 +88,10 @@ static const char* const order_names[NUM_ORDERS] = {
"gspo", "gsop", "gops", "gosp", "gpso", "gpos"
};
-/** Quads of indices for each order, from most to least significant
- * (array indexed by SordOrder)
- */
+/**
+ Quads of indices for each order, from most to least significant
+ (array indexed by SordOrder)
+*/
static const int orderings[NUM_ORDERS][TUP_LEN] = {
{ 0,1,2,3}, { 0,2,1,3}, { 2,1,0,3}, { 2,0,1,3}, { 1,0,2,3}, { 1,2,0,3},
{3,0,1,2 }, {3,0,2,1 }, {3,2,1,0 }, {3,2,0,1 }, {3,1,0,2 }, {3,1,2,0 }
@@ -245,10 +246,11 @@ sord_quad_match(const SordQuad x, const SordQuad y)
return sord_quad_match_inline(x, y);
}
-/** Compare two quad IDs lexicographically.
- * NULL IDs (equal to 0) are treated as wildcards, always less than every
- * other possible ID, except itself.
- */
+/**
+ Compare two quad IDs lexicographically.
+ NULL IDs (equal to 0) are treated as wildcards, always less than every
+ other possible ID, except itself.
+*/
static int
sord_quad_compare(const void* x_ptr, const void* y_ptr, void* user_data)
{
@@ -287,9 +289,10 @@ sord_iter_forward(SordIter* iter)
assert(false);
}
-/** Seek forward as necessary until @a iter points at a match.
- * @return true iff iterator reached end of valid range.
- */
+/**
+ Seek forward as necessary until @a iter points at a match.
+ @return true iff iterator reached end of valid range.
+*/
static inline bool
sord_iter_seek_match(SordIter* iter)
{
@@ -303,10 +306,11 @@ sord_iter_seek_match(SordIter* iter)
return true;
}
-/** Seek forward as necessary until @a iter points at a match, or the prefix
- * no longer matches iter->pat.
- * @return true iff iterator reached end of valid range.
- */
+/**
+ Seek forward as necessary until @a iter points at a match, or the prefix
+ no longer matches iter->pat.
+ @return true iff iterator reached end of valid range.
+*/
static inline bool
sord_iter_seek_match_range(SordIter* iter)
{
@@ -461,10 +465,11 @@ sord_iter_free(SordIter* iter)
}
}
-/** Return true iff @a sord has an index for @a order.
- * If @a graph_search is true, @a order will be modified to be the
- * corresponding order with a G prepended (so G will be the MSN).
- */
+/**
+ Return true iff @a sord has an index for @a order.
+ If @a graph_search is true, @a order will be modified to be the
+ corresponding order with a G prepended (so G will be the MSN).
+*/
static inline bool
sord_has_index(SordModel* sord, SordOrder* order, int* n_prefix, bool graph_search)
{
@@ -476,12 +481,13 @@ sord_has_index(SordModel* sord, SordOrder* order, int* n_prefix, bool graph_sear
return sord->indices[*order];
}
-/** Return the best available index for a pattern.
- * @param pat Pattern in standard (S P O G) order
- * @param mode Set to the (best) iteration mode for iterating over results
- * @param n_prefix Set to the length of the range prefix
- * (for @a mode == RANGE and @a mode == FILTER_RANGE)
- */
+/**
+ Return the best available index for a pattern.
+ @param pat Pattern in standard (S P O G) order
+ @param mode Set to the (best) iteration mode for iterating over results
+ @param n_prefix Set to the length of the range prefix
+ (for @a mode == RANGE and @a mode == FILTER_RANGE)
+*/
static inline SordOrder
sord_best_index(SordModel* sord, const SordQuad pat, SearchMode* mode, int* n_prefix)
{
@@ -744,9 +750,10 @@ sord_find(SordModel* sord, const SordQuad pat)
TUP_FMT_ARGS(pat), order_names[index_order], mode, prefix_len,
ordering[0], ordering[1], ordering[2], ordering[3]);
- // It's easiest to think about this algorithm in terms of (S P O) ordering,
- // assuming (A B C) == (S P O). For other orderings this is not actually
- // the case, but it works the same way.
+ /* It's easiest to think about this algorithm in terms of (S P O) ordering,
+ assuming (A B C) == (S P O). For other orderings this is not actually
+ the case, but it works the same way.
+ */
const SordNode* a = pat[ordering[0]]; // Most Significant Node (MSN)
const SordNode* b = pat[ordering[1]]; // ...
const SordNode* c = pat[ordering[2]]; // ...
diff --git a/src/sord_test.c b/src/sord_test.c
index 90e29dd..cb36ece 100644
--- a/src/sord_test.c
+++ b/src/sord_test.c
@@ -128,7 +128,8 @@ generate(SordWorld* world, SordModel* sord, size_t n_quads, size_t n_objects_per
((t)[2] ? sord_node_get_string((t)[2]) : USTR("*"))
int
-test_read(SordWorld* world, SordModel* sord, const size_t n_quads, const int n_objects_per)
+test_read(SordWorld* world, SordModel* sord,
+ const size_t n_quads, const int n_objects_per)
{
int ret = EXIT_SUCCESS;
diff --git a/src/sordi.c b/src/sordi.c
index 493e4d1..ad1329c 100644
--- a/src/sordi.c
+++ b/src/sordi.c
@@ -35,7 +35,7 @@ print_version()
{
printf("sordi " SORD_VERSION " <http://drobilla.net/software/sord>\n");
printf("Copyright 2011 David Robillard <http://drobilla.net>.\n"
- "\nLicense: Simplified BSD License.\n"
+ "License: <http://www.opensource.org/licenses/isc-license>\n"
"This is free software; you are free to change and redistribute it."
"\nThere is NO WARRANTY, to the extent permitted by law.\n");
return 0;
@@ -60,29 +60,6 @@ file_sink(const void* buf, size_t len, void* stream)
return fwrite(buf, 1, len, file);
}
-static inline SerdNode
-serd_node_from_sord_node(const SordNode* n)
-{
- size_t n_bytes = 0;
- const uint8_t* buf = sord_node_get_string_counted(n, &n_bytes);
- SerdNode sn = {
- (const uint8_t*)buf, n_bytes, n_bytes - 1, sord_node_get_flags(n), SERD_NOTHING
- };
- // FIXME: UTF-8
- switch (sord_node_get_type(n)) {
- case SORD_URI:
- sn.type = SERD_URI;
- break;
- case SORD_BLANK:
- sn.type = SERD_BLANK_ID;
- break;
- case SORD_LITERAL:
- sn.type = SERD_LITERAL;
- break;
- }
- return sn;
-}
-
int
main(int argc, char** argv)
{