Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions lib/elixir/lib/code.ex
Original file line number Diff line number Diff line change
Expand Up @@ -621,11 +621,17 @@ defmodule Code do
def eval_string(string, binding \\ [], opts \\ [])

def eval_string(string, binding, %Macro.Env{} = env) do
validated_eval_string(string, binding, env)
validated_eval_string(string, validate_binding(binding), env)
end

def eval_string(string, binding, opts) when is_list(opts) do
validated_eval_string(string, binding, opts)
validated_eval_string(string, validate_binding(binding), opts)
end

defp validate_binding(binding) when is_list(binding), do: binding

defp validate_binding(binding) do
raise ArgumentError, "binding must be a list, got: #{inspect(binding)}"
end

defp validated_eval_string(string, binding, opts_or_env) do
Expand Down
10 changes: 10 additions & 0 deletions lib/elixir/test/elixir/code_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,16 @@ defmodule CodeTest do
{"1", [{:c, 2}, {:b, "1"}, {:a, 1}]}
end

test "raises on invalid binding type" do
assert_raise ArgumentError, "binding must be a list, got: :not_a_list", fn ->
Code.eval_string("1 + 1", :not_a_list)
end

assert_raise ArgumentError, "binding must be a list, got: %{}", fn ->
Code.eval_string("1 + 1", %{}, __ENV__)
end
end

test "keeps caller in stacktrace" do
try do
Code.eval_string("<<a::size(b)>>", [a: :a, b: :b], file: "myfile")
Expand Down
Loading