Consistency and correct(erer)ness

malc committed 4 years ago

Commit cef17441 parent 4e21d744 files · +8 −9Browse files

Unified · Split

4 files

config.ml +1 −1
main.ml +7 −6
utils.ml +0 −1
utils.mli +0 −1

@@ -1465,7 +1465,7 @@ let gc () = · 1464 unmodified lines
1465	1465	let cref = ref defconf in
1466	1466	let push (h, dc) =
1467	1467	let f path v =
1468		− if Sys.file_exists path then Some v else (dolog1 "-%S" path; None)
	1468	+ if Sys.file_exists path then Some v else (dolog "removing %S" path; None)
1469	1469	in
1470	1470	Hashtbl.filter_map_inplace f h;
1471	1471	href := h;

main.ml+7−6

@@ -1006,12 +1006,12 @@ let pgoto opaque pageno x y = · 1005 unmodified lines
1006	1006	gotopagexy pageno x y
1007	1007
1008	1008	let act cmds =
1009		− (* dolog1 "%S" cmds; *)
	1009	+ (* dolog "%S" cmds; *)
1010	1010	let spl = splitatchar cmds ' ' in
1011	1011	let scan s fmt f =
1012	1012	try Scanf.sscanf s fmt f
1013	1013	with exn ->
1014		− dolog1 "error scanning %S: %s" cmds @@ exntos exn;
	1014	+ dolog "error scanning %S: %s" cmds @@ exntos exn;
1015	1015	exit 1
1016	1016	in
1017	1017	let addoutline outline =
@@ -1019,7 +1019,7 @@ let act cmds = · 1 unmodified line
1019	1019	\| Outlining outlines -> S.currently := Outlining (outline :: outlines)
1020	1020	\| Idle -> S.currently := Outlining [outline]
1021	1021	\| Loading _ \| Tiling _ ->
1022		− dolog1 "invalid outlining state";
	1022	+ dolog "Invalid outlining state";
1023	1023	logcurrently !S.currently
1024	1024	in
1025	1025	match spl with
@@ -1168,7 +1168,7 @@ let act cmds = · 142 unmodified lines
1168	1168	)
1169	1169
1170	1170	\| Idle \| Tiling _ \| Outlining _ ->
1171		− dolog1 "Inconsistent loading state";
	1171	+ dolog "Inconsistent loading state";
1172	1172	logcurrently !S.currently;
1173	1173	exit 1
1174	1174	end
@@ -1212,7 +1212,7 @@ let act cmds = · 37 unmodified lines
1212	1212	)
1213	1213
1214	1214	\| Idle \| Loading _ \| Outlining _ ->
1215		− dolog1 "Inconsistent tiling state";
	1215	+ dolog "Inconsistent tiling state";
1216	1216	logcurrently !S.currently;
1217	1217	exit 1
1218	1218	end
@@ -4747,7 +4747,8 @@ let () = · 3528 unmodified lines
4747	4747	let optrfd =
4748	4748	ref (if nonemptystr !rcmdpath then remoteopen !rcmdpath else None)
4749	4749	in
4750		− dologf := (adderrfmt "stderr" "%s\n");
	4750	+ if !S.redirstderr
	4751	+ then dologf := (adderrfmt "stderr" "%s\n");
4751	4752
4752	4753	let fdl =
4753	4754	let l = [!S.ss; !S.wsfd] in if !S.redirstderr then !S.stderr :: l else l

utils.ml+0−1

@@ -18,7 +18,6 @@ external hasdata : Unix.file_descr -> bool = "ml_hasdata" · 17 unmodified lines
18	18	let now = Unix.gettimeofday
19	19	let dologf = ref prerr_endline
20	20	let dolog fmt = Printf.ksprintf !dologf fmt
21		−let dolog1 fmt = Printf.ksprintf (fun s -> print_endline s; flush stdout) fmt
22	21
23	22	let exntos = function
24	23	\| Unix.Unix_error (e, s, a) ->

utils.mli+0−1

@@ -12,7 +12,6 @@ external hasdata : Unix.file_descr -> bool = "ml_hasdata" · 11 unmodified lines
12	12	val now : unit -> float
13	13	val dologf : (string -> unit) ref
14	14	val dolog : ('a, unit, string, unit) format4 -> 'a
15		−val dolog1 : ('a, unit, string, unit) format4 -> 'a
16	15	val exntos : exn -> string
17	16	val onoffs : bool -> string
18	17	val error : ('a, unit, string, 'b) format4 -> 'a

Consistency and correct(erer)ness

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code