fix file loading

Author: stilscher

src/App.re

@@ -89,7 +89,7 @@ let init_goblint = (solver, spec, registered_name, config, cil) => {
   (goblint, cil);
 };
 
-let init = (solver, spec, config, meta, cil, analyses, warnings, stats) => {
+let init = (solver, spec, config, meta, cil, analyses, warnings, stats, file_loc) => {
   let cil =
     switch (cil) {
     | Ok(s) =>
@@ -128,9 +128,15 @@ let init = (solver, spec, config, meta, cil, analyses, warnings, stats) => {
     | _ => raise(InitFailed("Failed to load runtime stats"))
     };
 
+  let file_loc =
+    switch (file_loc) {
+    | Ok(s) => Marshal.from_string(s, 0)
+    | _ => raise(InitFailed("Failed to load file path table"))
+    };
+
   print_endline("Rendering app...");
   React.Dom.renderToElementWithId(
-    <Main cil goblint warnings meta stats />,
+    <Main cil goblint warnings meta stats file_loc/>,
     "app",
   );
 };
@@ -153,15 +159,16 @@ let handle_error = exc => {
   "./analyses.marshalled",
   "./warnings.marshalled",
   "./stats.marshalled",
+  "./file_loc.marshalled",
 ]
 |> List.map(HttpClient.get)
 |> Lwt.all
 >>= (
   l =>
     Lwt.return(
       switch (l) {
-      | [solver, spec, config, meta, cil, analyses, warnings, stats] =>
-        try(init(solver, spec, config, meta, cil, analyses, warnings, stats)) {
+      | [solver, spec, config, meta, cil, analyses, warnings, stats, file_loc] =>
+        try(init(solver, spec, config, meta, cil, analyses, warnings, stats, file_loc)) {
         | exc => handle_error(exc)
         }
       | _ => ()

src/Main.re

@@ -1,11 +1,11 @@
 open Batteries;
 
 [@react.component]
-let make = (~cil, ~goblint, ~warnings, ~meta, ~stats) => {
+let make = (~cil, ~goblint, ~warnings, ~meta, ~stats, ~file_loc) => {
   let (state, dispatch) =
     React.useReducer(
       Reducer.reducer,
-      State.make(~cil, ~goblint, ~warnings, ~meta, ~stats, ()),
+      State.make(~cil, ~goblint, ~warnings, ~meta, ~stats, ~file_loc, ()),
     );
 
   let fetch_file =
@@ -38,7 +38,7 @@ let make = (~cil, ~goblint, ~warnings, ~meta, ~stats) => {
   React.useEffect1(
     () => {
       switch (state.display) {
-      | Some(File(f)) when Option.is_none(f.contents) => fetch_file(f.path)
+      | Some(File(f)) when Option.is_none(f.contents) => fetch_file(Hashtbl.find(file_loc, f.path))
       | Some(Func(f)) when Option.is_none(f.dot) =>
         fetch_dot(f.name, f.file)
       | _ => ()

src/Panel.re

@@ -52,8 +52,7 @@ let make = (~state, ~dispatch) => {
     <div className="tab-content">
       <div className="tab-pane active">
         {switch (current) {
-         | Some(Warnings) =>
-           <WarningView warnings={state.warnings} dispatch />
+         | Some(Warnings) => <WarningView warnings={state.warnings} dispatch />
          | Some(DeadCode) => <DeadCodeView locations dispatch />
          | Some(Parameters) => <ParameterView parameters />
          | Some(Statistics) => <GvStatisticsView stats={state.stats} />

src/state/state.ml

@@ -23,6 +23,7 @@ type t = {
   warnings : GvMessages.t;
   meta : Yojson.Safe.t;
   stats : Stats.t * Gc.stat;
+  file_loc : (string, string) Hashtbl.t;
   display : display option;
   inspect : inspect option;
   selected_sidebar : selected_sidebar;
@@ -37,12 +38,13 @@ let default =
     warnings = [];
     meta = `Null;
     stats = (Stats.top, Gc.quick_stat ());
+    file_loc = Hashtbl.create 113;
     display = None;
     inspect = None;
     selected_sidebar = SelectedSidebar.Nodes;
     selected_panel = None;
     search = Search.default;
   }
 
-let make ~cil ~goblint ~warnings ~meta ~stats () =
-  { default with cil; goblint; warnings; meta; stats }
+let make ~cil ~goblint ~warnings ~meta ~stats ~file_loc () =
+  { default with cil; goblint; warnings; meta; stats; file_loc }