ucm: evaluate Repeat block before If block (Syntax 9)

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 3212fda09f926b9ec501ae29050e935234bba365..8d5428c2443dc9a50078e324e0f44cddaf565659 100644 (file)
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -765,10 +765,10 @@ int uc_mgr_evaluate_inplace(snd_use_case_mgr_t *uc_mgr,
                        return err4;
                if (err4 == 0)
                        continue;
-               err5 = evaluate_condition(uc_mgr, cfg);
+               err5 = uc_mgr_evaluate_repeat(uc_mgr, cfg);
                if (err5 < 0)
                        return err5;
-               err6 = uc_mgr_evaluate_repeat(uc_mgr, cfg);
+               err6 = evaluate_condition(uc_mgr, cfg);
                if (err6 < 0)
                        return err6;
        }

diff --git a/src/ucm/ucm_confdoc.h b/src/ucm/ucm_confdoc.h
index d5bd3484ed17019ee8b52e34c1a0be6812daeb4a..47a1e182b049affc51529911abc24891efe23974 100644 (file)
--- a/src/ucm/ucm_confdoc.h
+++ b/src/ucm/ucm_confdoc.h
@@ -587,8 +587,8 @@ Evaluation order   | Configuration block | Evaluation restart
 2                  | Include             | Yes
 3                  | Variant             | Yes
 4                  | Macro               | Yes
-5                  | If                  | Yes
-
+5                  | Repeat              | Yes
+6                  | If                  | Yes
 
 ### Substitutions