Skip to content

Commit

Permalink
Revert "Application iliad par défaut"
Browse files Browse the repository at this point in the history
This reverts commit c95eb43.
  • Loading branch information
david-michel1 committed Oct 29, 2024
1 parent c95eb43 commit 2342bbf
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions makefiles/variables.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ MLANG_BIN=dune exec $(ROOT_DIR)/_build/default/src/main.exe --

PRECISION?=double
MLANG_DEFAULT_OPTS=\
-A iliad\
--display_time --debug\
--precision $(PRECISION)

Expand Down
2 changes: 1 addition & 1 deletion src/mlang/m_frontend/expand_macros.ml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ let get_selected_chains (apps_env : apps_env)
in
StrMap.fold sel_chain chains StrMap.empty

(** Eliminates constants and loops *)
let check_apps_on_cmdline (apps_env : apps_env) : unit =
let iter a _ =
match StrMap.find_opt a apps_env.apps with
Expand Down Expand Up @@ -255,7 +256,6 @@ let elim_unselected_apps (p : Mast.program) : Mast.program =
List.rev prog

module ConstMap = StrMap
(** Eliminates constants and loops *)

type const_context = float Pos.marked ConstMap.t

Expand Down
5 changes: 3 additions & 2 deletions src/mlang/utils/cli.ml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ let files =
& info [] ~docv:"FILES" ~doc:"M files to be compiled")

let applications =
Arg.(value & opt (list string) [] & info [ "A" ] ~doc:"Application name(s)")
Arg.(
non_empty & opt (list string) [] & info [ "A" ] ~doc:"Application name(s)")

let without_dgfip_m =
Arg.(
Expand Down Expand Up @@ -287,7 +288,7 @@ let set_all_arg_refs (files_ : string list) applications_
(income_year_ : int option) (value_sort_ : value_sort)
(round_ops_ : round_ops) =
source_files := files_;
(application_names := match applications_ with [] -> [ "iliad" ] | al -> al);
application_names := applications_;
without_dgfip_m := without_dgfip_m_;
debug_flag := debug_;
var_info_debug := var_info_debug_;
Expand Down

0 comments on commit 2342bbf

Please sign in to comment.