Added evaluation_order json serialization

Signed-off-by: Victor Moene <[email protected]>

Author: victormlg

libpromises/eval_context.c

@@ -4074,6 +4074,32 @@ void EvalContextSetAgentEvalOrder(EvalContext *ctx, EvalOrder eval_order)
     ctx->agent_eval_order = eval_order;
 }
 
+const char *EvalContextEvaluationOrderToString(EvalOrder evaluation_order)
+{
+    if (evaluation_order == EVAL_ORDER_CLASSIC)
+    {
+        return "classic";
+    }
+    if (evaluation_order == EVAL_ORDER_TOP_DOWN)
+    {
+        return "top_down";
+    }
+    return "undefined";
+}
+
+EvalOrder EvalContextEvaluationOrderFromString(const char *evaluation_order_string)
+{
+    if (StringEqual(evaluation_order_string, "classic"))
+    {
+        return EVAL_ORDER_CLASSIC;
+    }
+    if (StringEqual(evaluation_order_string, "top_down"))
+    {
+        return EVAL_ORDER_TOP_DOWN;
+    }
+    return EVAL_ORDER_UNDEFINED;
+}
+
 bool EvalContextIsClassicOrder(EvalContext *ctx, const Bundle *bp)
 {
     assert(ctx != NULL);

libpromises/eval_context.h

@@ -454,6 +454,8 @@ void EvalContextProfilingEnd(EvalContext *ctx, const Policy *policy);
 
 void EvalContextSetCommonEvalOrder(EvalContext *ctx, EvalOrder eval_order);
 void EvalContextSetAgentEvalOrder(EvalContext *ctx, EvalOrder eval_order);
+const char *EvalContextEvaluationOrderToString(EvalOrder evaluation_order);
+EvalOrder EvalContextEvaluationOrderFromString(const char *evaluation_order_string);
 bool EvalContextIsClassicOrder(EvalContext *ctx, const Bundle *bp);
 
 #endif

libpromises/expand.c

@@ -844,6 +844,7 @@ void BundleResolve(EvalContext *ctx, const Bundle *bundle)
 static void ResolveControlBody(EvalContext *ctx, GenericAgentConfig *config,
                                const Body *control_body)
 {
+    assert(control_body != NULL);
     const char *filename = control_body->source_path;
 
     assert(CFG_CONTROLBODY[COMMON_CONTROL_MAX].lval == NULL);

libpromises/parser.c

@@ -106,6 +106,8 @@ static void ParserStateReset(ParserState *p, bool discard)
 
 static void ParserStateClean(ParserState *p)
 {
+    assert(p != NULL);
+
     free(p->current_namespace);
     p->current_namespace = NULL;
 

libpromises/policy.c

@@ -1908,6 +1908,7 @@ static JsonElement *BundleContextsToJson(const Seq *promises)
  */
 JsonElement *BundleToJson(const Bundle *bundle)
 {
+    assert(bundle != NULL);
     JsonElement *json_bundle = JsonObjectCreate(10);
 
     if (bundle->source_path)
@@ -1919,6 +1920,7 @@ JsonElement *BundleToJson(const Bundle *bundle)
     JsonObjectAppendString(json_bundle, "namespace", bundle->ns);
     JsonObjectAppendString(json_bundle, "name", bundle->name);
     JsonObjectAppendString(json_bundle, "bundleType", bundle->type);
+    JsonObjectAppendString(json_bundle, "evaluation_order", EvalContextEvaluationOrderToString(bundle->evaluation_order));
 
     {
         JsonElement *json_args = JsonArrayCreate(10);
@@ -2303,6 +2305,7 @@ static Bundle *PolicyAppendBundleJson(Policy *policy, JsonElement *json_bundle)
     const char *name = JsonObjectGetAsString(json_bundle, "name");
     const char *type = JsonObjectGetAsString(json_bundle, "bundleType");
     const char *source_path = JsonObjectGetAsString(json_bundle, "sourcePath");
+    const char *evaluation_order_string = JsonObjectGetAsString(json_bundle, "evaluation_order");
 
     Rlist *args = NULL;
     {
@@ -2314,7 +2317,7 @@ static Bundle *PolicyAppendBundleJson(Policy *policy, JsonElement *json_bundle)
     }
 
     // TODO: add eval order in json
-    Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EVAL_ORDER_UNDEFINED);
+    Bundle *bundle = PolicyAppendBundle(policy, ns, name, type, args, source_path, EvalContextEvaluationOrderFromString(evaluation_order_string));
 
     {
         JsonElement *json_promise_types = JsonObjectGetAsArray(json_bundle, "promiseTypes");