Skip to content

perf: prefer recursion over multiple Keyword.has_key? #129

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
mhanberg merged 1 commit into from
Apr 15, 2026
Merged

perf: prefer recursion over multiple Keyword.has_key? #129

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
39 changes: 30 additions & 9 deletions lib/spitfire.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,12 +957,11 @@ defmodule Spitfire do
end
end

defp invalid_assoc_call_meta?(meta) when is_list(meta) do
not Keyword.has_key?(meta, :parens) and
not Keyword.has_key?(meta, :closing) and
not Keyword.has_key?(meta, :delimiter) and
not Keyword.has_key?(meta, :do)
end
defp invalid_assoc_call_meta?([]), do: true

defp invalid_assoc_call_meta?([{key, _value} | _meta]) when key in [:parens, :closing, :delimiter, :do], do: false

defp invalid_assoc_call_meta?([_entry | meta]), do: invalid_assoc_call_meta?(meta)

defp invalid_assoc_key_in_map?({name, meta, args}) when is_atom(name) and is_list(meta) and is_list(args) do
arity = length(args)
Expand Down Expand Up @@ -1034,14 +1033,28 @@ defmodule Spitfire do
defp unparenthesized_do_end_block?(ast) do
case ast do
{_, meta, _} when is_list(meta) ->
Keyword.has_key?(meta, :do) && Keyword.has_key?(meta, :end) &&
not Keyword.has_key?(meta, :parens)
meta_has_do_end_without_parens?(meta)

_ ->
false
end
end

# using recursion here to pass the list only once
defp meta_has_do_end_without_parens?(meta), do: meta_has_do_end_without_parens?(meta, false, false)

defp meta_has_do_end_without_parens?([], has_do, has_end), do: has_do and has_end
defp meta_has_do_end_without_parens?([{:parens, _value} | _meta], _has_do, _has_end), do: false

defp meta_has_do_end_without_parens?([{:do, _value} | meta], _has_do, has_end),
do: meta_has_do_end_without_parens?(meta, true, has_end)

defp meta_has_do_end_without_parens?([{:end, _value} | meta], has_do, _has_end),
do: meta_has_do_end_without_parens?(meta, has_do, true)

defp meta_has_do_end_without_parens?([_entry | meta], has_do, has_end),
do: meta_has_do_end_without_parens?(meta, has_do, has_end)

# An expression is "unmatched" if it contains an unparenthesized do-end block
# anywhere in its AST. Binary operators with an unmatched operand produce
# unmatched expressions.
Expand Down Expand Up @@ -1745,11 +1758,19 @@ defmodule Spitfire do
end

defp has_do_end_block?({_, meta, _}) when is_list(meta) do
Keyword.has_key?(meta, :do) and Keyword.has_key?(meta, :end)
meta_has_do_end?(meta)
end

defp has_do_end_block?(_), do: false

# using recursion here to pass the list only once
defp meta_has_do_end?(meta), do: meta_has_do_end?(meta, false, false)

defp meta_has_do_end?([], has_do, has_end), do: has_do and has_end
defp meta_has_do_end?([{:do, _value} | meta], _has_do, has_end), do: meta_has_do_end?(meta, true, has_end)
defp meta_has_do_end?([{:end, _value} | meta], has_do, _has_end), do: meta_has_do_end?(meta, has_do, true)
defp meta_has_do_end?([_entry | meta], has_do, has_end), do: meta_has_do_end?(meta, has_do, has_end)

@binary_op_types [
:and_op,
:or_op,
Expand Down
Loading