Adding option to write raw formulas completely instead of binary operations between temporary variables

Author: Stevendeo

src/mlang/backend_compilers/decoupledExpr.ml

@@ -170,15 +170,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

@@ -182,7 +182,7 @@ let driver (files : string list) (application_names : string list)
     (precision : string option) (roundops : string option)
     (comparison_error_margin : float option) (income_year : int option)
     (m_clean_calls : bool) (dgfip_options : string list option)
-    (only_compile_new : bool) =
+    (only_compile_new : bool) (no_local_var : bool) =
   Format.printf "Only compile new? %b@." only_compile_new;
   let value_sort =
     let precision = Option.get precision in
@@ -230,7 +230,7 @@ let driver (files : string list) (application_names : string list)
   Cli.set_all_arg_refs files application_names without_dgfip_m debug stats
     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 only_compile_new;
+    value_sort round_ops only_compile_new no_local_var;
   let dgfip_flags = process_dgfip_options backend dgfip_options in
   (* Reading the project metadata, if any, to spare us some ĉompilation time *)
   let metadata = File_metadata.make ~output in

src/mlang/utils/cli.ml

@@ -192,13 +192,20 @@ let only_compil_new =
         ~doc:
           "(experimental) Only parses & compiles files that have been changed.")
 
+let no_local_var =
+  Arg.(
+    value & flag
+    & info [ "no-local-var" ]
+        ~doc:"(experimental) Does not use local vars to encode C assignments.")
+
 let mlang_t f =
   Term.(
     const f $ files $ applications $ without_dgfip_m $ debug $ stats
     $ 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 $ only_compil_new)
+    $ income_year_cli $ m_clean_calls $ dgfip_options $ only_compil_new
+    $ no_local_var)
 
 let info =
   let doc =
@@ -288,6 +295,8 @@ let round_ops = ref RODefault
 
 let only_compile_new = ref false
 
+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
@@ -301,7 +310,7 @@ let set_all_arg_refs (files_ : string list) applications_
     (output_file_ : string option) (optimize_unsafe_float_ : bool)
     (m_clean_calls_ : bool) (comparison_error_margin_ : float option)
     (income_year_ : int option) (value_sort_ : value_sort)
-    (round_ops_ : round_ops) (only_compile_new_ : bool) =
+    (round_ops_ : round_ops) (only_compile_new_ : bool) (no_local_var_ : bool) =
   source_files := files_;
   application_names := applications_;
   without_dgfip_m := without_dgfip_m_;
@@ -321,6 +330,7 @@ let set_all_arg_refs (files_ : string list) applications_
   value_sort := value_sort_;
   round_ops := round_ops_;
   only_compile_new := only_compile_new_;
+  no_local_var := no_local_var_;
   match output_file_ with
   | None -> ()
   | Some o -> (

src/mlang/utils/cli.mli

@@ -42,6 +42,7 @@ val mlang_t :
   bool ->
   string list option ->
   bool ->
+  bool ->
   'a) ->
   'a Cmdliner.Term.t
 (** Mlang binary command-line arguments parsing function *)
@@ -123,6 +124,8 @@ val round_ops : round_ops ref
 
 val only_compile_new : bool ref
 
+val no_local_var : bool ref
+
 val set_all_arg_refs :
   (* files *) string list ->
   (* applications *) string list ->
@@ -141,6 +144,7 @@ val set_all_arg_refs :
   value_sort ->
   round_ops ->
   (* only_compile_new *) bool ->
+  (* no_local_var *) bool ->
   unit
 
 val add_prefix_to_each_line : string -> (int -> string) -> string