Back to working

hazelgrove · Aug 22, 2024 · bc56c2f · bc56c2f
1 parent ff86788
commit bc56c2f
Show file tree

Hide file tree

Showing 12 changed files with 126 additions and 113 deletions.
diff --git a/src/haz3lweb/DebugConsole.re b/src/haz3lweb/DebugConsole.re
@@ -16,7 +16,7 @@ let print = ({settings, editors, _}: Model.t, key: string): unit => {
     |> Zipper.unselect_and_zip
     |> ((seg: Segment.t(Uuidm.t)) => [%derive.show: Segment.t(Id.t)](seg))
     |> print
-  | "F3" => term |> [%derive.show: UExp.t(list(Id.t))] |> print
+  | "F3" => term |> [%derive.show: UExp.t(IdTag.t)] |> print
   | "F4" => map |> Statics.Map.show |> print
   | "F5" =>
     let env = Editors.get_env_init(~settings, editors);

diff --git a/src/haz3lweb/Editors.re b/src/haz3lweb/Editors.re
@@ -66,7 +66,7 @@ let perform_action =
 let update_current_editor_statics = settings =>
   update(Editor.update_statics(~settings));
 
-let get_ctx_init = (~settings as _: Settings.t, editors: t): Ctx.t =>
+let get_ctx_init = (~settings as _: Settings.t, editors: t): Ctx.t(IdTag.t) =>
   switch (editors) {
   | Scratch(_)
   | Exercises(_)

diff --git a/src/haz3lweb/view/CtxInspector.re b/src/haz3lweb/view/CtxInspector.re
@@ -5,7 +5,8 @@ open Util.Web;
 let jump_to = entry =>
   UpdateAction.PerformAction(Jump(TileId(Haz3lcore.Ctx.get_id(entry))));
 
-let context_entry_view = (~inject, entry: Haz3lcore.Ctx.entry): Node.t => {
+let context_entry_view =
+    (~inject, entry: Haz3lcore.Ctx.entry(Haz3lcore.IdTag.t)): Node.t => {
   let div_name =
     div(
       ~attrs=[clss(["name"]), Attr.on_click(_ => inject(jump_to(entry)))],
@@ -33,7 +34,7 @@ let context_entry_view = (~inject, entry: Haz3lcore.Ctx.entry): Node.t => {
   };
 };
 
-let ctx_view = (~inject, ctx: Haz3lcore.Ctx.t): Node.t =>
+let ctx_view = (~inject, ctx: Haz3lcore.Ctx.t(Haz3lcore.IdTag.t)): Node.t =>
   div(
     ~attrs=[clss(["context-entries"])],
     List.map(