File 1046-erlang-module-doc-Fixes-due-to-comments-by... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1046-erlang-module-doc-Fixes-due-to-comments-by-rickard-g.patch of Package erlang (Revision d8745da60831eabc081dfb26c3d6ac22)

Currently displaying revision d8745da60831eabc081dfb26c3d6ac22 , Show latest

From ccb0b554f516a67a60f27de5f644905c5e783e58 Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Wed, 30 Sep 2020 08:41:58 +0200
Subject: [PATCH 36/39] erlang module doc: Fixes due to comments by
 @rickard-green

---
 erts/doc/src/erlang.xml | 87 +++++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 34 deletions(-)

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index d46df36345..349701ef72 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -1667,11 +1667,11 @@ b</pre>
 
 <func>
 <name name="error" arity="1"/>
- <fsummary>Raise exception of class error.</fsummary>
+ <fsummary>Raise an exception of class error.</fsummary>
 <desc>
- Raises exception of class <c>error</c> with the reason
+ Raises an exception of class <c>error</c> with the reason
 <c><anno>Reason</anno></c>, where <c><anno>Reason</anno></c>
- is any term. The exit reason is <c>{<anno>Reason</anno>,
+ is any term. The error reason is <c>{<anno>Reason</anno>,
 Where}</c>, where <c>Where</c> is a list of the functions most
 recently called (the current function first). As evaluating
 this function causes an exception to be thrown, it has no
@@ -1696,11 +1696,11 @@ b</pre>
 
 <func>
 <name name="error" arity="2"/>
- <fsummary>Stop execution with a specified reason.</fsummary>
+ <fsummary>Raise an exception of class <c>error</c></fsummary>
 <desc>
- Raises exception of class <c>error</c> with the reason
+ Raises an exception of class <c>error</c> with the reason
 <c><anno>Reason</anno></c>, where <c><anno>Reason</anno></c>
- is any term. The exit reason is
+ is any term. The error reason is
 <c>{<anno>Reason</anno>, Where}</c>, where <c>Where</c>
 is a list of the functions most recently called (the current
 function first). <c><anno>Args</anno></c> is expected to be the
@@ -1715,13 +1715,13 @@ b</pre>
 marker="system/reference_manual:errors">errors and error
 handling</seealso> for additional information. Example:
 <c>test.erl</c>:
-<pre>
+<code>
 -module(test).
 -export([example_fun/2]).
 
 example_fun(A1, A2) ->
 erlang:error(my_error, [A1, A2]).
-</pre>
+</code>
 Erlang shell:
 <pre>
 <input>6> c(test).</input>
@@ -1736,25 +1736,43 @@ example_fun(A1, A2) ->
 
 <func>
 <name name="exit" arity="1"/>
- <fsummary>Raise exception of class <c>exit</c> with a specified reason.</fsummary>
+ <fsummary>Raise an exception of class <c>exit</c> with a specified reason.</fsummary>
 <desc>
- Raises exception of class <c>exit</c> with exit reason
+ Raises an exception of class <c>exit</c> with exit reason
 <c><anno>Reason</anno></c>, where <c><anno>Reason</anno></c>
 is any term. As evaluating this function causes an exception
 to be raised, it has no return value. This function should be
 used when the intent is to stop the current process. This
- function differ from <c>erlang:error/1</c> and
- <c>erlang:error/2</c> by causing an exception of a different
- class and by having an exit reason that does
- not include the list of functions from the call stack. See the
- guide about <seealso
+ function differ from <seealso
+ marker="#error/1"><c>erlang:error/1</c></seealso> and <seealso
+ marker="#error/1"><c>erlang:error/2</c></seealso> by causing an
+ exception of a different class and by having a reason that
+ does not include the list of functions from the call
+ stack.
+ See the guide about <seealso
 marker="system/reference_manual:errors">errors and error
- handling</seealso> for additional information. Example:
+ handling</seealso> for additional information.
+ 
+ Example:
+ 
 <pre>
 > <input>exit(foobar).</input>
 ** exception exit: foobar
 > <input>catch exit(foobar).</input>
 {'EXIT',foobar}</pre>
+ <note>
+ If a process calls <c>exit(kill)</c> and does not catch
+ the exception, it will terminate with exit reason
+ <c>kill</c> and also emit exit signals with exit reason
+ <c>kill</c> (not <c>killed</c>) to all linked
+ processes. Such exit signals with exit reason <c>kill</c> can be
+ trapped by the linked processes. Note that this means that
+ signals with exit reason <c>kill</c> behave differently
+ depending on how they are sent because the signal will be
+ untrappable if a process sends such a signal to another
+ process with <seealso
+ marker="#exit/2"><c>erlang:exit/2</c></seealso>.
+ </note>
 </desc>
 </func>
 
@@ -1799,23 +1817,24 @@ example_fun(A1, A2) ->
 </list>
 If <c><anno>Reason</anno></c> is the atom <c>kill</c>, that
 is, if <c>exit(<anno>Pid</anno>, kill)</c> is called, an
- untrappable exit signal is sent to the process that
- is identified by <c><anno>Pid</anno></c>, which
- unconditionally exits with exit reason <c>killed</c>. The
- exit reason is changed from <c>kill</c> to <c>killed</c> so
- that the <c>kill</c> signal will not cascade to all linked
- processes.
+ untrappable exit signal is sent to the process that is
+ identified by <c><anno>Pid</anno></c>, which unconditionally
+ exits with exit reason <c>killed</c>. The exit reason is
+ changed from <c>kill</c> to <c>killed</c> to hint to linked
+ processes that the killed process got killed by
+ a call to <c>exit(Pid, kill)</c>.
 
 <note>
- The functions <seealso marker="#exit/1"><c>erlang:exit/1</c></seealso> and
- <c>erlang:exit/2</c> are named similarly but provide very
- different functionalities. The <c>erlang:exit/1</c> function
- should be used when the intent is to stop the current
- process while <c>erlang:exit/2</c> should be used when the
- intent is to send an exit signal to another process. Note
- also that <c>erlang:exit/1</c> raises an exception that can
- be caught while <c>erlang:exit/2</c> does not cause any
- exception to be raised.
+ The functions <seealso
+ marker="#exit/1"><c>erlang:exit/1</c></seealso> and <seealso
+ marker="#exit/2"><c>erlang:exit/2</c></seealso> are named
+ similarly but provide very different functionalities. The
+ <c>erlang:exit/1</c> function should be used when the intent
+ is to stop the current process while <c>erlang:exit/2</c>
+ should be used when the intent is to send an exit signal to
+ another process. Note also that <c>erlang:exit/1</c> raises
+ an exception that can be caught while <c>erlang:exit/2</c>
+ does not cause any exception to be raised.
 </note>
 <warning>
 The only scenario that has not been covered by the
@@ -10669,7 +10688,7 @@ hello
 <name name="throw" arity="1"/>
 <fsummary>Throw an exception.</fsummary>
 <desc>
- Raises exception of class <c>throw</c>. Intended to be used to do non-local returns from functions.
+ Raises an exception of class <c>throw</c>. Intended to be used to do non-local returns from functions.
 If evaluated within a
 <seealso marker="system/reference_manual:expressions#catch">
 	catch expression</seealso>, the catch expression returns value <c><anno>Any</anno></c>.
-- 
2.26.2

Places

File 1046-erlang-module-doc-Fixes-due-to-comments-by-rickard-g.patch of Package erlang (Revision d8745da60831eabc081dfb26c3d6ac22)

Places