Skip to content

Commit

Permalink
Merge branch 'dev' into labeled-tuple-rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
7h3kk1d authored Oct 13, 2024
2 parents 59ff548 + c1c0eba commit 158a62d
Show file tree
Hide file tree
Showing 14 changed files with 207 additions and 158 deletions.
5 changes: 2 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,12 @@
reason
ppx_yojson_conv_lib
ppx_yojson_conv
incr_dom
(omd (>= 2.0.0~alpha4))
ezjs_idb
virtual_dom
bonsai
ppx_deriving
ptmap
uuidm
(uuidm (= 0.9.8)) ; 0.9.9 has breaking deprecated changes
unionFind
ocamlformat
(junit_alcotest :with-test)
Expand Down
10 changes: 10 additions & 0 deletions dune-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
(lang dune 3.16)

; List of warning codes found at https://ocaml.org/manual/5.2/comp.html#s:comp-options
(env
(dev
(flags
(:standard -warn-error +A-26-27-K-58))) ; Disable some unused warnings.
(release
(flags
(:standard -warn-error +A-58))))
5 changes: 2 additions & 3 deletions hazel.opam

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 78 additions & 28 deletions hazel.opam.locked

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/haz3lweb/Editors.re
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ let perform_action =
CoreSettings.on
| _ => settings
};
print_endline("action: " ++ Action.show(a));
switch (Perform.go(~settings, a, get_editor(editors))) {
| Error(err) => Error(FailedToPerform(err))
| Ok(ed) => Ok(put_editor(ed, editors))
Expand Down
2 changes: 1 addition & 1 deletion src/haz3lweb/Keyboard.re
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ let shortcuts = (sys: Key.sys): list(shortcut) =>
]
@ (if (ExerciseSettings.show_instructor) {instructor_shortcuts} else {[]});

let handle_key_event = (k: Key.t): option(Update.t) => {
let handle_key_event = (k: Key.t): option(UpdateAction.t) => {
let now = (a: Action.t): option(UpdateAction.t) =>
Some(PerformAction(a));
switch (k) {
Expand Down
3 changes: 2 additions & 1 deletion src/haz3lweb/Log.re
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ let is_action_logged: UpdateAction.t => bool =
| FinishImportAll(_)
| FinishImportScratchpad(_)
| Benchmark(_)
| DebugConsole(_) => false
| DebugConsole(_)
| Startup => false
| Reset
| TAB
| Set(_)
Expand Down
Loading

0 comments on commit 158a62d

Please sign in to comment.