aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-02-24 09:41:34 +0100
committerRaimo Niskanen <[email protected]>2016-02-24 09:41:34 +0100
commit1958b93b4aa90883be5102d465f67f167549dea9 (patch)
tree409de86a9656caaa475003d5cbd6c0819c4d3701 /lib/stdlib/src
parent2b3a82ae44b222ce1146badcff972abb539d40ca (diff)
downloadotp-1958b93b4aa90883be5102d465f67f167549dea9.tar.gz
otp-1958b93b4aa90883be5102d465f67f167549dea9.tar.bz2
otp-1958b93b4aa90883be5102d465f67f167549dea9.zip
Ditch State so StateName/5 -> StateName/4
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_statem.erl36
1 files changed, 23 insertions, 13 deletions
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 02c8d60c61..fe84a428f6 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -152,8 +152,7 @@
-callback state_name(
event_type(),
EventContent :: term(),
- PrevStateName :: state_name() | reference(),
- StateName :: state_name(), % Current state
+ PrevStateName :: state_name(), % Previous state name
Data :: data()) ->
state_callback_result().
%%
@@ -164,7 +163,7 @@
-callback handle_event(
event_type(),
EventContent :: term(),
- PrevState :: state(),
+ PrevState :: state(), % Previous state
State :: state(), % Current state
Data :: data()) ->
state_callback_result().
@@ -203,7 +202,7 @@
[init/1, % One may use enter_loop/5,6,7 instead
format_status/2, % Has got a default implementation
%%
- state_name/5, % Example for callback_mode =:= state_functions:
+ state_name/4, % Example for callback_mode =:= state_functions:
%% there has to be a StateName/5 callback function for every StateName.
%%
handle_event/5]). % For callback_mode =:= handle_event_function
@@ -740,14 +739,13 @@ loop_events(
[{Type,Content} = Event|Events] = Q, Timer) ->
_ = (Timer =/= undefined) andalso
cancel_timer(Timer),
- Func =
+ try
case CallbackMode of
- handle_event_function ->
- handle_event;
state_functions ->
- State
- end,
- try Module:Func(Type, Content, PrevState, State, Data) of
+ Module:State(Type, Content, PrevState, Data);
+ handle_event_function ->
+ Module:handle_event(Type, Content, PrevState, State, Data)
+ end of
Result ->
loop_event_result(
Parent, Debug, S, Events, Event, Result)
@@ -759,15 +757,27 @@ loop_events(
%% Process an undef to check for the simple mistake
%% of calling a nonexistent state function
case erlang:get_stacktrace() of
- [{Module,Func,
- [Type,Content,PrevState,State,Data]=Args,
+ [{Module,State,
+ [Type,Content,PrevState,Data]=Args,
_}
- |Stacktrace] ->
+ |Stacktrace]
+ when CallbackMode =:= state_functions ->
terminate(
error,
{undef_state_function,{Module,State,Args}},
Stacktrace,
Debug, S, Q);
+ [{Module,handle_event,
+ [Type,Content,PrevState,State,Data]=Args,
+ _}
+ |Stacktrace]
+ when CallbackMode =:= handle_event_function ->
+ terminate(
+ error,
+ {undef_state_function,
+ {Module,handle_event,Args}},
+ Stacktrace,
+ Debug, S, Q);
Stacktrace ->
terminate(error, undef, Stacktrace, Debug, S, Q)
end;