# HG changeset patch # User wenzelm # Date 1680025429 -7200 # Node ID be3f838b3e17b0c94df4b0266363ea23d93bde3c # Parent c4c96a833a3732870dd566109bc5b3e46f85d1a1 tuned --- fewer compiler warnings; diff -r c4c96a833a37 -r be3f838b3e17 src/Pure/General/set.ML --- a/src/Pure/General/set.ML Tue Mar 28 19:40:34 2023 +0200 +++ b/src/Pure/General/set.ML Tue Mar 28 19:43:49 2023 +0200 @@ -239,13 +239,13 @@ fun compare NONE _ = LESS | compare (SOME e1) e2 = Key.ord (e1, e2); -fun if_eq EQUAL x y = x - | if_eq _ x y = y; +fun if_eq ord x y = if ord = EQUAL then x else y; exception UNDEF of elem; (*literal copy from table.ML -- by Stefan Berghofer*) fun del (SOME k) Empty = raise UNDEF k + | del NONE Empty = raise Match | del NONE (Branch2 (Empty, p, Empty)) = (p, (true, Empty)) | del NONE (Branch3 (Empty, p, Empty, q, Empty)) = (p, (false, Branch2 (Empty, q, Empty))) diff -r c4c96a833a37 -r be3f838b3e17 src/Pure/General/table.ML --- a/src/Pure/General/table.ML Tue Mar 28 19:40:34 2023 +0200 +++ b/src/Pure/General/table.ML Tue Mar 28 19:43:49 2023 +0200 @@ -229,12 +229,12 @@ fun defined tab key = let fun def Empty = false - | def (Branch2 (left, (k, x), right)) = + | def (Branch2 (left, (k, _), right)) = (case Key.ord (key, k) of LESS => def left | EQUAL => true | GREATER => def right) - | def (Branch3 (left, (k1, x1), mid, (k2, x2), right)) = + | def (Branch3 (left, (k1, _), mid, (k2, _), right)) = (case Key.ord (key, k1) of LESS => def left | EQUAL => true @@ -311,13 +311,13 @@ local -fun compare NONE (k2, _) = LESS +fun compare NONE _ = LESS | compare (SOME k1) (k2, _) = Key.ord (k1, k2); -fun if_eq EQUAL x y = x - | if_eq _ x y = y; +fun if_eq ord x y = if ord = EQUAL then x else y; fun del (SOME k) Empty = raise UNDEF k + | del NONE Empty = raise Match | del NONE (Branch2 (Empty, p, Empty)) = (p, (true, Empty)) | del NONE (Branch3 (Empty, p, Empty, q, Empty)) = (p, (false, Branch2 (Empty, q, Empty)))