refactor OptionState about input_file

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

Hide file tree

Showing 3 changed files with 8 additions and 34 deletions.
diff --git a/src/backend/optionState.ml b/src/backend/optionState.ml
@@ -1,21 +1,9 @@
 
 open MyUtil
 
-type build_state = {
-  input_file  : abs_path;
-}
-
-type test_state = {
-  input_file_to_test : abs_path;
-}
-
-type command_state =
-  | BuildState of build_state
-  | TestState  of test_state
-  | SolveState
 
 type state = {
-  command_state  : command_state;
+  input_file     : abs_path option;
   show_full_path : bool;
 }
 
@@ -34,10 +22,9 @@ let get () =
 
 
 let get_input_file () =
-  match (get ()).command_state with
-  | BuildState({ input_file; _ })       -> input_file
-  | TestState({ input_file_to_test; _}) -> input_file_to_test
-  | SolveState                          -> assert false
+  match (get ()).input_file with
+  | Some(input_file) -> input_file
+  | None             -> assert false
 
 
 let does_show_full_path () =

diff --git a/src/backend/optionState.mli b/src/backend/optionState.mli
@@ -1,21 +1,8 @@
 
 open MyUtil
 
-type build_state = {
-  input_file : abs_path;
-}
-
-type test_state = {
-  input_file_to_test : abs_path;
-}
-
-type command_state =
-  | BuildState of build_state
-  | TestState  of test_state
-  | SolveState
-
 type state = {
-  command_state  : command_state;
+  input_file     : abs_path option;
   show_full_path : bool;
 }
 

diff --git a/src/frontend/main.ml b/src/frontend/main.ml
@@ -1657,7 +1657,7 @@ let build
       }
     in
     OptionState.set OptionState.{
-      command_state = BuildState{ input_file };
+      input_file = Some(input_file);
       show_full_path;
     };
 
@@ -1791,7 +1791,7 @@ let test
       }
     in
     OptionState.set OptionState.{
-      command_state = TestState{ input_file_to_test };
+      input_file = Some(input_file_to_test);
       show_full_path;
     };
 
@@ -2009,7 +2009,7 @@ let solve
     let extra_config_paths = config_paths_str_opt |> Option.map (String.split_on_char ':') in
 
     OptionState.set OptionState.{
-      command_state = SolveState;
+      input_file = None;
       show_full_path;
     };