Added macro

diff --git a/include/siri/grammar/gramp.h b/include/siri/grammar/gramp.h
index 439ccb10665f7616933ee6ae059679cfe4dccdb7..705d49d987cfb03aec038a47ae7c25d947a36fe2 100644 (file)
--- 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 723c1144f0be21547c6bf1d3ece4275c7925e948..e56948afdb80ebf7001d8e5bf14ae125fb14b9ad 100644 (file)
--- 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 3077c8fa939805a7587ac110a42887ce784203ae..3f9f7a0ae2cbc34d8d592524d533c1d945998985 100644 (file)
--- 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 9f052bbcfd9457272ff4a707f59717c539710e20..bc8991af0de02d3d631bcc9be11b98973f3ea868 100644 (file)
--- 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);