fixed wasi issue, removed internal runtime mode CLI flag

Author: alex-snezhko

compiler/src/compile.re

@@ -251,7 +251,7 @@ let compile_wasi_polyfill = () => {
   switch (Grain_utils.Config.wasi_polyfill^) {
   | Some(file) =>
     Grain_utils.Config.preserve_config(() => {
-      Grain_utils.Config.runtime_mode := true;
+      Grain_utils.Config.compilation_mode := Grain_utils.Config.Runtime;
       let cstate = {
         cstate_desc: Initial(InputFile(file)),
         cstate_filename: Some(file),

compiler/src/typed/env.re

@@ -658,11 +658,7 @@ let get_components = c =>
   | Some(c) => c
   };
 
-type compilation_mode =
-  | Normal /* Standard compilation with regular bells and whistles */
-  | Runtime /* GC doesn't exist yet, allocations happen in runtime heap */;
-
-let current_unit = ref(("", "", Normal));
+let current_unit = ref(("", "", Grain_utils.Config.Normal));
 
 let set_unit = unit => current_unit := unit;
 

compiler/src/typed/env.rei

@@ -161,13 +161,8 @@ let add_local_type: (Path.t, type_declaration, t) => t;
 let add_item: (signature_item, t) => t;
 let add_signature: (signature, t) => t;
 
-/* Remember the current compilation unit: modname * filename * compilation mode. */
-type compilation_mode =
-  | Normal
-  | Runtime;
-
-let set_unit: ((string, string, compilation_mode)) => unit;
-let get_unit: unit => (string, string, compilation_mode);
+let set_unit: ((string, string, Grain_utils.Config.compilation_mode)) => unit;
+let get_unit: unit => (string, string, Grain_utils.Config.compilation_mode);
 let is_runtime_mode: unit => bool;
 
 /* Insertion of a module */

compiler/src/typed/typed_well_formedness.re

@@ -299,7 +299,8 @@ module WellFormednessArg: TypedtreeIter.IteratorArgument = {
       if (exp_is_wasm_unsafe(exp)
           && !(
                Grain_utils.Config.no_gc^
-               || Grain_utils.Config.runtime_mode^
+               || Grain_utils.Config.compilation_mode^
+               == Grain_utils.Config.Runtime
                || is_unsafe()
              )) {
         raise(Error(exp_loc, WasmOutsideDisableGc));

compiler/src/typed/typemod.re

@@ -999,17 +999,14 @@ let initial_env = () => {
   );
 };
 
-let get_compilation_mode = () =>
-  if (Grain_utils.Config.runtime_mode^) {
-    Env.Runtime;
-  } else {
-    Env.Normal;
-  };
-
 let type_implementation = prog => {
   let sourcefile = prog.prog_loc.loc_start.pos_fname;
   let module_name = prog.module_name.txt;
-  Env.set_unit((module_name, sourcefile, get_compilation_mode()));
+  Env.set_unit((
+    module_name,
+    sourcefile,
+    Grain_utils.Config.compilation_mode^,
+  ));
   let initenv = initial_env();
   let (statements, sg, finalenv) = type_module(initenv, prog.statements);
   let simple_sg = simplify_signature(sg);

compiler/src/utils/config.re

@@ -305,22 +305,6 @@ let preserve_config = thunk => {
 let preserve_all_configs = thunk =>
   preserve_root_config(() => preserve_config(thunk));
 
-let with_cli_options = (term: 'a): Cmdliner.Term.t('a) => {
-  open Cmdliner;
-  open Term;
-  let process_option = acc =>
-    fun
-    | Spec(arg, names, box) =>
-      const((a, b) => {
-        box := a;
-        b;
-      })
-      $ Arg.value(arg)
-      $ acc;
-  let folded = List.fold_left(process_option, const(term), specs^);
-  folded;
-};
-
 let option_conv = ((prsr, prntr)) => (
   x =>
     switch (prsr(x)) {
@@ -398,12 +382,11 @@ let import_memory =
     false,
   );
 
-let runtime_mode =
-  toggle_flag(
-    ~names=["compilation-mode"],
-    ~doc="Compilation mode (advanced use only)",
-    false,
-  );
+type compilation_mode =
+  | Normal /* Standard compilation with regular bells and whistles */
+  | Runtime /* GC doesn't exist yet, allocations happen in runtime heap */;
+
+let compilation_mode = internal_opt(Normal, Digestable);
 
 let statically_link =
   toggle_flag(~names=["no-link"], ~doc="Disable static linking", true);
@@ -502,6 +485,23 @@ let source_map =
 
 let print_warnings = internal_opt(true, NotDigestable);
 
+let with_cli_options = (term: 'a): Cmdliner.Term.t('a) => {
+  open Cmdliner;
+  open Term;
+  let process_option = acc =>
+    fun
+    | Spec(arg, names, box) =>
+      const((a, b) => {
+        box := a;
+        b;
+      })
+      $ Arg.value(arg)
+      $ acc;
+  let folded = List.fold_left(process_option, const(term), specs^);
+  compilation_mode := Normal;
+  folded;
+};
+
 let stdlib_directory = (): option(string) =>
   Option.map(
     path => Filepath.(to_string(String.derelativize(path))),
@@ -529,7 +529,7 @@ let apply_attribute_flags = (~no_pervasives as np, ~runtime_mode as rm) => {
     no_pervasives := true;
   };
   if (rm) {
-    runtime_mode := true;
+    compilation_mode := Runtime;
   };
 };
 
@@ -551,7 +551,7 @@ let get_implicit_opens = () => {
     } else {
       [Pervasives_mod];
     };
-  if (runtime_mode^) {
+  if (compilation_mode^ == Runtime) {
     [];
   } else {
     // Pervasives goes first, just for good measure.

compiler/src/utils/config.rei

@@ -1,6 +1,10 @@
 type profile =
   | Release;
 
+type compilation_mode =
+  | Normal /* Standard compilation with regular bells and whistles */
+  | Runtime /* GC doesn't exist yet, allocations happen in runtime heap */;
+
 /** The Grain stdlib directory, based on the current configuration */
 let stdlib_directory: unit => option(string);
 
@@ -80,7 +84,7 @@ let import_memory: ref(bool);
 
 /** Whether this module should be compiled in runtime mode */
 
-let runtime_mode: ref(bool);
+let compilation_mode: ref(compilation_mode);
 
 /** Statically link modules after compilation */
 

compiler/test/runner.re

@@ -302,10 +302,7 @@ let makeRunner =
       test,
       ~num_pages=?,
       ~config_fn=?,
-      ~compile_flags=Grain_parsing.Parsetree.{
-                       no_pervasives: false,
-                       runtime_mode: false,
-                     },
+      ~compile_flags=Test_utils.default_compile_flags,
       name,
       prog,
       expected,

compiler/test/suites/arrays.re

@@ -123,10 +123,7 @@ describe("arrays", ({test, testSkip}) => {
           state[0] =
             5",
         {
-          compile_flags: {
-            no_pervasives: false,
-            runtime_mode: false,
-          },
+          compile_flags: Grain_tests.Test_utils.default_compile_flags,
           module_name: Location.mknoloc("Test"),
           statements: [
             Toplevel.expr(

compiler/test/suites/basic_functionality.re

@@ -255,10 +255,7 @@ describe("basic functionality", ({test, testSkip}) => {
           type Über = Number
         |},
         {
-          compile_flags: {
-            no_pervasives: false,
-            runtime_mode: false,
-          },
+          compile_flags: Grain_tests.Test_utils.default_compile_flags,
           module_name: Location.mknoloc("Test"),
           statements: [
             Toplevel.data([