Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ make/otp_doc_built
JAVADOC-GENERATED

*.1
*.3
*.4
*.6
*.7

# Anchored from $ERL_TOP
/bin
Expand Down
1 change: 1 addition & 0 deletions lib/stdlib/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ MODULES= \
json \
lists \
log_mf_h \
man_docs \
maps \
math \
ms_transform \
Expand Down
11 changes: 4 additions & 7 deletions lib/stdlib/src/beam_lib.erl
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,11 @@ The key can be provided in the following two ways:
[`compile`](`m:compile#debug_info_key`) and function `crypto_key_fun/1` to
register a fun that returns the key whenever `beam_lib` must decrypt the
debug information.

If no such fun is registered, `beam_lib` instead searches for an `.erlang.crypt`
file, see the next section.

If no such fun is registered, `beam_lib` instead searches for an `.erlang.crypt`
file, see the next section.
1. Store the key in a text file named `.erlang.crypt`.

In this case, Compiler option `encrypt_debug_info` can be used, see
[`compile`](`m:compile#encrypt_debug_info`).
In this case, Compiler option `encrypt_debug_info` can be used, see
[`compile`](`m:compile#encrypt_debug_info`).

## .erlang.crypt

Expand Down
7 changes: 0 additions & 7 deletions lib/stdlib/src/gen_statem.erl
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,6 @@ and returns. Here are the sequence of steps for a _state transition_:
in order of appearance. In this step all replies generated
by any `t:reply_action/0` are sent. Other actions set
`t:transition_option/0`s that come into play in subsequent steps.

2. If [_state enter calls_](`t:state_enter/0`) are used,
it is either the initial state or one of the callback results
[`repeat_state`](`t:state_callback_result/2`) or
Expand All @@ -797,15 +796,11 @@ and returns. Here are the sequence of steps for a _state transition_:
[`(enter, OldState, State, Data)`](`t:state_enter/0`) (depending on
[_callback mode_](`t:callback_mode/0`)) and when it returns
starts again from the top of this sequence.

3. If `t:postpone/0` is `true`, the current event is postponed.

4. If this is a _state change_, the queue of incoming events is reset
to start with the oldest postponed.

5. All events stored with `t:action/0` `next_event` are inserted
to be processed before previously queued events.

6. Time-out timers `t:event_timeout/0`, `t:generic_timeout/0` and
`t:state_timeout/0` are handled. Time-outs with zero time
are guaranteed to be delivered to the state machine
Expand All @@ -820,12 +815,10 @@ and returns. Here are the sequence of steps for a _state transition_:
A _state change_ cancels a `t:state_timeout/0` and any new transition
option of this type belongs to the new state, that is;
a `t:state_timeout/0` applies to the state the state machine enters.

7. If there are enqueued events the
[_state callback_](#state-callback) for the possibly
new state is called with the oldest enqueued event, and we start again
from the top of this sequence.

8. Otherwise the `gen_statem` goes into `receive` or hibernation
(if `t:hibernate/0` is `true`) to wait for the next message.
In hibernation the next non-system event awakens the `gen_statem`,
Expand Down
Loading
Loading