refactoring

Signed-off-by: Alpha DIALLO <[email protected]>
ocaml · Sep 23, 2024 · 51ba856 · 51ba856
1 parent 5de1d7c
commit 51ba856
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/src/dune_rules/enabled_if.ml b/src/dune_rules/enabled_if.ml
@@ -56,23 +56,23 @@ let decode_value ~allowed_vars ?(is_error = true) () =
       ~override_decode_bare_literal:None
       (String_with_vars.decode_manually (fun env var ->
          let name = Dune_lang.Template.Pform.name var in
-         match Dune_lang.Template.Pform.payload var with
-         | _ when not @@ List.exists ~f:(String.equal name) common_vars_list ->
+         if List.exists ~f:(String.equal name) common_vars_list
+         then (
+           match List.assoc allowed_vars name with
+           | None ->
+             emit_warning allowed_vars is_error var;
+             Pform.Env.parse env var
+           | Some min_ver ->
+             let current_ver = Pform.Env.syntax_version env in
+             if min_ver > current_ver
+             then (
+               let loc = Dune_lang.Template.Pform.loc var in
+               let what = Dune_lang.Template.Pform.describe var in
+               Dune_lang.Syntax.Error.since loc Stanza.syntax min_ver ~what)
+             else Pform.Env.unsafe_parse_without_checking_version env var)
+         else (
            emit_warning allowed_vars is_error var;
-           Pform.Env.parse env var
-         | _ ->
-           (match List.assoc allowed_vars name with
-            | None ->
-              emit_warning allowed_vars is_error var;
-              Pform.Env.parse env var
-            | Some min_ver ->
-              let current_ver = Pform.Env.syntax_version env in
-              if min_ver > current_ver
-              then (
-                let loc = Dune_lang.Template.Pform.loc var in
-                let what = Dune_lang.Template.Pform.describe var in
-                Dune_lang.Syntax.Error.since loc Stanza.syntax min_ver ~what)
-              else Pform.Env.unsafe_parse_without_checking_version env var)))
+           Pform.Env.parse env var)))
 ;;
 
 let decode ~allowed_vars ?is_error ~since () =