fix: remove catch (#43)

* fix: remove catch

Author: kivra-hennys

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     name: OTP ${{matrix.otp}}
     strategy:
       matrix:
-        otp: ["24.0", "25.0", "26.0", "27.0"]
+        otp: ["26.0", "27.0"]
     steps:
     - uses: actions/checkout@v2.0.0
     - uses: erlef/setup-beam@v1.18.0

README.md

@@ -25,26 +25,17 @@ Manifest
     * time.hrl           -- Macros and type aliases related to time and date.
 * src/:
     * s2_atoms.erl       -- Atom-related utilities.
-    * s2_csets.erl       -- Counting sets.
     * s2_env.erl         -- Environment access and setup.
-    * s2_export.erl      -- Export unexported functions from the REPL.
-    * s2_fs.erl          -- Filesystem-related utilities.
     * s2_functors.erl    -- The functor typeclass.
     * s2_funs.erl        -- Combinators.
-    * s2_gen_db.erl      -- Behaviour for persistent state.
-    * s2_gen_lattice.erl -- Behaviour for lattices.
-    * s2_hex.erl         -- ASCII armor.
     * s2_lists.erl       -- `lists' extensions.
     * s2_loop.erl        -- Higher-order functions for writing loops.
     * s2_maps.erl        -- Nested dictionaries.
     * s2_maybe.erl       -- The Maybe Monad.
     * s2_par.erl         -- Better pmap.
-    * s2_pn_counters.erl -- PN counters.
     * s2_procs.erl       -- `erlang' extensions.
-    * s2_rand.erl        -- Randomness.
     * s2_sh.erl          -- Unix commands.
     * s2_strats.erl      -- Sane supervision defaults.
     * s2_time.erl        -- Timestamps.
-    * s2_vclocks.erl     -- Vector clocks.
 
 // eof

include/prelude.hrl

@@ -239,131 +239,6 @@
            end
          end)()).
 
--ifdef(S2_USE_KIVRA_METRICS).
-
--define(do_increment(__Name),
-        (kivra_metrics:increase_counter([?APP | __Name]))).
--define(do_increment(__Fun, __Ret),
-        ?do_increment([?MODULE, __Fun, __Ret])).
--define(do_time(__Name, __Expr),
-        (kivra_metrics:time_mfa([?APP | __Name], ?thunk(__Expr)))).
--define(do_time_diff(__Name, __Time),
-        (kivra_metrics:time_diff([?APP | __Name], __Time))).
--define(do_histogram(__Name, __Value),
-        (kivra_metrics:histogram([?APP | __Name], __Value))).
-
--else.
-
--ifdef(S2_USE_FOLSOM).
-
--define(name(Xs), (s2_atoms:catenate(s2_lists:intersperse('_', Xs)))).
-
--define(do_increment(Name),
-        (catch folsom_metrics:notify({?name(Name), 1}))).
--define(do_increment(Fun, Ret),
-        ?do_increment([?APP, ?MODULE, Fun, Ret])).
--define(do_time(Name, Expr),
-        (try case is_list(Name) of
-           true ->
-             folsom_metrics:histogram_timed_update(?name(Name),
-                                                   ?thunk(Expr));
-           false ->
-             folsom_metrics:histogram_timed_update(?name([ ?MODULE
-                                                         , ?APP
-                                                         , Name]),
-                                                   ?thunk(Expr))
-         end catch _:_ -> Expr
-         end)).
--define(do_time_diff(Name, Time),
-        (catch case is_list(Name) of
-           true ->
-             folsom_metrics:histogram_timed_notify({?name(Name),
-                                                   Time});
-           false ->
-             folsom_metrics:histogram_timed_notify({ ?name([ ?MODULE
-                                                           , ?APP
-                                                           , Name])
-                                                   , Time})
-         end)).
-
--else.
-
--ifdef(S2_USE_ESTATSD).
-
--define(name(Xs), (s2_atoms:catenate(s2_lists:intersperse('.', Xs)))).
-
--define(do_increment(__Name),
-        (catch estatsd:increment(?name(__Name)))).
--define(do_increment(__Fun, __Ret),
-        ?do_increment([?APP, ?MODULE, __Fun, __Ret])).
--define(do_time(__Name, Expr),
-        (begin
-           {__T, __Val} = timer:tc(?thunk(Expr)),
-           case is_list(__Name) of
-             true  -> estatsd:timing(?name(__Name), __T/1000);
-             false -> estatsd:timing(?name([?MODULE, ?APP, __Name]), __T/1000)
-           end,
-           __Val
-         end)).
--define(do_time_diff(__Name, __Time),
-        (catch case is_list(__Name) of
-           true ->
-             estatsd:timing(?name(__Name), __Time);
-           false ->
-             estatsd:timing(?name([?MODULE, ?APP, __Name]), __Time)
-         end)).
-
--else.
-
--ifdef(S2_RIEMANN).
-
--ifdef(S2_RIEMANN_USE_POOL).
--define(katja, katja_pool).
--else.
--define(katja, katja).
--endif.
-
--define(name(Xs), (?a2l(s2_atoms:catenate(s2_lists:intersperse('/', Xs))))).
-
--define(do_increment(__Name),
-        (ok)).
--define(do_increment(__Fun, __Ret),
-        ?do_increment([?APP, ?MODULE, __Fun, __Ret])).
--define(do_time(__Name, Expr),
-        (begin
-           {__T, __Val} = timer:tc(?thunk(Expr)),
-           case is_list(__Name) of
-             true  ->
-               ?katja:send_event_async([ {service, ?name(__Name)}
-                                       , {time,    s2_time:unix_epoch()}
-                                       , {metric,  round(__T/1000)}]);
-             false ->
-               ?katja:send_event_async([ {service, ?name([?APP, ?MODULE])}
-                                       , {time,    s2_time:unix_epoch()}
-                                       , {metric,  round(__T/1000)}])
-           end,
-           __Val
-         end)).
--define(do_time_diff(__Name, __Time),
-        (catch case is_list(__Name) of
-           true ->
-               ?katja:send_event_async(
-                  [ {service, ?name(__Name)}
-                  , {time,    s2_time:unix_epoch()}
-                  , {metric,  timer:now_diff(os:timestamp(), __Time)/1000}] );
-           false ->
-               ?katja:send_event_async(
-                  [ {service, ?name([?APP, ?MODULE])}
-                  , {time,    s2_time:unix_epoch()}
-                  , {metric,  timer:now_diff(os:timestamp(), __Time)/1000}] )
-           end)).
-
--else. %default
-
--define(name(Xs), (s2_atoms:catenate(s2_lists:intersperse('.', Xs)))).
-
--define(do_increment(Name),     ok).
--define(do_increment(Fun, Ret), Fun, ok).
 -define(do_time(__Name, __Expr),
         (begin
            {__T, __Val} = timer:tc(?thunk(__Expr)),
@@ -375,40 +250,16 @@
            end,
            __Val
          end)).
