diff options
| author | Sébastien Dailly <sebastien@dailly.me> | 2025-02-04 22:30:34 +0100 |
|---|---|---|
| committer | Sébastien Dailly <sebastien@dailly.me> | 2025-02-13 18:30:43 +0100 |
| commit | d3e0821b9c1551177afb34220d951b087acdea22 (patch) | |
| tree | ba23b2916c7cb0336cb42793e4bee931053cacf5 /lib/expression/t.ml | |
| parent | 37556ab070abcbf87a1a822c95aeccf19dade687 (diff) | |
Fixed a bug when a group function did not partition in the same way as the uniq parameter
Diffstat (limited to 'lib/expression/t.ml')
| -rw-r--r-- | lib/expression/t.ml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/expression/t.ml b/lib/expression/t.ml index fec8fd7..324d515 100644 --- a/lib/expression/t.ml +++ b/lib/expression/t.ml @@ -6,7 +6,7 @@ type 'a window = | Counter | Previous of 'a | Sum of 'a -[@@deriving show, eq] +[@@deriving show, eq, ord] type 'a t = | Empty @@ -22,7 +22,7 @@ type 'a t = | BOperator of binary_operator * 'a t * 'a t | GEquality of binary_operator * 'a t * 'a t list | Function' of funct * 'a t list -[@@deriving show, eq] +[@@deriving show, eq, ord] and binary_operator = | Equal @@ -34,6 +34,7 @@ and binary_operator = | GT | And | Or +[@@deriving ord] and funct = | Cmp @@ -119,13 +120,13 @@ let rec cmp : ('a -> 'a -> int) -> 'a t -> 'a t -> int = let name_cmp = String.compare n1 n2 in if name_cmp = 0 then List.compare ~cmp:(cmp f) elems1 elems2 else name_cmp | Window (s1, l11, l12), Window (s2, l21, l22) -> ( - match compare s1 s2 with + match compare_window (cmp f) s1 s2 with | 0 -> let l1_cmp = List.compare ~cmp:(cmp f) l11 l21 in if l1_cmp = 0 then List.compare ~cmp:(cmp f) l12 l22 else l1_cmp | other -> other) | BOperator (n1, arg11, arg12), BOperator (n2, arg21, arg22) -> begin - match compare n1 n2 with + match compare_binary_operator n1 n2 with | 0 -> begin match cmp f arg11 arg21 with | 0 -> cmp f arg12 arg22 |