---
src/ec_file.erl | 246 ++++++++++++++++++++++++++--------------------------
src/ec_lists.erl | 138 +++++++++++++++---------------
src/ec_plists.erl | 126 ++++++++++++++--------------
src/ec_semver.erl | 26 +++---
src/ec_string.erl | 22 +++---
5 files changed, 279 insertions(+), 279 deletions(-)
diff --git a/src/ec_file.erl b/src/ec_file.erl
index 3956f6c..15f9f54 100644
--- a/src/ec_file.erl
+++ b/src/ec_file.erl
@@ -7,38 +7,38 @@
-module(ec_file).
-export([
- copy/2,
- copy/3,
- mkdtemp/0,
- mkdir_path/1,
- find/2,
- is_symlink/1,
- remove/1,
- remove/2,
- md5sum/1,
- read/1,
- write/2,
- write_term/2,
- consult/1
- ]).
+ copy/2,
+ copy/3,
+ mkdtemp/0,
+ mkdir_path/1,
+ find/2,
+ is_symlink/1,
+ remove/1,
+ remove/2,
+ md5sum/1,
+ read/1,
+ write/2,
+ write_term/2,
+ consult/1
+ ]).
-export_type([
- path/0,
- option/0
- ]).
+ path/0,
+ option/0
+ ]).
-include_lib("kernel/include/file.hrl").
%% User friendly exception message (remove line and module info once we
%% get them in stack traces)
-define(UEX(Exception, UMSG, UVARS),
- {uex, {?MODULE,
- ?LINE,
- Exception,
- lists:flatten(io_lib:fwrite(UMSG, UVARS))}}).
+ {uex, {?MODULE,
+ ?LINE,
+ Exception,
+ lists:flatten(io_lib:fwrite(UMSG, UVARS))}}).
-define(CHECK_PERMS_MSG,
- "Try checking that you have the correct permissions and try again~n").
+ "Try checking that you have the correct permissions and try again~n").
%%============================================================================
%% Types
@@ -55,20 +55,20 @@ copy(From, To, []) ->
copy(From, To);
copy(From, To, [recursive] = Options) ->
case filelib:is_dir(From) of
- false ->
- copy(From, To);
- true ->
- make_dir_if_dir(To),
- copy_subfiles(From, To, Options)
+ false ->
+ copy(From, To);
+ true ->
+ make_dir_if_dir(To),
+ copy_subfiles(From, To, Options)
end.
%% @doc copy a file including timestamps,ownership and mode etc.
-spec copy(From::string(), To::string()) -> ok.
copy(From, To) ->
try
- ec_file_copy(From, To)
+ ec_file_copy(From, To)
catch
- _C:E -> throw(?UEX({copy_failed, E}, ?CHECK_PERMS_MSG, []))
+ _C:E -> throw(?UEX({copy_failed, E}, ?CHECK_PERMS_MSG, []))
end.
%% @doc return an md5 checksum string or a binary. Same as unix utility of
@@ -84,9 +84,9 @@ md5sum(Value) ->
-spec remove(path(), Options::[option()]) -> ok | {error, Reason::term()}.
remove(Path, Options) ->
try
- ok = ec_file_remove(Path, Options)
+ ok = ec_file_remove(Path, Options)
catch
- _C:E -> throw(?UEX({remove_failed, E}, ?CHECK_PERMS_MSG, []))
+ _C:E -> throw(?UEX({remove_failed, E}, ?CHECK_PERMS_MSG, []))
end.
%% @doc delete a file.
@@ -98,10 +98,10 @@ remove(Path) ->
-spec is_symlink(path()) -> boolean().
is_symlink(Path) ->
case file:read_link_info(Path) of
- {ok, #file_info{type = symlink}} ->
- true;
- _ ->
- false
+ {ok, #file_info{type = symlink}} ->
+ true;
+ _ ->
+ false
end.
@@ -111,27 +111,27 @@ is_symlink(Path) ->
mkdtemp() ->
UniqueNumber = integer_to_list(element(3, now())),
TmpDirPath =
- filename:join([tmp(), lists:flatten([".tmp_dir", UniqueNumber])]),
+ filename:join([tmp(), lists:flatten([".tmp_dir", UniqueNumber])]),
try
- ok = mkdir_path(TmpDirPath),
- TmpDirPath
+ ok = mkdir_path(TmpDirPath),
+ TmpDirPath
catch
- _C:E -> throw(?UEX({mkdtemp_failed, E}, ?CHECK_PERMS_MSG, []))
+ _C:E -> throw(?UEX({mkdtemp_failed, E}, ?CHECK_PERMS_MSG, []))
end.
%% @doc Makes a directory including parent dirs if they are missing.
-spec mkdir_path(path()) -> ok.
mkdir_path(Path) ->
- % We are exploiting a feature of ensuredir that that creates all
- % directories up to the last element in the filename, then ignores
- % that last element. This way we ensure that the dir is created
- % and not have any worries about path names
+ % We are exploiting a feature
of ensuredir that that creates all
+ % directories up to the last
element in the filename, then ignores
+ % that last element. This way
we ensure that the dir is created
+ % and not have any worries
about path names
DirName = filename:join([filename:absname(Path), "tmp"]),
try
- ok = filelib:ensure_dir(DirName)
+ ok = filelib:ensure_dir(DirName)
catch
- _C:E -> throw(?UEX({mkdir_path_failed, E}, ?CHECK_PERMS_MSG, []))
+ _C:E -> throw(?UEX({mkdir_path_failed, E}, ?CHECK_PERMS_MSG, []))
end.
@@ -140,43 +140,43 @@ mkdir_path(Path) ->
-spec consult(FilePath::path()) -> term().
consult(FilePath) ->
case file:consult(FilePath) of
- {ok, [Term]} ->
- Term;
- {error, Error} ->
- Msg = "The file at ~p~n" ++
- "is either not a valid Erlang term, does not to exist~n" ++
- "or you lack the permissions to read it. Please check~n" ++
- "to see if the file exists and that it has the correct~n" ++
- "permissions~n",
- throw(?UEX({failed_to_consult_file, {FilePath, Error}},
- Msg, [FilePath]))
+ {ok, [Term]} ->
+ Term;
+ {error, Error} ->
+ Msg = "The file at ~p~n" ++
+ "is either not a valid Erlang term, does not to exist~n" ++
+ "or you lack the permissions to read it. Please check~n" ++
+ "to see if the file exists and that it has the correct~n" ++
+ "permissions~n",
+ throw(?UEX({failed_to_consult_file, {FilePath, Error}},
+ Msg, [FilePath]))
end.
%% @doc read a file from the file system. Provide UEX exeption on failure.
-spec read(FilePath::string()) -> binary().
read(FilePath) ->
try
- {ok, FileBin} = file:read_file(FilePath),
- FileBin
+ {ok, FileBin} = file:read_file(FilePath),
+ FileBin
catch
- _C:E -> throw(?UEX({read_failed, {FilePath, E}},
- "Read failed for the file ~p with ~p~n" ++
- ?CHECK_PERMS_MSG,
- [FilePath, E]))
+ _C:E -> throw(?UEX({read_failed, {FilePath, E}},
+ "Read failed for the file ~p with ~p~n" ++
+ ?CHECK_PERMS_MSG,
+ [FilePath, E]))
end.
%% @doc write a file to the file system. Provide UEX exeption on failure.
-spec write(FileName::string(), Contents::string()) -> ok.
write(FileName, Contents) ->
case file:write_file(FileName, Contents) of
- ok ->
- ok;
- {error, Reason} ->
- Msg = "Writing the file ~s to disk failed with reason ~p.~n" ++
- ?CHECK_PERMS_MSG,
- throw(?UEX({write_file_failure, {FileName, Reason}},
- Msg,
- [FileName, Reason]))
+ ok ->
+ ok;
+ {error, Reason} ->
+ Msg = "Writing the file ~s to disk failed with reason ~p.~n" ++
+ ?CHECK_PERMS_MSG,
+ throw(?UEX({write_file_failure, {FileName, Reason}},
+ Msg,
+ [FileName, Reason]))
end.
%% @doc write a term out to a file so that it can be consulted later.
@@ -191,18 +191,18 @@ find([], _) ->
[];
find(FromDir, TargetPattern) ->
case filelib:is_dir(FromDir) of
- false ->
- case re:run(FromDir, TargetPattern) of
- {match, _} -> [FromDir];
- _ -> []
- end;
- true ->
- FoundDir = case re:run(FromDir, TargetPattern) of
- {match, _} -> [FromDir];
- _ -> []
- end,
- List = find_in_subdirs(FromDir, TargetPattern),
- FoundDir ++ List
+ false ->
+ case re:run(FromDir, TargetPattern) of
+ {match, _} -> [FromDir];
+ _ -> []
+ end;
+ true ->
+ FoundDir = case re:run(FromDir, TargetPattern) of
+ {match, _} -> [FromDir];
+ _ -> []
+ end,
+ List = find_in_subdirs(FromDir, TargetPattern),
+ FoundDir ++ List
end.
%%%===================================================================
%%% Internal Functions
@@ -210,53 +210,53 @@ find(FromDir, TargetPattern) ->
-spec find_in_subdirs(path(), string()) -> [path()].
find_in_subdirs(FromDir, TargetPattern) ->
lists:foldl(fun(CheckFromDir, Acc)
- when CheckFromDir == FromDir ->
- Acc;
- (ChildFromDir, Acc) ->
- case find(ChildFromDir, TargetPattern) of
- [] -> Acc;
- Res -> Res ++ Acc
- end
- end,
- [],
- filelib:wildcard(filename:join(FromDir, "*"))).
+ when CheckFromDir == FromDir ->
+ Acc;
+ (ChildFromDir, Acc) ->
+ case find(ChildFromDir, TargetPattern) of
+ [] -> Acc;
+ Res -> Res ++ Acc
+ end
+ end,
+ [],
+ filelib:wildcard(filename:join(FromDir, "*"))).
-spec ec_file_remove(path(), [{atom(), any()}]) -> ok.
ec_file_remove(Path, Options) ->
case lists:member(recursive, Options) of
- false -> file:delete(Path);
- true -> remove_recursive(Path, Options)
+ false -> file:delete(Path);
+ true -> remove_recursive(Path, Options)
end.
-spec remove_recursive(path(), Options::list()) -> ok.
remove_recursive(Path, Options) ->
case filelib:is_dir(Path) of
- false ->
- file:delete(Path);
- true ->
- lists:foreach(fun(ChildPath) ->
- remove_recursive(ChildPath, Options)
- end, filelib:wildcard(filename:join(Path, "*"))),
- ok = file:del_dir(Path)
+ false ->
+ file:delete(Path);
+ true ->
+ lists:foreach(fun(ChildPath) ->
+ remove_recursive(ChildPath, Options)
+ end, filelib:wildcard(filename:join(Path, "*"))),
+ ok = file:del_dir(Path)
end.
-spec tmp() -> path().
tmp() ->
case erlang:system_info(system_architecture) of
- "win32" ->
- "./tmp";
- _SysArch ->
- "/tmp"
+ "win32" ->
+ "./tmp";
+ _SysArch ->
+ "/tmp"
end.
%% Copy the subfiles of the From directory to the to directory.
-spec copy_subfiles(path(), path(), [option()]) -> ok.
copy_subfiles(From, To, Options) ->
Fun =
- fun(ChildFrom) ->
- ChildTo = filename:join([To, filename:basename(ChildFrom)]),
- copy(ChildFrom, ChildTo, Options)
- end,
+ fun(ChildFrom) ->
+ ChildTo = filename:join([To, filename:basename(ChildFrom)]),
+ copy(ChildFrom, ChildTo, Options)
+ end,
lists:foreach(Fun, filelib:wildcard(filename:join(From, "*"))).
-spec ec_file_copy(path(), path()) -> ok.
@@ -268,8 +268,8 @@ ec_file_copy(From, To) ->
-spec make_dir_if_dir(path()) -> ok.
make_dir_if_dir(File) ->
case filelib:is_dir(File) of
- true -> ok;
- false -> ok = mkdir_path(File)
+ true -> ok;
+ false -> ok = mkdir_path(File)
end.
%% @doc convert a list of integers into hex.
@@ -298,10 +298,10 @@ hex0(I) -> $0 + I.
setup_test() ->
case filelib:is_dir("/tmp/ec_file") of
- true ->
- remove("/tmp/ec_file", [recursive]);
- false ->
- ok
+ true ->
+ remove("/tmp/ec_file", [recursive]);
+ false ->
+ ok
end,
mkdir_path("/tmp/ec_file/dir"),
?assertMatch(false, is_symlink("/tmp/ec_file/dir")),
@@ -318,8 +318,8 @@ file_test() ->
?assertMatch("term", consult(TermFile)),
?assertMatch(<<"\"term\". ">>, read(TermFile)),
copy(filename:dirname(TermFile),
- filename:dirname(TermFileCopy),
- [recursive]),
+ filename:dirname(TermFileCopy),
+ [recursive]),
?assertMatch("term", consult(TermFileCopy)).
teardown_test() ->
@@ -343,18 +343,18 @@ setup_base_and_target() ->
{BaseDir, SourceDir, {Name1, Name2, Name3, NoName}}.
find_test() ->
- % Create a directory in /tmp for the test. Clean everything afterwards
+ % Create a directory in /tmp
for the test. Clean everything afterwards
{setup,
fun setup_base_and_target/0,
fun ({BaseDir, _, _}) ->
- ewl_file:delete_dir(BaseDir)
+ ewl_file:delete_dir(BaseDir)
end,
fun ({BaseDir, _, {Name1, Name2, Name3, _}}) ->
- ?assertMatch([Name2,
- Name3,
- Name1],
- ewl_file:find(BaseDir, "file[a-z]+\$"))
- end}.
+ ?assertMatch([Name2,
+ Name3,
+ Name1],
+ ewl_file:find(BaseDir, "file[a-z]+\$"))
+ end}.
-endif.
diff --git a/src/ec_lists.erl b/src/ec_lists.erl
index b80b700..1545eeb 100644
--- a/src/ec_lists.erl
+++ b/src/ec_lists.erl
@@ -42,10 +42,10 @@ search(_, []) ->
-spec find(fun(), list()) -> {ok, term()} | error.
find(Fun, [Head|Tail]) when is_function(Fun) ->
case Fun(Head) of
- true ->
- {ok, Head};
- false ->
- find(Fun, Tail)
+ true ->
+ {ok, Head};
+ false ->
+ find(Fun, Tail)
end;
find(_Fun, []) ->
error.
@@ -57,10 +57,10 @@ find(_Fun, []) ->
-spec fetch(fun(), list()) -> term().
fetch(Fun, List) when is_list(List), is_function(Fun) ->
case find(Fun, List) of
- {ok, Head} ->
- Head;
- error ->
- throw(not_found)
+ {ok, Head} ->
+ Head;
+ error ->
+ throw(not_found)
end.
%%%===================================================================
@@ -73,60 +73,60 @@ fetch(Fun, List) when is_list(List), is_function(Fun) ->
find1_test() ->
TestData = [1, 2, 3, 4, 5, 6],
Result = find(fun(5) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch({ok, 5}, Result),
Result2 = find(fun(37) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch(error, Result2).
find2_test() ->
TestData = ["one", "two", "three", "four", "five", "six"],
Result = find(fun("five") ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch({ok, "five"}, Result),
Result2 = find(fun(super_duper) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch(error, Result2).
find3_test() ->
TestData = [{"one", 1}, {"two", 2}, {"three", 3}, {"four", 5}, {"five", 5},
- {"six", 6}],
+ {"six", 6}],
Result = find(fun({"one", 1}) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch({ok, {"one", 1}}, Result),
Result2 = find(fun([fo, bar, baz]) ->
- true;
- ({"onehundred", 100}) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ ({"onehundred", 100}) ->
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch(error, Result2).
@@ -134,48 +134,48 @@ find3_test() ->
fetch1_test() ->
TestData = [1, 2, 3, 4, 5, 6],
Result = fetch(fun(5) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch(5, Result),
?assertThrow(not_found,
- fetch(fun(37) ->
- true;
- (_) ->
- false
- end,
- TestData)).
+ fetch(fun(37) ->
+ true;
+ (_) ->
+ false
+ end,
+ TestData)).
fetch2_test() ->
TestData = ["one", "two", "three", "four", "five", "six"],
Result = fetch(fun("five") ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch("five", Result),
?assertThrow(not_found,
- fetch(fun(super_duper) ->
- true;
- (_) ->
- false
- end,
- TestData)).
+ fetch(fun(super_duper) ->
+ true;
+ (_) ->
+ false
+ end,
+ TestData)).
fetch3_test() ->
TestData = [{"one", 1}, {"two", 2}, {"three", 3}, {"four", 5}, {"five", 5},
- {"six", 6}],
+ {"six", 6}],
Result = fetch(fun({"one", 1}) ->
- true;
- (_) ->
- false
- end,
- TestData),
+ true;
+ (_) ->
+ false
+ end,
+ TestData),
?assertMatch({"one", 1}, Result),
?assertThrow(not_found,
diff --git a/src/ec_plists.erl b/src/ec_plists.erl
index 943e424..b7b9260 100644
--- a/src/ec_plists.erl
+++ b/src/ec_plists.erl
@@ -69,14 +69,14 @@ filter(Fun, List, Timeout) ->
run_list_fun_in_parallel(ListFun, Fun, List, Timeout) ->
LocalPid = self(),
Pids =
- lists:map(fun(E) ->
- Pid =
- proc_lib:spawn(fun() ->
- wait(LocalPid, Fun,
- E, Timeout)
- end),
- {Pid, E}
- end, List),
+ lists:map(fun(E) ->
+ Pid =
+ proc_lib:spawn(fun() ->
+ wait(LocalPid, Fun,
+ E, Timeout)
+ end),
+ {Pid, E}
+ end, List),
gather(ListFun, Pids).
-spec wait(pid(), fun(), any(), integer()) -> any().
@@ -110,13 +110,13 @@ gather(filter, PidElementList) ->
map_gather([{Pid, _E} | Rest]) ->
receive
{Pid, {value, Ret}} ->
- [Ret|map_gather(Rest)];
- % timeouts fall here too. Should timeouts be a return value
- % or an exception? I lean toward return value, but the code
- % is easier with the exception. Thoughts?
+ [Ret|map_gather(Rest)];
+ % timeouts fall here too.
Should timeouts be a return value
+ % or an exception? I lean
toward return value, but the code
+ % is easier with the
exception. Thoughts?
{Pid, Exception} ->
- killall(Rest),
- throw(Exception)
+ killall(Rest),
+ throw(Exception)
end;
map_gather([]) ->
[].
@@ -133,15 +133,15 @@ ftmap_gather([]) ->
filter_gather([{Pid, E} | Rest]) ->
receive
{Pid, {value, false}} ->
- filter_gather(Rest);
+ filter_gather(Rest);
{Pid, {value, true}} ->
- [E|filter_gather(Rest)];
+ [E|filter_gather(Rest)];
{Pid, {value, NotBool}} ->
- killall(Rest),
- throw({bad_return_value, NotBool});
+ killall(Rest),
+ throw({bad_return_value, NotBool});
{Pid, Exception} ->
- killall(Rest),
- throw(Exception)
+ killall(Rest),
+ throw(Exception)
end;
filter_gather([]) ->
[].
@@ -153,9 +153,9 @@ do_f(Parent, F, E) ->
Parent ! {self(), {value, Result}}
catch
_Class:Exception ->
- % Losing class info here, but since throw does not accept
- % that arg anyhow and forces a class of throw it does not
- % matter.
+ % Losing class info here, but
since throw does not accept
+ % that arg anyhow and forces a
class of throw it does not
+ % matter.
Parent ! {self(), Exception}
end.
@@ -183,9 +183,9 @@ map_good_test() ->
ftmap_good_test() ->
Results = ftmap(fun(_) ->
- ok
- end,
- lists:seq(1, 3), infinity),
+ ok
+ end,
+ lists:seq(1, 3), infinity),
?assertMatch([{value, ok}, {value, ok}, {value, ok}],
Results).
@@ -199,59 +199,59 @@ filter_good_test() ->
map_timeout_test() ->
Results =
- try
- map(fun(T) ->
- timer:sleep(T),
- T
- end,
- [1, 100], 10)
- catch
- C:E -> {C, E}
- end,
+ try
+ map(fun(T) ->
+ timer:sleep(T),
+ T
+ end,
+ [1, 100], 10)
+ catch
+ C:E -> {C, E}
+ end,
?assertMatch({throw, timeout}, Results).
ftmap_timeout_test() ->
Results = ftmap(fun(X) ->
- timer:sleep(X),
- true
- end,
- [100, 1], 10),
+ timer:sleep(X),
+ true
+ end,
+ [100, 1], 10),
?assertMatch([timeout, {value, true}], Results).
filter_timeout_test() ->
Results =
- try
- filter(fun(T) ->
- timer:sleep(T),
- T == 1
- end,
- [1, 100], 10)
- catch
- C:E -> {C, E}
- end,
+ try
+ filter(fun(T) ->
+ timer:sleep(T),
+ T == 1
+ end,
+ [1, 100], 10)
+ catch
+ C:E -> {C, E}
+ end,
?assertMatch({throw, timeout}, Results).
map_bad_test() ->
Results =
- try
- map(fun(_) ->
- throw(test_exception)
- end,
- lists:seq(1, 5), infinity)
- catch
- C:E -> {C, E}
- end,
+ try
+ map(fun(_) ->
+ throw(test_exception)
+ end,
+ lists:seq(1, 5), infinity)
+ catch
+ C:E -> {C, E}
+ end,
?assertMatch({throw, test_exception}, Results).
ftmap_bad_test() ->
Results =
- ftmap(fun(2) ->
- throw(test_exception);
- (N) ->
- N
- end,
- lists:seq(1, 5), infinity),
+ ftmap(fun(2) ->
+ throw(test_exception);
+ (N) ->
+ N
+ end,
+ lists:seq(1, 5), infinity),
?assertMatch([{value, 1}, test_exception, {value, 3},
- {value, 4}, {value, 5}] , Results).
+ {value, 4}, {value, 5}] , Results).
-endif.
diff --git a/src/ec_semver.erl b/src/ec_semver.erl
index 0fc7a59..77b43cd 100644
--- a/src/ec_semver.erl
+++ b/src/ec_semver.erl
@@ -8,12 +8,12 @@
-module(ec_semver).
-exports([
- compare/2
- ]).
+ compare/2
+ ]).
-export_type([
- semvar/0
- ]).
+ semvar/0
+ ]).
%%%===================================================================
%%% Public Types
@@ -21,9 +21,9 @@
-type semvar() :: string().
-type parsed_semvar() :: {MajorVsn::string(),
- MinorVsn::string(),
- PatchVsn::string(),
- PathString::string()}.
+ MinorVsn::string(),
+ PatchVsn::string(),
+ PathString::string()}.
%%%===================================================================
%%% API
@@ -48,13 +48,13 @@ tokens(Vsn) ->
{MajorVsn, MinorVsn, PatchVsn, PatchString}.
-spec split_patch(string()) ->
- {PatchVsn::string(), PatchStr::string()}.
+ {PatchVsn::string(), PatchStr::string()}.
split_patch(RawPatch) ->
{PatchVsn, PatchStr} = split_patch(RawPatch, {"", ""}),
{lists:reverse(PatchVsn), PatchStr}.
-spec split_patch(string(), {AccPatchVsn::string(), AccPatchStr::string()}) ->
- {PatchVsn::string(), PatchStr::string()}.
+ {PatchVsn::string(), PatchStr::string()}.
split_patch([], Acc) ->
Acc;
split_patch([Dig|T], {PatchVsn, PatchStr}) when Dig >= $0 andalso Dig =< $9 ->
@@ -65,7 +65,7 @@ split_patch(PatchStr, {PatchVsn, ""}) ->
-spec compare_toks(parsed_semvar(), parsed_semvar()) -> boolean().
compare_toks({MajA, MinA, PVA, PSA}, {MajB, MinB, PVB, PSB}) ->
compare_toks2({to_int(MajA), to_int(MinA), to_int(PVA), PSA},
- {to_int(MajB), to_int(MinB), to_int(PVB), PSB}).
+ {to_int(MajB), to_int(MinB), to_int(PVB), PSB}).
-spec compare_toks2(parsed_semvar(), parsed_semvar()) -> boolean().
compare_toks2({MajA, _MinA, _PVA, _PSA}, {MajB, _MinB, _PVB, _PSB})
@@ -89,10 +89,10 @@ compare_toks2(_ToksA, _ToksB) ->
-spec to_int(string()) -> integer().
to_int(String) ->
try
- list_to_integer(String)
+ list_to_integer(String)
catch
- error:badarg ->
- throw(invalid_semver_string)
+ error:badarg ->
+ throw(invalid_semver_string)
end.
%%%===================================================================
diff --git a/src/ec_string.erl b/src/ec_string.erl
index 2e87e39..2a06257 100644
--- a/src/ec_string.erl
+++ b/src/ec_string.erl
@@ -7,8 +7,8 @@
-module(ec_string).
-export([
- compare_versions/2
- ]).
+ compare_versions/2
+ ]).
%%%===================================================================
%%% API
%%%===================================================================
@@ -39,7 +39,7 @@ compare([Str|TA], [Str|TB]) ->
compare(TA, TB);
compare([StrA|TA], [StrB|TB]) ->
fine_compare(split_numeric_alpha(StrA), TA,
- split_numeric_alpha(StrB), TB);
+ split_numeric_alpha(StrB), TB);
compare([], [Str]) ->
not compare_against_nothing(Str);
compare([Str], []) ->
@@ -54,14 +54,14 @@ compare([], []) ->
-spec compare_against_nothing(string()) -> boolean().
compare_against_nothing(Str) ->
case split_numeric_alpha(Str) of
- {_StrDig, ""} -> true;
- {"", _StrAlpha} -> false;
- {_StrDig, _StrAlpha} -> true
+ {_StrDig, ""} -> true;
+ {"", _StrAlpha} -> false;
+ {_StrDig, _StrAlpha} -> true
end.
-spec fine_compare({string(), string()}, string(),
- {string(), string()}, string()) ->
- boolean().
+ {string(), string()}, string()) ->
+ boolean().
fine_compare({_StrDigA, StrA}, TA, {_StrDigB, _StrB}, _TB)
when StrA /= "", TA /= [] ->
throw(invalid_version_string);
@@ -84,14 +84,14 @@ fine_compare({StrDigA, _StrA}, _TA, {StrDigB, _StrB}, _TB)
->
%% In the case of a version sub part with a numeric then an alpha,
%% split out the numeric and alpha "24alpha" becomes {"24", "alpha"}
-spec split_numeric_alpha(string()) ->
- {PatchVsn::string(), PatchStr::string()}.
+ {PatchVsn::string(), PatchStr::string()}.
split_numeric_alpha(RawVsn) ->
{Num, Str} = split_numeric_alpha(RawVsn, {"", ""}),
{lists:reverse(Num), Str}.
-spec split_numeric_alpha(string(), {PatchVsnAcc::string(),
- PatchStrAcc::string()}) ->
- {PatchVsn::string(), PatchStr::string()}.
+ PatchStrAcc::string()}) ->
+ {PatchVsn::string(), PatchStr::string()}.
split_numeric_alpha([], Acc) ->
Acc;
split_numeric_alpha([Dig|T], {PatchVsn, PatchStr})
--
1.7.6.4
--
You received this message because you are subscribed to the Google Groups
"erlware-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/erlware-dev?hl=en.
