Use symbolic diagnostic names

... thus requiring ocaml 4.12 (currently in alpha)

malc committed 6 years ago

Commit f4291271 parent 3f8de884 files · +13 −13Browse files

Unified · Split

4 files

build.bash +1 −1
genconfstr.sh +1 −1
listview.ml +3 −3
main.ml +8 −8

@@ -100,7 +100,7 @@ mflags() { · 99 unmodified lines
100		100
101	overs="$(ocamlc -vnum 2>/dev/null)" \|\| overs=""	101	overs="$(ocamlc -vnum 2>/dev/null)" \|\| overs=""
102	test "$overs" = "4.11.1" \|\| {	102	test "$overs" = "4.11.1" \|\| {
103	url=https://caml.inria.fr/pub/distrib/ocaml-4.11/ocaml-4.11.1.tar.xz	103	url=https://caml.inria.fr/pub/distrib/ocaml-4.12/ocaml-4.12.0~alpha1.tar.xz
104	txz=$outd/$(basename $url)	104	txz=$outd/$(basename $url)
105	keycmd="printf $url; digest $txz;"	105	keycmd="printf $url; digest $txz;"
106	isfresh $txz "$(eval $keycmd)" \|\| {	106	isfresh $txz "$(eval $keycmd)" \|\| {

genconfstr.sh+1−1

@@ -101,7 +101,7 @@ i tileh 2048 · 100 unmodified lines
101	g mustoresize memsize "256 lsl 20"	101	g mustoresize memsize "256 lsl 20"
102	b checkers true	102	b checkers true
103	i aalevel 8	103	i aalevel 8
104	s urilauncher '(match[@warning "-4"] platform with \|Pmacos -> {\|open "%s"\|}\|_ -> {\|echo "%s"\|})'	104	s urilauncher '(match[@warning "-fragile-match"] platform with \|Pmacos -> {\|open "%s"\|}\|_ -> {\|echo "%s"\|})'
105	s pathlauncher '{\|lp "%s"\|}'	105	s pathlauncher '{\|lp "%s"\|}'
106	g colorspace colorspace Rgb	106	g colorspace colorspace Rgb
107	b invert false	107	b invert false

listview.ml+3−3

@@ -139,7 +139,7 @@ let textentrykeyboard · 138 unmodified lines
139	in	139	in
140	let open Keys in	140	let open Keys in
141	let kt = Wsi.ks2kt key in	141	let kt = Wsi.ks2kt key in
142	match [@warning "-4"] kt with	142	match [@warning "-fragile-match"] kt with
143	\| Backspace ->	143	\| Backspace ->
144	if emptystr text && cancelonempty	144	if emptystr text && cancelonempty
145	then (	145	then (
@@ -548,7 +548,7 @@ object (self) · 402 unmodified lines
548	in	548	in
549	let open Keys in	549	let open Keys in
550	let kt = Wsi.ks2kt key in	550	let kt = Wsi.ks2kt key in
551	match [@warning "-4"] kt with	551	match [@warning "-fragile-match"] kt with
552	\| Ascii (('r'\|'s') as c) when Wsi.withctrl mask ->	552	\| Ascii (('r'\|'s') as c) when Wsi.withctrl mask ->
553	let incr = if c = 'r' then -1 else 1 in	553	let incr = if c = 'r' then -1 else 1 in
554	let active, first =	554	let active, first =
@@ -598,7 +598,7 @@ object (self) · 43 unmodified lines
598		598
599	\| Ascii _ \| Code _ ->	599	\| Ascii _ \| Code _ ->
600	let utf8 =	600	let utf8 =
601	match [@warning "-8"] kt with	601	match [@warning "-partial-match"] kt with
602	\| Ascii c -> String.make 1 c	602	\| Ascii c -> String.make 1 c
603	\| Code code -> toutf8 code	603	\| Code code -> toutf8 code
604	in	604	in

main.ml+8−8

@@ -197,7 +197,7 @@ let showlinktype under = · 196 unmodified lines
197		197
198	let intentry_with_suffix text key =	198	let intentry_with_suffix text key =
199	let text =	199	let text =
200	match [@warning "-4"] key with	200	match [@warning "-fragile-match"] key with
201	\| Keys.Ascii ('0'..'9' as c) -> addchar text c	201	\| Keys.Ascii ('0'..'9' as c) -> addchar text c
202	\| Keys.Ascii ('k' \| 'm' \| 'g' \| 'K' \| 'M' \| 'G' as c) ->	202	\| Keys.Ascii ('k' \| 'm' \| 'g' \| 'K' \| 'M' \| 'G' as c) ->
203	addchar text @@ Char.lowercase_ascii c	203	addchar text @@ Char.lowercase_ascii c
@@ -1443,7 +1443,7 @@ let intentry text key = · 1239 unmodified lines
1443	if emptystr text && key = Keys.Ascii '-'	1443	if emptystr text && key = Keys.Ascii '-'
1444	then addchar text '-'	1444	then addchar text '-'
1445	else	1445	else
1446	match [@warning "-4"] key with	1446	match [@warning "-fragile-match"] key with
1447	\| Keys.Ascii ('0'..'9' as c) -> addchar text c	1447	\| Keys.Ascii ('0'..'9' as c) -> addchar text c
1448	\| _ ->	1448	\| _ ->
1449	state.text <- "invalid key";	1449	state.text <- "invalid key";
@@ -1470,7 +1470,7 @@ let linknact f s = · 20 unmodified lines
1470	loop 0 state.layout;	1470	loop 0 state.layout;
1471	;;	1471	;;
1472		1472
1473	let linknentry text = function [@warning "-4"]	1473	let linknentry text = function [@warning "-fragile-match"]
1474	\| Keys.Ascii c ->	1474	\| Keys.Ascii c ->
1475	let text = addchar text c in	1475	let text = addchar text c in
1476	linknact (fun under -> state.text <- undertext under) text;	1476	linknact (fun under -> state.text <- undertext under) text;
@@ -1480,7 +1480,7 @@ let linknentry text = function [@warning "-4"] · 3 unmodified lines
1480	TEcont text	1480	TEcont text
1481	;;	1481	;;
1482		1482
1483	let textentry text key = match [@warning "-4"] key with	1483	let textentry text key = match [@warning "-fragile-match"] key with
1484	\| Keys.Ascii c -> TEcont (addchar text c)	1484	\| Keys.Ascii c -> TEcont (addchar text c)
1485	\| Keys.Code c -> TEcont (text ^ toutf8 c)	1485	\| Keys.Code c -> TEcont (text ^ toutf8 c)
1486	\| _ -> TEcont text	1486	\| _ -> TEcont text
@@ -1692,7 +1692,7 @@ let downbirdseye incr (conf, leftx, pageno, hooverpageno, anchor) = · 205 unmodified lines
1692		1692
1693	let optentry mode _ key =	1693	let optentry mode _ key =
1694	let btos b = if b then "on" else "off" in	1694	let btos b = if b then "on" else "off" in
1695	match [@warning "-4"] key with	1695	match [@warning "-fragile-match"] key with
1696	\| Keys.Ascii 'C' ->	1696	\| Keys.Ascii 'C' ->
1697	let ondone s =	1697	let ondone s =
1698	try	1698	try
@@ -2696,7 +2696,7 @@ let enterinfomode = · 997 unmodified lines
2696	method! key key mask =	2696	method! key key mask =
2697	if not (Wsi.withctrl mask)	2697	if not (Wsi.withctrl mask)
2698	then	2698	then
2699	match [@warning "-4"] Wsi.ks2kt key with	2699	match [@warning "-fragile-match"] Wsi.ks2kt key with
2700	\| Keys.Left -> coe (self#updownlevel ~-1)	2700	\| Keys.Left -> coe (self#updownlevel ~-1)
2701	\| Keys.Right -> coe (self#updownlevel 1)	2701	\| Keys.Right -> coe (self#updownlevel 1)
2702	\| _ -> super#key key mask	2702	\| _ -> super#key key mask
@@ -3394,7 +3394,7 @@ let viewkeyboard key mask = · 691 unmodified lines
3394	in	3394	in
3395	let ondone msg = state.text <- msg	3395	let ondone msg = state.text <- msg
3396	and zmod _ _ k =	3396	and zmod _ _ k =
3397	match [@warning "-4"] k with	3397	match [@warning "-fragile-match"] k with
3398	\| Keys.Ascii 'z' ->	3398	\| Keys.Ascii 'z' ->
3399	let f pageno ys =	3399	let f pageno ys =
3400	let ym, yM = yminmax ys in	3400	let ym, yM = yminmax ys in
@@ -3565,7 +3565,7 @@ let viewkeyboard key mask = · 164 unmodified lines
3565	gotopage1 (n + conf.pagebias - 1) 0;	3565	gotopage1 (n + conf.pagebias - 1) 0;
3566	)	3566	)
3567	in	3567	in
3568	let pageentry text = function [@warning "-4"]	3568	let pageentry text = function [@warning "-fragile-match"]
3569	\| Keys.Ascii 'g' -> TEdone text	3569	\| Keys.Ascii 'g' -> TEdone text
3570	\| key -> intentry text key	3570	\| key -> intentry text key
3571	in	3571	in

Use symbolic diagnostic names

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code