Skip to content

Return a different error when a comparator is not found #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Return a different error when a comparator is not found #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/routing_tree.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ lookup_binary(<<$/, Rest/bits>>, Comparator, Tree, {Bindings, _}, Ack) ->
{ok, #node_comp{value = Value0}} ->
Tokens = binary:split(Rest, <<"/">>, [global, trim_all]),
{ok, Bindings0, Value0, [Ack | Tokens]};
_ ->
{error, not_found}
Error ->
Error
end;
{ok, Bindings0, SubNode = #node{children = Children}} ->
lookup_binary(Rest, Comparator, Children, {Bindings0, SubNode}, <<>>);
Expand Down Expand Up @@ -206,7 +206,7 @@ insert([{Type, Ident}|Tl], CompNode, Siblings, Options = #{use_strict := UseStri
case Tl of
List when ( List == []) orelse (List == [{segment, <<>>}]) ->
case find_comparator(CompNode#node_comp.comparator, Node#node.value) of
{error, not_found} ->
{error, comparator_not_found} ->
[Node#node{value = [CompNode|Node#node.value], is_binding = Type == binding,
is_wildcard = Type == wildcard} | lists:delete(Node, Siblings)];
{ok, _NodeComp} ->
Expand Down Expand Up @@ -251,7 +251,7 @@ lookup_segment(Ident, Bindings, [_Hd|Tl], WCNode) ->

-spec find_comparator(Comparator :: any(), [#node_comp{}]) -> {ok, Node :: #node_comp{}} |
{error, not_found}.
find_comparator(_, []) -> {error, not_found};
find_comparator(_, []) -> {error, comparator_not_found};
find_comparator(Comparator, [#node_comp{comparator = Comparator}=Node|_Tl]) ->
{ok, Node};
find_comparator(Comparator, [#node_comp{comparator = '_'}=Node|Tl]) ->
Expand Down