Skip to content

Commit

Permalink
Merge pull request #171 from ariel-anieli/pr-stacktrace
Browse files Browse the repository at this point in the history
Removed unicode_str & fun_stacktrace
  • Loading branch information
ferd authored Mar 13, 2024
2 parents 5de3c80 + f378d3e commit cb39837
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 50 deletions.
6 changes: 1 addition & 5 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
{erl_first_files, ["ec_dictionary", "ec_vsn"]}.

%% Compiler Options ============================================================
{erl_opts,
[{platform_define, "^2", unicode_str},
{platform_define, "^(R|1|20)", fun_stacktrace},
debug_info,
warnings_as_errors]}.
{erl_opts, [debug_info, warnings_as_errors]}.

%% EUnit =======================================================================
{eunit_opts, [verbose,
Expand Down
8 changes: 1 addition & 7 deletions src/ec_date.erl
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ parse(Date, Now) ->
do_parse(Date, Now, []).

do_parse(Date, Now, Opts) ->
case filter_hints(parse(tokenise(uppercase(Date), []), Now, Opts)) of
case filter_hints(parse(tokenise(string:uppercase(Date), []), Now, Opts)) of
{error, bad_date} ->
erlang:throw({?MODULE, {bad_date, Date}});
{D1, T1} = {{Y, M, D}, {H, M1, S}}
Expand Down Expand Up @@ -709,12 +709,6 @@ pad6(X) when is_integer(X) ->
ltoi(X) ->
list_to_integer(X).

-ifdef(unicode_str).
uppercase(Str) -> string:uppercase(Str).
-else.
uppercase(Str) -> string:to_upper(Str).
-endif.

%%%===================================================================
%%% Tests
%%%===================================================================
Expand Down
15 changes: 2 additions & 13 deletions src/ec_git_vsn.erl
Original file line number Diff line number Diff line change
Expand Up @@ -94,22 +94,11 @@ parse_tags(Pattern) ->
"fatal: " ++ _ ->
{undefined, ""};
_ ->
Vsn = slice(Tag, len(Pattern)),
Vsn1 = trim(trim(Vsn, left, "v"), right, "\n"),
Vsn = string:slice(Tag, string:length(Pattern)),
Vsn1 = string:trim(string:trim(Vsn, leading, "v"), trailing, "\n"),
{Tag, Vsn1}
end.

-ifdef(unicode_str).
len(Str) -> string:length(Str).
trim(Str, right, Chars) -> string:trim(Str, trailing, Chars);
trim(Str, left, Chars) -> string:trim(Str, leading, Chars).
slice(Str, Len) -> string:slice(Str, Len).
-else.
len(Str) -> string:len(Str).
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
slice(Str, Len) -> string:substr(Str, Len + 1).
-endif.

-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").

Expand Down
16 changes: 0 additions & 16 deletions src/ec_plists.erl
Original file line number Diff line number Diff line change
Expand Up @@ -858,21 +858,6 @@ cluster_runmany(_, _, [_Non|_Empty], []=_Nodes, []=_Running, _) ->
%% We have data, but no nodes either available or occupied
erlang:exit(allnodescrashed).

-ifdef(fun_stacktrace).
runmany_wrap(Fun, Parent) ->
try
Fun()
catch
exit:siblingdied ->
ok;
exit:Reason ->
Parent ! {erlang:self(), error, Reason};
error:R ->
Parent ! {erlang:self(), error, {R, erlang:get_stacktrace()}};
throw:R ->
Parent ! {erlang:self(), error, {{nocatch, R}, erlang:get_stacktrace()}}
end.
-else.
runmany_wrap(Fun, Parent) ->
try
Fun()
Expand All @@ -886,7 +871,6 @@ runmany_wrap(Fun, Parent) ->
throw:R:Stacktrace ->
Parent ! {erlang:self(), error, {{nocatch, R}, Stacktrace}}
end.
-endif.

delete_running(Pid, [{Pid, Node, List}|Running], Acc) ->
{Running ++ Acc, Node, List};
Expand Down
10 changes: 1 addition & 9 deletions src/ec_talk.erl
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ask_convert(Prompt, TransFun, Type, Default) ->
Default ->
[" (", io_lib:format("~p", [Default]) , ")"]
end, "> "])),
Data = trim(trim(io:get_line(NewPrompt)), both, [$\n]),
Data = string:trim(string:trim(io:get_line(NewPrompt)), both, [$\n]),
Ret = TransFun(Data),
case Ret of
no_data ->
Expand Down Expand Up @@ -197,14 +197,6 @@ get_string(String) ->
no_clue
end.

-ifdef(unicode_str).
trim(Str) -> string:trim(Str).
trim(Str, both, Chars) -> string:trim(Str, both, Chars).
-else.
trim(Str) -> string:strip(Str).
trim(Str, Dir, [Chars|_]) -> string:strip(Str, Dir, Chars).
-endif.

%%%====================================================================
%%% tests
%%%====================================================================
Expand Down

0 comments on commit cb39837

Please sign in to comment.