WIP

Author: chrzaszcz

src/tr.erl

@@ -33,7 +33,7 @@
          call_stat/1, call_stat/2]).
 
 %% API - utilities
--export([contains_data/2,
+-export([match_data/2, contains_data/2, contains_val/2, match_val/2,
          do/1,
          lookup/1,
          next/1, seq_next/1, next/2, prev/1, seq_prev/1, prev/2, 
@@ -504,10 +504,36 @@ call_stat(KeyF, Tab) ->
 %% @doc Looks for `DataVal' in `#tr.data'.
 %%
 %% `DataVal' can occur in (possibly nested) tuples, maps or lists.
+-spec match_data(fun((term()) -> boolean()), tr()) -> boolean().
+match_data(Pred, #tr{data = Data}) when is_function(Pred, 1) ->
+    match_val(Pred, Data).
+
 -spec contains_data(term(), tr()) -> boolean().
 contains_data(DataVal, #tr{data = Data}) ->
     contains_val(DataVal, Data).
 
+-spec match_val(fun((term()) -> boolean()), term()) -> boolean().
+match_val(Pred, Val) ->
+    case catch Pred(Val) of
+        true ->
+            true;
+        _ ->
+            case Val of
+                [_|_] ->
+                    lists:any(fun(El) -> match_val(Pred, El) end, Val);
+                _ when is_tuple(Val) ->
+                    match_val(Pred, tuple_to_list(Val));
+                #{} when map_size(Val) > 0 ->
+                    match_val(Pred, maps:to_list(Val));
+                _ ->
+                    false
+            end
+    end.
+
+-spec contains_val(term(), term()) -> boolean().
+contains_val(DataVal, Data) ->
+    match_val(fun(Val) -> Val =:= DataVal end, Data).
+
 %% @doc Executes the function call for the provided `t:tr()' record or index.
 -spec do(tr()) -> term().
 do(Index) when is_integer(Index) ->
@@ -701,9 +727,7 @@ create_tab(Tab) ->
 select(_MS, _DataVal, DataAcc, '$end_of_table') ->
     lists:append(lists:reverse(DataAcc));
 select(MS, DataVal, DataAcc, {Matched, Cont}) ->
-    Filtered = lists:filter(fun(#tr{data = Data}) -> contains_val(DataVal, Data);
-                               (T) -> contains_val(DataVal, T)
-                            end, Matched),
+    Filtered = lists:filter(fun(T) -> contains_data(DataVal, T) end, Matched),
     SelectRes = ets:select(Cont),
     select(MS, DataVal, [Filtered | DataAcc], SelectRes).
 
@@ -713,12 +737,6 @@ filter_trace(F, T, State) ->
         _ -> State
     end.
 
-contains_val(DataVal, DataVal) -> true;
-contains_val(DataVal, L) when is_list(L) -> lists:any(fun(El) -> contains_val(DataVal, El) end, L);
-contains_val(DataVal, T) when is_tuple(T) -> contains_val(DataVal, tuple_to_list(T));
-contains_val(DataVal, M) when is_map(M) -> contains_val(DataVal, maps:to_list(M));
-contains_val(_, _) -> false.
-
 index(Tab) ->
     case ets:last(Tab) of
         I when is_integer(I) -> I + 1;