require arg

diff --git a/grammar/grammar.py b/grammar/grammar.py
index 8107db5331db36d47de75abb70eb1107a6c2f8cf..8a7b4c5a7bdeb587aac4adec6bb530b53b8c10f7 100644 (file)
--- a/grammar/grammar.py
+++ b/grammar/grammar.py
@@ -530,7 +530,7 @@ class SiriGrammar(Grammar):
         '(', Optional(time_expr), ')')
     f_offset = Sequence(
         k_offset,
-        '(', Optional(time_expr), ')')
+        '(', time_expr, ')')
     f_timeval = Sequence(
         k_timeval,
         '(', ')')

diff --git a/include/siri/grammar/grammar.h b/include/siri/grammar/grammar.h
index c1e148bd225a9e524305332dc1c28d9eddb9251e..50229652a9d5526bcb1a7c19de9fef1ec1a3f3e6 100644 (file)
--- a/include/siri/grammar/grammar.h
+++ b/include/siri/grammar/grammar.h
@@ -5,7 +5,7 @@
  * should be used with the libcleri module.
  *
  * Source class: SiriGrammar
- * Created at: 2023-10-24 14:29:56
+ * Created at: 2023-10-24 15:46:26
  */
 #ifndef CLERI_EXPORT_SIRI_GRAMMAR_GRAMMAR_H_
 #define CLERI_EXPORT_SIRI_GRAMMAR_GRAMMAR_H_

diff --git a/include/siri/version.h b/include/siri/version.h
index 3e84f1f7b85838bb1295a76fcb32275b84e08c2f..a04e30d61870f2736397492cb27cde8e44e0d808 100644 (file)
--- a/include/siri/version.h
+++ b/include/siri/version.h
@@ -15,7 +15,7 @@
  * Note that debian alpha packages should use versions like this:
  *   2.0.34-0alpha0
  */
-#define SIRIDB_VERSION_PRE_RELEASE "-alpha-1"
+#define SIRIDB_VERSION_PRE_RELEASE "-alpha-2"
 
 #ifndef NDEBUG
 #define SIRIDB_VERSION_BUILD_RELEASE "+debug"

diff --git a/src/siri/db/aggregate.c b/src/siri/db/aggregate.c
index a70eb05e9cb256299bfd07287ec8177eae6b4147..d56fa4d2f173fb761897d0ca376543a03b5d9601 100644 (file)
--- a/src/siri/db/aggregate.c
+++ b/src/siri/db/aggregate.c
@@ -229,15 +229,10 @@ vec_t * siridb_aggregate_list(cleri_children_t * children, char * err_msg)
                 siridb_aggregate_list_free(vec);
                 return NULL;
             }
-            if (cleri_gn(cleri_gn(children)->children)
-                    ->children->next->next->next != NULL)
-            {
                 /* group_by is always > 0 */
-                aggr->offset = CLERI_NODE_DATA(
-                        cleri_gn(cleri_gn(cleri_gn(cleri_gn(children)
-                        ->children)->children->next->next)->children)
-                       ) % aggr->group_by;
-            }
+            aggr->offset = CLERI_NODE_DATA(
+                    cleri_gn(cleri_gn(cleri_gn(children)
+                    ->children)->children->next->next)) % aggr->group_by;
             break;
         case CLERI_GID_F_LIMIT:
             AGGR_NEW

diff --git a/src/siri/grammar/grammar.c b/src/siri/grammar/grammar.c
index 96029ed49656123a024761e973553637d7dd34fe..46736df0812725b0e8ad4644f9408129061b3864 100644 (file)
--- a/src/siri/grammar/grammar.c
+++ b/src/siri/grammar/grammar.c
@@ -5,7 +5,7 @@
  * should be used with the libcleri module.
  *
  * Source class: SiriGrammar
- * Created at: 2023-10-24 14:29:56
+ * Created at: 2023-10-24 15:46:26
  */
 
 #include "siri/grammar/grammar.h"
@@ -1056,7 +1056,7 @@ cleri_grammar_t * compile_siri_grammar_grammar(void)
         4,
         k_offset,
         cleri_token(CLERI_NONE, "("),
-        cleri_optional(CLERI_NONE, time_expr),
+        time_expr,
         cleri_token(CLERI_NONE, ")")
     );
     cleri_t * f_timeval = cleri_sequence(
@@ -1103,8 +1103,7 @@ cleri_grammar_t * compile_siri_grammar_grammar(void)
         cleri_choice(
             CLERI_NONE,
             CLERI_FIRST_MATCH,
-            14,
-            k_offset,
+            13,
             k_mean,
             k_median,
             k_median_high,