From 66a03eb67c1a99d70b91a20d878513f68a533b65 Mon Sep 17 00:00:00 2001
From: Jeroen van der Heijden <jeroen@cesbit.com>
Date: Thu, 10 Mar 2022 14:19:33 +0100
Subject: [PATCH] Added macro

---
 include/siri/grammar/gramp.h     | 6 +++++-
 include/siri/version.h           | 4 ++--
 src/siri/db/query.c              | 2 +-
 test/test_grammar/test_grammar.c | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h
index 439ccb10..705d49d9 100644
--- a/include/siri/grammar/gramp.h
+++ b/include/siri/grammar/gramp.h
@@ -32,7 +32,11 @@ typedef struct cleri_node_s cleri_children_t;
 #define cleri_gn(__child) (__child)->node
 #endif
 
-
+#if CLERI_VERSION_MAJOR >= 1 || CLERI_VERSION_MINOR >= 11
+#define cleri_parse_m(__g, __q) cleri_parse2(__g, __q, 0)
+#else
+#define cleri_parse_m(__g, __q) cleri_parse(__g, __q)
+#endif
 
 #if CLERI_VERSION_MAJOR >= 1 || CLERI_VERSION_MINOR >= 12
 #if SIRIDB_IS64BIT
diff --git a/include/siri/version.h b/include/siri/version.h
index 723c1144..e56948af 100644
--- a/include/siri/version.h
+++ b/include/siri/version.h
@@ -6,7 +6,7 @@
 
 #define SIRIDB_VERSION_MAJOR 2
 #define SIRIDB_VERSION_MINOR 0
-#define SIRIDB_VERSION_PATCH 46
+#define SIRIDB_VERSION_PATCH 47
 
 /*
  * Use SIRIDB_VERSION_PRE_RELEASE for alpha release versions.
@@ -15,7 +15,7 @@
  * Note that debian alpha packages should use versions like this:
  *   2.0.34-0alpha0
  */
-#define SIRIDB_VERSION_PRE_RELEASE ""
+#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0"
 
 #ifndef NDEBUG
 #define SIRIDB_VERSION_BUILD_RELEASE "+debug"
diff --git a/src/siri/db/query.c b/src/siri/db/query.c
index 3077c8fa..3f9f7a0a 100644
--- a/src/siri/db/query.c
+++ b/src/siri/db/query.c
@@ -593,7 +593,7 @@ static void QUERY_parse(uv_async_t * handle)
             &query->flags);
 
     if (    walker == NULL ||
-            (query->pr = cleri_parse(siri.grammar, query->q)) == NULL)
+            (query->pr = cleri_parse_m(siri.grammar, query->q)) == NULL)
     {
         if (walker != NULL)
         {
diff --git a/test/test_grammar/test_grammar.c b/test/test_grammar/test_grammar.c
index 9f052bbc..bc8991af 100644
--- a/test/test_grammar/test_grammar.c
+++ b/test/test_grammar/test_grammar.c
@@ -7,7 +7,7 @@
 
 static int _is_valid(cleri_grammar_t * grammar, char * query)
 {
-    cleri_parse_t * pr = cleri_parse(grammar, query);
+    cleri_parse_t * pr = cleri_parse_m(grammar, query);
     _assert (pr);
     int is_valid = pr->is_valid;
     cleri_parse_free(pr);
-- 
2.30.2