[thrift] whole ball of whitespace normalizations in Erlang
Summary: ill-formatted comments, trailing whitespace, and (gasp) tabs: all pwned. better now than later.
Reviewed By: eletuchy
Test Plan: ok
Revert Plan: ok
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@665339 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/erl/src/thrift_oop_server.erl b/lib/erl/src/thrift_oop_server.erl
index 57c4772..052578c 100644
--- a/lib/erl/src/thrift_oop_server.erl
+++ b/lib/erl/src/thrift_oop_server.erl
@@ -1,11 +1,11 @@
%%% Copyright (c) 2007- Facebook
%%% Distributed under the Thrift Software License
-%%%
+%%%
%%% See accompanying file LICENSE or visit the Thrift site at:
%%% http://developers.facebook.com/thrift/
%%%-------------------------------------------------------------------
-%%% @doc
+%%% @doc
%%% @end
%%%-------------------------------------------------------------------
-module(thrift_oop_server).
@@ -22,9 +22,9 @@
%% External exports
%%--------------------------------------------------------------------
-export([
- start_link/0,
- stop/0
- ]).
+ start_link/0,
+ stop/0
+ ]).
%%--------------------------------------------------------------------
%% gen_server callbacks
@@ -75,11 +75,11 @@
init({Class, Args}) ->
process_flag(trap_exit, true),
try
- State = apply(Class, new, Args),
- ?INFO("thrift ~p:new(~s) = ~s", [Class, thrift_utils:unbrack(Args), oop:inspect(State)]),
- {ok, State}
+ State = apply(Class, new, Args),
+ ?INFO("thrift ~p:new(~s) = ~s", [Class, thrift_utils:unbrack(Args), oop:inspect(State)]),
+ {ok, State}
catch
- E -> {stop, {new_failed, E}}
+ E -> {stop, {new_failed, E}}
end;
init(_) ->
@@ -114,57 +114,57 @@
handle_either(cast, {Method, Args}, undefined, State).
-define(REPLY(Value, State),
- case Type of
- call -> {reply, Value, State};
- cast -> {noreply, State}
- end
-).
+ case Type of
+ call -> {reply, Value, State};
+ cast -> {noreply, State}
+ end
+).
handle_either(Type, Request, From, State) ->
%% error_logger:info_msg("~p: ~p", [?SERVER, oop:inspect(State)]),
%% error_logger:info_msg("handle_call(Request=~p, From=~p, State)", [Request, From]),
- case Request of
- {get, [Field]} ->
- Value = oop:get(State, Field),
- ?REPLY(Value, State);
+ case Request of
+ {get, [Field]} ->
+ Value = oop:get(State, Field),
+ ?REPLY(Value, State);
- {set, [Field, Value]} ->
- State1 = oop:set(State, Field, Value),
- ?REPLY(Value, State1);
+ {set, [Field, Value]} ->
+ State1 = oop:set(State, Field, Value),
+ ?REPLY(Value, State1);
- {class, []} ->
- ?REPLY(?CLASS(State), State);
+ {class, []} ->
+ ?REPLY(?CLASS(State), State);
- {Method, Args} ->
- handle_method(Type, State, Method, Args);
+ {Method, Args} ->
+ handle_method(Type, State, Method, Args);
- _ ->
- error_logger:format("no match for Request = ~p", [Request]),
- %% {stop, server_error, State}
- {reply, server_error, State}
+ _ ->
+ error_logger:format("no match for Request = ~p", [Request]),
+ %% {stop, server_error, State}
+ {reply, server_error, State}
end.
handle_method(Type, State, Method, Args) ->
%% is an effectful call?
Is_effectful = lists:prefix("effectful_", atom_to_list(Method)),
Call = oop:call(State, Method, Args),
-
+
%% TODO(cpiro): maybe add error handling here? = catch oop:call?
-
- case {Is_effectful, Call} of
- {true, {Retval, State1}} ->
- ?REPLY(Retval, State1);
-
- {true, _MalformedReturn} ->
- %% TODO(cpiro): bad match -- remove when we're done converting
- error_logger:format("oop:call(effectful_*,..,..) malformed return value ~p",
- [_MalformedReturn]),
- %% {stop, server_error, State}
- {noreply, State};
-
- {false, Retval} ->
- ?REPLY(Retval, State)
+
+ case {Is_effectful, Call} of
+ {true, {Retval, State1}} ->
+ ?REPLY(Retval, State1);
+
+ {true, _MalformedReturn} ->
+ %% TODO(cpiro): bad match -- remove when we're done converting
+ error_logger:format("oop:call(effectful_*,..,..) malformed return value ~p",
+ [_MalformedReturn]),
+ %% {stop, server_error, State}
+ {noreply, State};
+
+ {false, Retval} ->
+ ?REPLY(Retval, State)
end.
%%--------------------------------------------------------------------
@@ -176,18 +176,18 @@
%%--------------------------------------------------------------------
handle_info({'EXIT', Pid, Except} = All, State) ->
Result = try
- oop:call(State, catches, [Pid, Except])
+ oop:call(State, catches, [Pid, Except])
catch
- exit:{missing_method, _} ->
- unhandled
+ exit:{missing_method, _} ->
+ unhandled
end,
case Result of
- unhandled ->
- error_logger:format("unhandled exit ~p", [All]),
- {stop, All, State};
- _WasHandled ->
- {noreply, State}
+ unhandled ->
+ error_logger:format("unhandled exit ~p", [All]),
+ {stop, All, State};
+ _WasHandled ->
+ {noreply, State}
end;
handle_info(Info, State) ->