--define(do_time_diff(__Name, __Time),
-       (catch case is_list(__Name) of
-           true ->
-             ?debug( "time(~s): ~wms ~p~n"
-                   , [ ?MODULE
-                     , timer:now_diff(os:timestamp(), __Time)/1000
-                     , ?name(__Name) ] );
-           false ->
-             ?debug( "time(~s): ~wms ~p~n"
-                   , [ ?MODULE
-                     , timer:now_diff(os:timestamp(), __Time)/1000
-                     , __Name ] )
-           end)).
-
--endif. %S2_USE_ESTATSD
-
--endif. %S2_RIEMANN
-
--endif.
-
--endif.
 
 -define(increment(Name),       ?do_increment(Name)).
 -define(increment(Fun, Ret),   ?do_increment(Fun, Ret)).
 -define(time(Name, Expr),      ?do_time(Name, Expr)).
--define(time_diff(Name, Time), ?do_time_diff(Name, Time)).
 -define(histogram(Name, Value), ?do_histogram(Name, Value)).
 
 %%%_* Misc =============================================================
 -define(FUNCTION,
         (element(2, element(2, process_info(self(), current_function))))).
 
--define(UUID(), (s2_rand:int())).
-
 %%%_* Types ============================================================
 -type alist(A, B) :: [{A, B}].
 -type fd()        :: file:io_device().

rebar.config

@@ -9,7 +9,6 @@
                   , nowarn_export_all
                   , warnings_as_errors
                   ]}.
-{erl_first_files, [ "src/s2_gen_lattice" ]}.
 {xref_checks,     [undefined_function_calls]}.
 
 % eof

src/s2_atoms.erl

@@ -7,10 +7,7 @@
 -module(s2_atoms).
 
 %%%_* Exports ==========================================================
--export([ catenate/1
-        , gensym/0
-        , gensym/1
-        ]).
+-export([catenate/1]).
 
 %%%_* Includes =========================================================
 -include("prelude.hrl").
@@ -30,25 +27,6 @@ catenate_test() ->
   'foo426.66000000000000000000e+02bar' = catenate([foo, 42, 666.0, "bar"]).
 -endif.
 
-
--spec gensym() -> atom().
-%% @doc gensym() is a fresh atom.
-gensym() ->
-  gensym('$gensym').
-gensym(Prefix0) ->
-  Prefix                = s2_lists:to_list(Prefix0),
-  Ref                   = erlang:ref_to_list(make_ref()),
-  {ok, Suffix0, []}     = io_lib:fread("#Ref<~d.~d.~d.~d>", Ref),
-  Suffix                = lists:concat(Suffix0),
-  Sym                   = Prefix ++ Suffix,
-  {'EXIT', {badarg, _}} = (catch list_to_existing_atom(Sym)), %assert unique
-  ?l2a(Sym).
-
--ifdef(TEST).
-gensym0_test() -> ?assert(gensym()    =/= gensym()).
-gensym1_test() -> ?assert(gensym(foo) =/= gensym(foo)).
--endif.
-
 %%%_* Emacs ============================================================
 %%% Local Variables:
 %%% allout-layout: t