No local var option

Author: Stevendeo

src/irj_checker/irj_checker.ml

@@ -14,10 +14,11 @@
    this program. If not, see <https://www.gnu.org/licenses/>. *)
 
 (** The Irj_checker Module is a simple entry point to use the Mlang IRJ file
-    parser in order to perform syntactic checks on test files or produce other IR
-    test formats.
+    parser in order to perform syntactic checks on test files or produce other
+    IR test formats.
 
-    Usage: irj_checker.exe [--message-format=VAL] <test_file.irj> [transformation-target]*)
+    Usage: irj_checker.exe [--message-format=VAL] <test_file.irj>
+    [transformation-target]*)
 
 open Cmdliner
 open Mlang

src/mlang/backend_compilers/decoupledExpr.ml

@@ -149,15 +149,19 @@ let collapse_constr (stacks : local_stacks) (ctx : local_vars) (constr : constr)
 let push_with_kind (stacks : local_stacks) (ctx : local_vars) (kind : dflag)
     (constr : constr) =
   let expr, ekind, lv = constr stacks ctx in
-  let expr = if kind = ekind then expr else cast kind expr in
-  let stacks, lv, expr = store_local stacks lv Anon kind expr in
-  (stacks, lv, expr)
+  if !Cli.no_local_var then (stacks, lv, expr)
+  else
+    let expr = if kind = ekind then expr else cast kind expr in
+    let stacks, lv, expr = store_local stacks lv Anon kind expr in
+    (stacks, lv, expr)
 
 (* eval and store without enforcing kind *)
 let push (stacks : local_stacks) (ctx : local_vars) (constr : constr) =
   let expr, kind, lv = constr stacks ctx in
-  let stacks, lv, expr = store_local stacks lv Anon kind expr in
-  (stacks, lv, expr, kind)
+  if !Cli.no_local_var then (stacks, lv, expr, kind)
+  else
+    let stacks, lv, expr = store_local stacks lv Anon kind expr in
+    (stacks, lv, expr, kind)
 
 (** smart constructors *)
 

src/mlang/driver.ml

@@ -159,7 +159,7 @@ let set_opts (files : string list) (application_names : string list)
     (optimize_unsafe_float : bool) (precision : string option)
     (roundops : string option) (comparison_error_margin : float option)
     (income_year : int option) (m_clean_calls : bool)
-    (dgfip_options : string list option) =
+    (dgfip_options : string list option) (no_local_var : bool) =
   let value_sort =
     let precision = Option.get precision in
     if precision = "double" then Cli.RegularFloat
@@ -225,7 +225,7 @@ let set_opts (files : string list) (application_names : string list)
     var_info_debug display_time dep_graph_file print_cycles output
     optimize_unsafe_float m_clean_calls comparison_error_margin income_year
     value_sort round_ops backend dgfip_test_filter mpp_function dgfip_flags
-    execution_mode
+    execution_mode no_local_var
 
 let run_single_test m_program test =
   Mir_interpreter.repl_debug := true;

src/mlang/utils/cli.ml

@@ -182,13 +182,21 @@ let dgfip_options =
           "Specify DGFiP options (use --dgfip_options=--help to display DGFiP \
            specific options)")
 
+let no_local_vars =
+  Arg.(
+    value & flag
+    & info [ "no-local-vars" ]
+        ~doc:
+          "(experimental) Does not generate local vars for definitions and \
+           evaluation.")
+
 let mlang_t f =
   Term.(
     const f $ files $ applications $ without_dgfip_m $ debug $ var_info_debug
     $ display_time $ dep_graph_file $ no_print_cycles $ backend $ output
     $ run_all_tests $ dgfip_test_filter $ run_test $ mpp_function
     $ optimize_unsafe_float $ precision $ roundops $ comparison_error_margin_cli
-    $ income_year_cli $ m_clean_calls $ dgfip_options)
+    $ income_year_cli $ m_clean_calls $ dgfip_options $ no_local_vars)
 
 let info =
   let doc =
@@ -296,6 +304,8 @@ let dgfip_flags = ref Dgfip_options.default_flags
 
 let execution_mode = ref Extraction
 
+let no_local_var = ref false
+
 (* Default value for the epsilon slack when comparing things in the
    interpreter *)
 let comparison_error_margin = ref 0.000001
@@ -310,7 +320,7 @@ let set_all_arg_refs (files_ : files) applications_ (without_dgfip_m_ : bool)
     (income_year_ : int option) (value_sort_ : value_sort)
     (round_ops_ : round_ops) (backend_ : backend) (dgfip_test_filter_ : bool)
     (mpp_function_ : string) (dgfip_flags_ : Dgfip_options.flags)
-    (execution_mode_ : execution_mode) =
+    (execution_mode_ : execution_mode) (no_local_var_ : bool) =
   source_files := files_;
   application_names := applications_;
   without_dgfip_m := without_dgfip_m_;
@@ -333,6 +343,7 @@ let set_all_arg_refs (files_ : files) applications_ (without_dgfip_m_ : bool)
   dgfip_test_filter := dgfip_test_filter_;
   mpp_function := mpp_function_;
   dgfip_flags := dgfip_flags_;
+  no_local_var := no_local_var_;
   match output_file_ with
   | None -> ()
   | Some o -> (

src/mlang/utils/cli.mli

@@ -40,6 +40,7 @@ val mlang_t :
   int option ->
   bool ->
   string list option ->
+  bool ->
   'a) ->
   'a Cmdliner.Term.t
 (** Mlang binary command-line arguments parsing function *)
@@ -140,6 +141,8 @@ val dgfip_flags : Dgfip_options.flags ref
 
 val execution_mode : execution_mode ref
 
+val no_local_var : bool ref
+
 val set_all_arg_refs :
   (* files *) files ->
   (* applications *) string list ->
@@ -161,6 +164,7 @@ val set_all_arg_refs :
   (* mpp_function *) string ->
   (* dgfip_flags *) Dgfip_options.flags ->
   (* execution_mode *) execution_mode ->
+  (* no_local_var *) bool ->
   unit
 
 val add_prefix_to_each_line : string -> (int -> string) -> string