diff options
| author | Björn Gustavsson <[email protected]> | 2014-02-07 12:08:10 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-02-07 12:08:10 +0100 |
| commit | 75c490066bd84f531eea8fed118540a358042812 (patch) | |
| tree | 2fa64c286280a5d5777aac2584b47883268d2afd /lib/debugger/src | |
| parent | 243ebeb5366a79180146eef8680a3909d340a1ca (diff) | |
| parent | fe6403dcdba3e8655a258bf0be2ee6a24777faa9 (diff) | |
| download | otp-75c490066bd84f531eea8fed118540a358042812.tar.gz otp-75c490066bd84f531eea8fed118540a358042812.tar.bz2 otp-75c490066bd84f531eea8fed118540a358042812.zip | |
Merge branch 'vladdu/debugger/fixes'
* vladdu/debugger/fixes:
remove warning for variable exported from case
remove useless match
remove unused parameter
Diffstat (limited to 'lib/debugger/src')
| -rw-r--r-- | lib/debugger/src/dbg_ieval.erl | 10 | ||||
| -rw-r--r-- | lib/debugger/src/int.erl | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/debugger/src/dbg_ieval.erl b/lib/debugger/src/dbg_ieval.erl index 2080643bb9..d1d52a39ca 100644 --- a/lib/debugger/src/dbg_ieval.erl +++ b/lib/debugger/src/dbg_ieval.erl @@ -505,12 +505,12 @@ lambda(Fun, As) when is_function(Fun) -> %% ... and the fun was defined in interpreted code {module, ?MODULE} -> - {Mod,Name,Bs} = + {Mod,Name,Bs, Cs} = case erlang:fun_info(Fun, env) of - {env,[{{M,F},Bs0,Cs}]} -> - {M,F,Bs0}; - {env,[{{M,F},Bs0,Cs,FName}]} -> - {M,F,add_binding(FName, Fun, Bs0)} + {env,[{{M,F},Bs0,Cs0}]} -> + {M,F,Bs0, Cs0}; + {env,[{{M,F},Bs0,Cs0,FName}]} -> + {M,F,add_binding(FName, Fun, Bs0), Cs0} end, {arity, Arity} = erlang:fun_info(Fun, arity), if diff --git a/lib/debugger/src/int.erl b/lib/debugger/src/int.erl index bdd671cff1..2755db64b8 100644 --- a/lib/debugger/src/int.erl +++ b/lib/debugger/src/int.erl @@ -630,14 +630,13 @@ find_beam(Mod, Src) -> File = filename:join(SrcDir, BeamFile), case is_file(File) of true -> File; - false -> find_beam_1(Mod, BeamFile, SrcDir) + false -> find_beam_1(BeamFile, SrcDir) end. -find_beam_1(Mod, BeamFile, SrcDir) -> +find_beam_1(BeamFile, SrcDir) -> RootDir = filename:dirname(SrcDir), EbinDir = filename:join(RootDir, "ebin"), CodePath = [EbinDir | code:get_path()], - BeamFile = atom_to_list(Mod) ++ code:objfile_extension(), lists:foldl(fun(_, Beam) when is_list(Beam) -> Beam; (Dir, error) -> File = filename:join(Dir, BeamFile), |