Browse Source

Make sure to cover all edge cases when parsing module names

pull/3/head
Dave Smith 15 years ago
parent
commit
a0732e9e78
1 changed files with 13 additions and 6 deletions
  1. +13
    -6
      src/rebar_erlc_compiler.erl

+ 13
- 6
src/rebar_erlc_compiler.erl View File

@ -106,13 +106,20 @@ inspect(Source, IncludePath) ->
-spec inspect_epp(Epp::pid(), Module::string(), Includes::[string()]) -> {string(), [string()]}.
inspect_epp(Epp, Module, Includes) ->
case epp:parse_erl_form(Epp) of
{ok, {attribute, _, module, ActualModule}} ->
%% If the module name includes package info, we get a list of atoms...
case is_list(ActualModule) of
true ->
{ok, {attribute, _, module, ModInfo}} ->
case ModInfo of
%% Typical module name, single atom
ActualModule when is_atom(ActualModule) ->
ActualModuleStr = atom_to_list(ActualModule);
%% Packag-ized module name, list of atoms
ActualModule when is_list(ActualModule) ->
ActualModuleStr = string:join([atom_to_list(P) || P <- ActualModule], ".");
false ->
ActualModuleStr = atom_to_list(ActualModule)
%% Parameterized module name, single atom
{ActualModule, _} when is_atom(ActualModule) ->
ActualModuleStr = atom_to_list(ActualModule);
%% Parameterized and packagized module name, list of atoms
{ActualModule, _} when is_list(ActualModule) ->
ActualModuleStr = string:join([atom_to_list(P) || P <- ActualModule], ".")
end,
inspect_epp(Epp, ActualModuleStr, Includes);
{ok, {attribute, 1, file, {Module, 1}}} ->

Loading…
Cancel
Save