Tests: add test for compact option

Author: hhugo

compiler/tests-compiler/compact.ml

@@ -0,0 +1,32 @@
+let%expect_test _ =
+  let prog =
+    {|
+let rec f x y =
+  match x,y with
+  | 0, 0 -> true
+  | _ -> f (y - 1) (x - 1)
+
+|}
+  in
+  let program = Util.compile_and_parse ~pretty:false prog in
+  Util.print_program program;
+  [%expect
+    {|
+    (function(a){
+       "use strict";
+       var b = a.jsoo_runtime;
+       b.caml_register_global
+        (0,
+         [0,
+          function(a, b){
+           var d = a, c = b;
+           for(;;){
+            if(0 === d && 0 === c) return 1;
+            var e = d - 1 | 0, d = c - 1 | 0, c = e;
+           }
+          }],
+         "Test");
+       return;
+      }
+      (globalThis));
+    //end |}]

compiler/tests-compiler/dune.inc

@@ -44,6 +44,21 @@
  (preprocess
   (pps ppx_expect)))
 
+(library
+ ;; compiler/tests-compiler/compact.ml
+ (name compact_15)
+ (enabled_if true)
+ (modules compact)
+ (libraries js_of_ocaml_compiler unix str jsoo_compiler_expect_tests_helper)
+ (inline_tests
+  (enabled_if true)
+  (deps
+   (file %{project_root}/compiler/bin-js_of_ocaml/js_of_ocaml.exe)
+   (file %{project_root}/compiler/bin-jsoo_minify/jsoo_minify.exe)))
+ (flags (:standard -open Jsoo_compiler_expect_tests_helper))
+ (preprocess
+  (pps ppx_expect)))
+
 (library
  ;; compiler/tests-compiler/cond.ml
  (name cond_15)

compiler/tests-compiler/util/util.ml

@@ -521,6 +521,7 @@ let compile_and_run_bytecode ?unix s =
 
 let compile_and_run
     ?debug
+    ?pretty
     ?(skip_modern = false)
     ?(flags = [])
     ?effects
@@ -536,6 +537,7 @@ let compile_and_run
       in
       let output_without_stdlib_modern =
         compile_bc_to_javascript
+          ?pretty
           ~flags
           ?effects
           ?use_js_string
@@ -562,33 +564,29 @@ let compile_and_run
           print_string output_with_stdlib_modern;
           print_endline "==========================================="))
 
-let compile_and_parse_whole_program ?(debug = true) ?flags ?effects ?use_js_string ?unix s
-    =
+let compile_and_parse_whole_program
+    ?(debug = true)
+    ?pretty
+    ?flags
+    ?effects
+    ?use_js_string
+    ?unix
+    s =
   with_temp_dir ~f:(fun () ->
       s
       |> Filetype.ocaml_text_of_string
       |> Filetype.write_ocaml ~name:"test.ml"
       |> compile_ocaml_to_bc ?unix ~debug
-      |> compile_bc_to_javascript
-           ?flags
-           ?effects
-           ?use_js_string
-           ~pretty:true
-           ~sourcemap:debug
+      |> compile_bc_to_javascript ?pretty ?flags ?effects ?use_js_string ~sourcemap:debug
       |> parse_js)
 
-let compile_and_parse ?(debug = true) ?flags ?effects ?use_js_string s =
+let compile_and_parse ?(debug = true) ?pretty ?flags ?effects ?use_js_string s =
   with_temp_dir ~f:(fun () ->
       s
       |> Filetype.ocaml_text_of_string
       |> Filetype.write_ocaml ~name:"test.ml"
       |> compile_ocaml_to_cmo ~debug
-      |> compile_cmo_to_javascript
-           ?flags
-           ?effects
-           ?use_js_string
-           ~pretty:true
-           ~sourcemap:debug
+      |> compile_cmo_to_javascript ?pretty ?flags ?effects ?use_js_string ~sourcemap:debug
       |> parse_js)
 
 let normalize_path s =

compiler/tests-compiler/util/util.mli

@@ -77,6 +77,7 @@ val find_function : Javascript.program -> string -> Javascript.function_declarat
 
 val compile_and_run :
      ?debug:bool
+  -> ?pretty:bool
   -> ?skip_modern:bool
   -> ?flags:string list
   -> ?effects:bool
@@ -89,6 +90,7 @@ val compile_and_run_bytecode : ?unix:bool -> string -> unit
 
 val compile_and_parse :
      ?debug:bool
+  -> ?pretty:bool
   -> ?flags:string list
   -> ?effects:bool
   -> ?use_js_string:bool
@@ -97,6 +99,7 @@ val compile_and_parse :
 
 val compile_and_parse_whole_program :
      ?debug:bool
+  -> ?pretty:bool
   -> ?flags:string list
   -> ?effects:bool
   -> ?use_js_string:bool