Skip to content

Commit 963efc4

Browse files
author
José Valim
committed
Do not import IEx.Helpers since we delegate to them, closes, closes #957
1 parent cfc21d0 commit 963efc4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/elixir/src/elixir_macros.erl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,8 @@ translate({defmodule, Meta, [Ref, KV]}, S) ->
227227
{ TRef, S }
228228
end,
229229

230-
{ elixir_module:translate(Meta, FRef, Block, FS#elixir_scope{check_clauses=true}), FS };
230+
MS = FS#elixir_scope{check_clauses=true,local=nil},
231+
{ elixir_module:translate(Meta, FRef, Block, MS), FS };
231232

232233
translate({Kind, Meta, [Call]}, S) when ?FUNS(Kind) ->
233234
translate({Kind, Meta, [Call, nil]}, S);

lib/iex/lib/iex/server.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defmodule IEx.Server do
44
def start(config) do
55
IO.puts "Interactive Elixir (#{System.version}) - press Ctrl+C to exit (type h() ENTER for help)"
66
Process.put :iex_history, []
7-
{ _, _, scope } = :elixir.eval('import IEx.Helpers', [], 0, config.scope)
7+
{ _, _, scope } = :elixir.eval('require IEx.Helpers', [], 0, config.scope)
88
do_loop(config.scope(scope))
99
end
1010

0 commit comments

Comments
 (0)