aboutsummaryrefslogtreecommitdiffstats
path: root/lib/stdlib/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2016-03-18 10:23:48 +0100
committerRaimo Niskanen <[email protected]>2016-03-18 10:23:48 +0100
commit6bf2768c6836440634019d69231534ed69fcf982 (patch)
treec8d8402a8a50ce1c3ece2728a55bf41017f870de /lib/stdlib/src
parent2cd331fec3e08799bdd482399e8c969102e1142f (diff)
downloadotp-6bf2768c6836440634019d69231534ed69fcf982.tar.gz
otp-6bf2768c6836440634019d69231534ed69fcf982.tar.bz2
otp-6bf2768c6836440634019d69231534ed69fcf982.zip
Do more intricate Fred Hebert doc changes
Diffstat (limited to 'lib/stdlib/src')
-rw-r--r--lib/stdlib/src/gen_statem.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/stdlib/src/gen_statem.erl b/lib/stdlib/src/gen_statem.erl
index 82ac5824eb..9c1e126507 100644
--- a/lib/stdlib/src/gen_statem.erl
+++ b/lib/stdlib/src/gen_statem.erl
@@ -86,7 +86,7 @@
%% If 'true' hibernate the server instead of going into receive
boolean().
-type event_timeout() ::
- %% Generate a ('timeout', Msg, ...) event after Time
+ %% Generate a ('timeout', EventContent, ...) event after Time
%% unless some other event is delivered
Time :: timeout().
@@ -113,7 +113,7 @@
%%
(Timeout :: event_timeout()) | % {timeout,Timeout}
{'timeout', % Set the event timeout option
- Time :: event_timeout(), Msg :: term()} |
+ Time :: event_timeout(), EventContent :: term()} |
%%
reply_action() |
%%
@@ -1054,17 +1054,17 @@ loop_event_actions(
undefined ->
%% No state timeout has been requested
{Q3,undefined};
- {timeout,Time,Msg} ->
+ {timeout,Time,EventContent} ->
%% A state timeout has been requested
case Q3 of
[] when Time =:= 0 ->
%% Immediate timeout - simulate it
%% so we do not get the timeout message
%% after any received event
- {[{timeout,Msg}],undefined};
+ {[{timeout,EventContent}],undefined};
[] ->
%% Actually start a timer
- {Q3,erlang:start_timer(Time, self(), Msg)};
+ {Q3,erlang:start_timer(Time, self(), EventContent)};
_ ->
%% Do not start a timer since any queued
%% event cancels the state timer so we pretend