remove unnecessary fields from OptionState

gfngfn · Oct 29, 2023 · 5176297 · 5176297
1 parent 3a2cadc
commit 5176297
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 36 deletions.
diff --git a/src/backend/optionState.ml b/src/backend/optionState.ml
@@ -2,13 +2,11 @@
 open MyUtil
 
 type build_state = {
-  input_file             : abs_path;
-  output_file            : abs_path option;
-  type_check_only        : bool;
+  input_file  : abs_path;
 }
 
 type test_state = {
-  input_file_to_test  : abs_path;
+  input_file_to_test : abs_path;
 }
 
 type command_state =
@@ -17,10 +15,8 @@ type command_state =
   | SolveState
 
 type state = {
-  command_state      : command_state;
-  extra_config_paths : (string list) option;
-  show_full_path     : bool;
-  no_default_config  : bool;
+  command_state  : command_state;
+  show_full_path : bool;
 }
 
 
@@ -44,7 +40,8 @@ let get_input_file () =
   | SolveState                          -> assert false
 
 
-let does_show_full_path ()         = (get ()).show_full_path
+let does_show_full_path () =
+  (get ()).show_full_path
 
 
 let job_directory () =

diff --git a/src/backend/optionState.mli b/src/backend/optionState.mli
@@ -2,13 +2,11 @@
 open MyUtil
 
 type build_state = {
-  input_file             : abs_path;
-  output_file            : abs_path option;
-  type_check_only        : bool;
+  input_file : abs_path;
 }
 
 type test_state = {
-  input_file_to_test  : abs_path;
+  input_file_to_test : abs_path;
 }
 
 type command_state =
@@ -17,16 +15,12 @@ type command_state =
   | SolveState
 
 type state = {
-  command_state      : command_state;
-  extra_config_paths : (string list) option;
-  show_full_path     : bool;
-  no_default_config  : bool;
+  command_state  : command_state;
+  show_full_path : bool;
 }
 
 val set : state -> unit
 
-val get : unit -> state
-
-val does_show_full_path         : unit -> bool
+val does_show_full_path : unit -> bool
 
 val job_directory : unit -> string
diff --git a/src/frontend/main.ml b/src/frontend/main.ml
@@ -1657,15 +1657,8 @@ let build
       }
     in
     OptionState.set OptionState.{
-      command_state =
-        BuildState{
-          input_file;
-          output_file;
-          type_check_only;
-        };
-      extra_config_paths;
+      command_state = BuildState{ input_file };
       show_full_path;
-      no_default_config;
     };
 
     let library_root = setup_root_dirs ~no_default_config ~extra_config_paths curdir in
@@ -1798,13 +1791,8 @@ let test
       }
     in
     OptionState.set OptionState.{
-      command_state =
-        TestState{
-          input_file_to_test;
-        };
-      extra_config_paths;
+      command_state = TestState{ input_file_to_test };
       show_full_path;
-      no_default_config;
     };
 
     let library_root = setup_root_dirs ~no_default_config ~extra_config_paths curdir in
@@ -2022,9 +2010,7 @@ let solve
 
     OptionState.set OptionState.{
       command_state = SolveState;
-      extra_config_paths;
       show_full_path;
-      no_default_config;
     };
 
     let library_root = setup_root_dirs ~no_default_config ~extra_config_paths curdir in