From afb632d2028fdc4a37e10e41e1929264ff59f52e Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 14 Mar 2013 09:53:33 +0100 Subject: Convert XML files to UTF-8, where needed --- lib/stdlib/doc/src/notes.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 2ec0d6a60f..8106fa9a06 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -1,4 +1,4 @@ - + @@ -124,7 +124,7 @@

Two adjacent * used as a single pattern will match all files and zero or more directories and subdirectories. - (Thanks to Jos Valim)

+ (Thanks to José Valim)

Own Id: OTP-10431

@@ -362,7 +362,7 @@ Fix filename:nativename/1 on Win32

Don't choke on paths given as binary argument on Win32. - Thanks to Jan Kltzke

+ Thanks to Jan Klötzke

Own Id: OTP-10188

@@ -471,7 +471,7 @@

Fix the type spec from the doc of binary:part/3 (Thanks - to Ricardo Catalinas Jimnez)

+ to Ricardo Catalinas Jiménez)

Own Id: OTP-9920

 @@ -3036,7 +3036,7 @@ It is now possible to hibernate a gen_server/gen_event/gen_fsm. In gen_server and gen_fsm, hibernation is triggered by returning the atom - 'hibernate'instead of a timeout value. In the gen_event + 'hibernate' instead of a timeout value. In the gen_event case hibernation is triggered by a event handler returning a tuple with an extra element containing the atom 'hibernate'.

-- cgit v1.2.3 From e5875001247e6a6ac4f474157a51a8c54f94ae49 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 14 Mar 2013 16:01:25 +0100 Subject: Convert XML files to UTF-8 --- lib/stdlib/doc/src/array.xml | 4 ++-- lib/stdlib/doc/src/base64.xml | 2 +- lib/stdlib/doc/src/beam_lib.xml | 4 ++-- lib/stdlib/doc/src/binary.xml | 4 ++-- lib/stdlib/doc/src/book.xml | 4 ++-- lib/stdlib/doc/src/c.xml | 4 ++-- lib/stdlib/doc/src/calendar.xml | 4 ++-- lib/stdlib/doc/src/dets.xml | 4 ++-- lib/stdlib/doc/src/dict.xml | 4 ++-- lib/stdlib/doc/src/digraph.xml | 4 ++-- lib/stdlib/doc/src/digraph_utils.xml | 4 ++-- lib/stdlib/doc/src/epp.xml | 2 +- lib/stdlib/doc/src/erl_eval.xml | 4 ++-- lib/stdlib/doc/src/erl_expand_records.xml | 4 ++-- lib/stdlib/doc/src/erl_id_trans.xml | 4 ++-- lib/stdlib/doc/src/erl_internal.xml | 4 ++-- lib/stdlib/doc/src/erl_lint.xml | 4 ++-- lib/stdlib/doc/src/erl_parse.xml | 2 +- lib/stdlib/doc/src/erl_pp.xml | 4 ++-- lib/stdlib/doc/src/erl_scan.xml | 4 ++-- lib/stdlib/doc/src/erl_tar.xml | 4 ++-- lib/stdlib/doc/src/ets.xml | 2 +- lib/stdlib/doc/src/fascicules.xml | 2 +- lib/stdlib/doc/src/file_sorter.xml | 4 ++-- lib/stdlib/doc/src/filelib.xml | 2 +- lib/stdlib/doc/src/filename.xml | 4 ++-- lib/stdlib/doc/src/gb_sets.xml | 4 ++-- lib/stdlib/doc/src/gb_trees.xml | 4 ++-- lib/stdlib/doc/src/gen_event.xml | 4 ++-- lib/stdlib/doc/src/gen_fsm.xml | 4 ++-- lib/stdlib/doc/src/gen_server.xml | 4 ++-- lib/stdlib/doc/src/io.xml | 2 +- lib/stdlib/doc/src/io_lib.xml | 2 +- lib/stdlib/doc/src/io_protocol.xml | 4 ++-- lib/stdlib/doc/src/lib.xml | 4 ++-- lib/stdlib/doc/src/lists.xml | 4 ++-- lib/stdlib/doc/src/log_mf_h.xml | 4 ++-- lib/stdlib/doc/src/math.xml | 4 ++-- lib/stdlib/doc/src/ms_transform.xml | 4 ++-- lib/stdlib/doc/src/notes.xml | 2 +- lib/stdlib/doc/src/notes_history.xml | 4 ++-- lib/stdlib/doc/src/orddict.xml | 4 ++-- lib/stdlib/doc/src/ordsets.xml | 4 ++-- lib/stdlib/doc/src/part.xml | 4 ++-- lib/stdlib/doc/src/part_notes.xml | 4 ++-- lib/stdlib/doc/src/part_notes_history.xml | 4 ++-- lib/stdlib/doc/src/pg.xml | 4 ++-- lib/stdlib/doc/src/pool.xml | 4 ++-- lib/stdlib/doc/src/proc_lib.xml | 2 +- lib/stdlib/doc/src/proplists.xml | 2 +- lib/stdlib/doc/src/qlc.xml | 4 ++-- lib/stdlib/doc/src/queue.xml | 4 ++-- lib/stdlib/doc/src/random.xml | 4 ++-- lib/stdlib/doc/src/re.xml | 4 ++-- lib/stdlib/doc/src/ref_man.xml | 4 ++-- lib/stdlib/doc/src/sets.xml | 4 ++-- lib/stdlib/doc/src/shell.xml | 2 +- lib/stdlib/doc/src/shell_default.xml | 4 ++-- lib/stdlib/doc/src/slave.xml | 4 ++-- lib/stdlib/doc/src/sofs.xml | 4 ++-- lib/stdlib/doc/src/specs.xml | 2 +- lib/stdlib/doc/src/stdlib_app.xml | 2 +- lib/stdlib/doc/src/string.xml | 4 ++-- lib/stdlib/doc/src/supervisor.xml | 4 ++-- lib/stdlib/doc/src/supervisor_bridge.xml | 4 ++-- lib/stdlib/doc/src/sys.xml | 4 ++-- lib/stdlib/doc/src/timer.xml | 4 ++-- lib/stdlib/doc/src/unicode.xml | 2 +- lib/stdlib/doc/src/unicode_usage.xml | 2 +- lib/stdlib/doc/src/win32reg.xml | 4 ++-- lib/stdlib/doc/src/zip.xml | 2 +- 71 files changed, 125 insertions(+), 125 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index a79fcd487e..b0b3aa6dc1 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -1,9 +1,9 @@ - +
- 20072011 + 20072013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml index f90a82187d..c4982f4eaa 100644 --- a/lib/stdlib/doc/src/base64.xml +++ b/lib/stdlib/doc/src/base64.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index db65eb3848..eb4974a79f 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -1,10 +1,10 @@ - +
- 20002011 + 20002013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 06cfad0b0b..2410f1f9b8 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -1,11 +1,11 @@ - +
2009 - 2012 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/book.xml b/lib/stdlib/doc/src/book.xml index 10ee6f3855..b1b67d661c 100644 --- a/lib/stdlib/doc/src/book.xml +++ b/lib/stdlib/doc/src/book.xml @@ -1,10 +1,10 @@ - +
- 19972009 + 19972013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml index ddae388a1b..2eb9b149d9 100644 --- a/lib/stdlib/doc/src/c.xml +++ b/lib/stdlib/doc/src/c.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index f8db48e00c..e32a639b81 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 215ec154ed..6bbedb0662 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index b01acd02bf..b8cf61af80 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 0afc70ebe0..c5d5707f4f 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index ef6e1cb46f..ef6f9d8611 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -1,10 +1,10 @@ - +
- 20002012 + 20002013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index df7bf883fc..cf33530395 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml index d0622594d9..29093173d1 100644 --- a/lib/stdlib/doc/src/erl_eval.xml +++ b/lib/stdlib/doc/src/erl_eval.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml index 8ead438b31..1b5ee5de36 100644 --- a/lib/stdlib/doc/src/erl_expand_records.xml +++ b/lib/stdlib/doc/src/erl_expand_records.xml @@ -1,11 +1,11 @@ - +
2005 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml index 18cc2460f9..0f7042f0c6 100644 --- a/lib/stdlib/doc/src/erl_id_trans.xml +++ b/lib/stdlib/doc/src/erl_id_trans.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml index b8d5ad73b3..54e560f8b9 100644 --- a/lib/stdlib/doc/src/erl_internal.xml +++ b/lib/stdlib/doc/src/erl_internal.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml index b7fbdd8799..1ca58baf9a 100644 --- a/lib/stdlib/doc/src/erl_lint.xml +++ b/lib/stdlib/doc/src/erl_lint.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 56a7131821..2d5aff3c6c 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml index 9ae4f3d91f..005c101973 100644 --- a/lib/stdlib/doc/src/erl_pp.xml +++ b/lib/stdlib/doc/src/erl_pp.xml @@ -1,11 +1,11 @@ - +
1996 - 2012 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index 54240dea19..855c8fc195 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index fe166dbd01..f81e36f810 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -1,10 +1,10 @@ - +
- 20032011 + 20032013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 6db1ae3aa3..21cf8e4149 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/fascicules.xml b/lib/stdlib/doc/src/fascicules.xml index b30d34186e..0ded9007e0 100644 --- a/lib/stdlib/doc/src/fascicules.xml +++ b/lib/stdlib/doc/src/fascicules.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index a6b3633066..16572df3c5 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -1,10 +1,10 @@ - +
- 20012011 + 20012013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml index bd780b2b2f..3a97f38ec2 100644 --- a/lib/stdlib/doc/src/filelib.xml +++ b/lib/stdlib/doc/src/filelib.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 9296319b83..49b652f969 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -1,10 +1,10 @@ - +
- 19972011 + 19972013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index f91fac9c82..8ca95df8fc 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -1,10 +1,10 @@ - +
- 20012011 + 20012013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index 9316d60b1a..57e60eacb7 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -1,10 +1,10 @@ - +
- 20012011 + 20012013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index 1601ea9892..b9dfff833e 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -1,10 +1,10 @@ - +
- 19962012 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 73c1911f1e..1713367bd8 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index abb4c73c7b..4c83fde237 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -1,10 +1,10 @@ - +
- 19962012 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index 90f24c4cbc..a28180b42a 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml index 3dac259477..9cbc54d8bd 100644 --- a/lib/stdlib/doc/src/io_lib.xml +++ b/lib/stdlib/doc/src/io_lib.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml index d36bf2042f..9328704e11 100644 --- a/lib/stdlib/doc/src/io_protocol.xml +++ b/lib/stdlib/doc/src/io_protocol.xml @@ -1,11 +1,11 @@ - +
1999 - 2012 + 2013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml index 19fb827cbf..30f164826c 100644 --- a/lib/stdlib/doc/src/lib.xml +++ b/lib/stdlib/doc/src/lib.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index b6c0fa4e05..858c82aac9 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -1,10 +1,10 @@ - +
- 19962012 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml index f2b09b58eb..3ef659f579 100644 --- a/lib/stdlib/doc/src/log_mf_h.xml +++ b/lib/stdlib/doc/src/log_mf_h.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml index 0219dcce10..43cd20e726 100644 --- a/lib/stdlib/doc/src/math.xml +++ b/lib/stdlib/doc/src/math.xml @@ -1,11 +1,11 @@ - +
1996 - 2012 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml index ad5f8bd5ac..e89dd41f26 100644 --- a/lib/stdlib/doc/src/ms_transform.xml +++ b/lib/stdlib/doc/src/ms_transform.xml @@ -1,10 +1,10 @@ - +
- 20022011 + 20022013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 8106fa9a06..c36cc310aa 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/notes_history.xml b/lib/stdlib/doc/src/notes_history.xml index 85997f1717..328855f6dd 100644 --- a/lib/stdlib/doc/src/notes_history.xml +++ b/lib/stdlib/doc/src/notes_history.xml @@ -1,10 +1,10 @@ - +
- 20062009 + 20062013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index 319083d35b..b6aee7a7d6 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -1,10 +1,10 @@ - +
- 20002011 + 20002013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml index 1e26fc2022..277c1c32ab 100644 --- a/lib/stdlib/doc/src/ordsets.xml +++ b/lib/stdlib/doc/src/ordsets.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/part.xml b/lib/stdlib/doc/src/part.xml index 25ca56ad86..5589d11e3e 100644 --- a/lib/stdlib/doc/src/part.xml +++ b/lib/stdlib/doc/src/part.xml @@ -1,11 +1,11 @@ - +
1996 - 2009 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/part_notes.xml b/lib/stdlib/doc/src/part_notes.xml index 66ad294753..cdd35ac370 100644 --- a/lib/stdlib/doc/src/part_notes.xml +++ b/lib/stdlib/doc/src/part_notes.xml @@ -1,10 +1,10 @@ - +
- 20042009 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/part_notes_history.xml b/lib/stdlib/doc/src/part_notes_history.xml index 5e055ee606..15e0a0f1d3 100644 --- a/lib/stdlib/doc/src/part_notes_history.xml +++ b/lib/stdlib/doc/src/part_notes_history.xml @@ -1,11 +1,11 @@ - +
2006 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/pg.xml b/lib/stdlib/doc/src/pg.xml index c56db8c6e6..7cc1b805b4 100644 --- a/lib/stdlib/doc/src/pg.xml +++ b/lib/stdlib/doc/src/pg.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml index 39a79e5dc5..1b903984f9 100644 --- a/lib/stdlib/doc/src/pool.xml +++ b/lib/stdlib/doc/src/pool.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index b597074044..5bf5744622 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml index a0063a58d3..1655133b2b 100644 --- a/lib/stdlib/doc/src/proplists.xml +++ b/lib/stdlib/doc/src/proplists.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml index ce50631ca9..8682936c08 100644 --- a/lib/stdlib/doc/src/qlc.xml +++ b/lib/stdlib/doc/src/qlc.xml @@ -1,10 +1,10 @@ - +
- 20042011 + 20042013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index 383f52d10d..bcf063bf0f 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index 1b8fa44883..e001058e19 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 71a6e34513..1f8115ddc2 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -1,11 +1,11 @@ - +
2007 - 2012 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index 0f277f6c5e..4ecd02a4bf 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index 071ee437cb..4b220bdd85 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -1,10 +1,10 @@ - +
- 20002011 + 20002013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml index 7f251c863e..3ca80ed900 100644 --- a/lib/stdlib/doc/src/shell.xml +++ b/lib/stdlib/doc/src/shell.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/shell_default.xml b/lib/stdlib/doc/src/shell_default.xml index f7e7d5388a..2355ba92f9 100644 --- a/lib/stdlib/doc/src/shell_default.xml +++ b/lib/stdlib/doc/src/shell_default.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml index 15b6711731..f5d0436a20 100644 --- a/lib/stdlib/doc/src/slave.xml +++ b/lib/stdlib/doc/src/slave.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index 37c41501ae..6c97fd0bc0 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -1,10 +1,10 @@ - +
- 20012012 + 20012013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index 49c60529d2..213ce7563f 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml index 2391bb6f03..de4cc65396 100644 --- a/lib/stdlib/doc/src/stdlib_app.xml +++ b/lib/stdlib/doc/src/stdlib_app.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml index 549c871aed..c96cc95a44 100644 --- a/lib/stdlib/doc/src/string.xml +++ b/lib/stdlib/doc/src/string.xml @@ -1,10 +1,10 @@ - +
- 19962012 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 3f36c58d24..612626540a 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -1,10 +1,10 @@ - +
- 19962012 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml index f6712d6c1d..d16b258b6c 100644 --- a/lib/stdlib/doc/src/supervisor_bridge.xml +++ b/lib/stdlib/doc/src/supervisor_bridge.xml @@ -1,11 +1,11 @@ - +
1996 - 2011 + 2013 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index 0ffc5bc433..ab8b380f49 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 0c1e398dc4..eca9a72d36 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -1,10 +1,10 @@ - +
- 19962011 + 19962013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml index deba6adb11..6f8a289432 100644 --- a/lib/stdlib/doc/src/unicode.xml +++ b/lib/stdlib/doc/src/unicode.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index 1f64b38554..33cd70e0b7 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -1,4 +1,4 @@ - + diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml index 99fd7fdeb6..8835f931b2 100644 --- a/lib/stdlib/doc/src/win32reg.xml +++ b/lib/stdlib/doc/src/win32reg.xml @@ -1,10 +1,10 @@ - +
- 20002011 + 20002013 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 484bf0e080..66c21da193 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -1,4 +1,4 @@ - + -- cgit v1.2.3 From 0fdb5a9cc8ed44aed9851627bbe3faff1b199570 Mon Sep 17 00:00:00 2001 From: goofansu Date: Thu, 11 Jul 2013 16:33:27 +0800 Subject: Fix supervisor typo `I` should be `If` --- lib/stdlib/doc/src/supervisor.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index ed09f6e1f2..e2c9c14e6a 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -371,7 +371,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} children.

If the supervisor is simple_one_for_one, Id - must be the child process' pid(). I the specified + must be the child process' pid(). If the specified process is alive, but is not a child of the given supervisor, the function will return {error,not_found}. If the child specification -- cgit v1.2.3 From 9cd8b5d2af163f29cf77ae74057789be977f6414 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Thu, 18 Jul 2013 18:52:42 +0200 Subject: Update PCRE doc part of re.xml to PCRE 8.33 state This does not include any documentation of the new options, namely 'ucp', 'never_utf', 'notempty_atstart', 'no_start_optimize' or {capture, all_names, ...} and re:inspect/1. --- lib/stdlib/doc/src/re.xml | 1616 ++++++++++++++++++++++++++++++++------------- 1 file changed, 1154 insertions(+), 462 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 1f8115ddc2..aae6345e84 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -721,12 +721,12 @@ published by O'Reilly, covers regular expressions in great detail. This description of PCRE's regular expressions is intended as reference material.

The reference material is divided into the following sections:

-Newline conventions +Special start-of-pattern items Characters and metacharacters Backslash Circumflex and dollar -Full stop (period, dot) -Matching a single byte +Full stop (period, dot) and \N +Matching a single data unit Square brackets and character classes POSIX character classes Vertical bar @@ -742,6 +742,7 @@ description of PCRE's regular expressions is intended as reference material.

Comments Recursive patterns Subpatterns as subroutines +Oniguruma subroutine syntax @@ -751,7 +752,55 @@ description of PCRE's regular expressions is intended as reference material.

-
Newline conventions +
Special start-of-pattern items + +

A number of options that can be passed to re:compile/2 can also be set +by special items at the start of a pattern. These are not Perl-compatible, but +are provided to make these options accessible to pattern writers who are not +able to change the program that processes the pattern. Any number of these +items may appear, but they must all be together right at the start of the +pattern string, and the letters must be in upper case.

+ +

UTF support

+

+Unicode support is basically UTF-8 based. To use Unicode characters, you either +call re:compile/2/re:run/3 with the unicode option, or the + pattern must start with one of these special sequences:

+ +

(*UTF8)

+

(*UTF)

+ + +

Both options give the same effect, the input string is interpreted +as UTF-8. Note that with these instructions, the automatic conversion +of lists to UTF-8 is not performed by the re functions, why +using these options is not recommended. Add the unicode option +when running re:compile/2 instead.

+ +

+Some applications that allow their users to supply patterns may wish to +restrict them to non-UTF data for security reasons. If the never_utf +option is set at compile time, (*UTF) etc. are not allowed, and their +appearance causes an error. +

+ +

Unicode property support

+

Another special sequence that may appear at the start of a pattern is

+ +

(*UCP)

+ +

This has the same effect as setting the ucp option: it causes sequences +such as \d and \w to use Unicode properties to determine character types, +instead of recognizing only characters with codes less than 128 via a lookup +table. +

+ +

Disabling start-up optimizations

+

+If a pattern starts with (*NO_START_OPT), it has the same effect as setting the +no_Start_optimize option at compile time.

+ +

Newline conventions

PCRE supports five @@ -780,23 +829,45 @@ example, the pattern:

changes the convention to CR. That pattern matches "a\nb" because LF is no -longer a newline. Note that these special settings, which are not -Perl-compatible, are recognized only at the very start of a pattern, and that -they must be in upper case. If more than one of them is present, the last one +longer a newline. If more than one of them is present, the last one is used.

-

The newline convention does not affect what the \R escape sequence matches. By -default, this is any Unicode newline sequence, for Perl compatibility. However, -this can be changed; see the description of \R in the section entitled +

The newline convention affects where the circumflex and dollar assertions are +true. It also affects the interpretation of the dot metacharacter when +dotall is not set, and the behaviour of \N. However, it does not affect +what the \R escape sequence matches. By default, this is any Unicode newline +sequence, for Perl compatibility. However, this can be changed; see the +description of \R in the section entitled -"Newline sequences" +"Newline sequences" below. A change of \R setting can be combined with a change of newline convention.

-
+

Setting match and recursion limits

+

The internal limits on how many calls (and recursive calls) can be done to the internal matching +engine of PCRE during one call to re:run/{2,3}, +can be set by items at the start of the pattern:

+ +

(*LIMIT_MATCH=d)

+

(*LIMIT_RECURSION=d)

+ +

where d is any number of decimal digits. However, the value of the setting must +be less than the value set by the Erlang virtual machine for it to have +any effect. In other words, the pattern writer can lower the limit set by the +VM, but not raise it. If there is more than one setting of one of these +limits, the lower value is used. +

+

The current value for both the limits are 10000000 in the Erlang +VM. Note that the recursion limit does not actually affect the stack +depth of the VM, as PCRE for Erlang is compiled in such a way that the +match function is never called recursively.

+ +

Basically, tampering with these limits is seldom useful.

+
+
Characters and metacharacters @@ -862,7 +933,7 @@ a character class the only metacharacters are:

The backslash character has several uses. Firstly, if it is followed by a -non-alphanumeric character, it takes away any special meaning that character +character that is not a number or a letter, it takes away any special meaning that character may have. This use of backslash as an escape character applies both inside and outside character classes.

@@ -872,10 +943,14 @@ otherwise be interpreted as a metacharacter, so it is always safe to precede a non-alphanumeric with backslash to specify that it stands for itself. In particular, if you want to match a backslash, you write \\.

-

If a pattern is compiled with the extended option, whitespace in the +

In unicode mode, only ASCII numbers and letters have any special meaning after a +backslash. All other characters (in particular, those whose codepoints are +greater than 127) are treated as literals.

+ +

If a pattern is compiled with the extended option, white space in the pattern (other than in a character class) and characters between a # outside a character class and the next newline are ignored. An escaping backslash can -be used to include a whitespace or # character as part of the pattern.

+be used to include a white space or # character as part of the pattern.

If you want to remove the special meaning from a sequence of characters, you can do so by putting them between \Q and \E. This is different from Perl in @@ -889,42 +964,54 @@ Perl, $ and @ cause variable interpolation. Note the following examples:

\Qabc\E\$\Qxyz\E abc$xyz abc$xyz -

The \Q...\E sequence is recognized both inside and outside character classes.

- +

The \Q...\E sequence is recognized both inside and outside +character classes. An isolated \E that is not preceded by \Q is +ignored. If \Q is not followed by \E later in the pattern, the literal +interpretation continues to the end of the pattern (that is, \E is +assumed at the end). If the isolated \Q is inside a character class, +this causes an error, because the character class is not +terminated.

Non-printing characters

A second use of backslash provides a way of encoding non-printing characters in patterns in a visible manner. There is no restriction on the appearance of non-printing characters, apart from the binary zero that terminates a pattern, -but when a pattern is being prepared by text editing, it is usually easier to -use one of the following escape sequences than the binary character it -represents:

+but when a pattern is being prepared by text editing, it is often easier to use +one of the following escape sequences than the binary character it represents:

\a alarm, that is, the BEL character (hex 07) - \cx "control-x", where x is any character + \cx "control-x", where x is any ASCII character \e escape (hex 1B) - \f formfeed (hex 0C) + \f form feed (hex 0C) \n linefeed (hex 0A) \r carriage return (hex 0D) \t tab (hex 09) - \ddd character with octal code ddd, or backreference + \ddd character with octal code ddd, or back reference \xhh character with hex code hh \x{hhh..} character with hex code hhh.. -

The precise effect of \cx is as follows: if x is a lower case letter, it -is converted to upper case. Then bit 6 of the character (hex 40) is inverted. -Thus \cz becomes hex 1A, but \c{ becomes hex 3B, while \c; becomes hex -7B.

+

The precise effect of \cx on ASCII characters is as follows: if x is a lower +case letter, it is converted to upper case. Then bit 6 of the character (hex +40) is inverted. Thus \cA to \cZ become hex 01 to hex 1A (A is 41, Z is 5A), +but \c{ becomes hex 3B ({ is 7B), and \c; becomes hex 7B (; is 3B). If the +data item (byte or 16-bit value) following \c has a value greater than 127, a +compile-time error occurs. This locks out non-ASCII characters in all modes.

-

After \x, from zero to two hexadecimal digits are read (letters can be in -upper or lower case). Any number of hexadecimal digits may appear between \x{ -and }, but the value of the character code must be less than 256 in non-UTF-8 -mode, and less than 2**31 in UTF-8 mode. That is, the maximum value in -hexadecimal is 7FFFFFFF. Note that this is bigger than the largest Unicode code -point, which is 10FFFF.

+

The \c facility was designed for use with ASCII characters, but with the +extension to Unicode it is even less useful than it once was.

+ +

By default, after \x, from zero to two hexadecimal digits are read (letters +can be in upper or lower case). Any number of hexadecimal digits may appear +between \x{ and }, but the character code is constrained as follows:

+ + 8-bit non-Unicode mode less than 0x100 + 8-bit UTF-8 mode less than 0x10ffff and a valid codepoint + +

Invalid Unicode codepoints are the range 0xd800 to 0xdfff (the so-called +"surrogate" codepoints), and 0xffef.

If characters other than hexadecimal digits appear between \x{ and }, or if there is no terminating }, this form of escape is not recognized. Instead, the @@ -952,17 +1039,12 @@ later, following the discussion of parenthesized subpatterns.

Inside a character class, or if the decimal number is greater than 9 and there have not been that many capturing subpatterns, PCRE re-reads up to three octal digits following the backslash, and uses them to generate a data character. Any -subsequent digits stand for themselves. -The value of a -character specified in octal must be less than \400. -In non-UTF-8 mode, the value of a -character specified in octal must be less than \400. In UTF-8 mode, values up -to \777 are permitted. - +subsequent digits stand for themselves. The value of the character is +constrained in the same way as characters specified in hexadecimal. For example:

- \040 is another way of writing a space + \040 is another way of writing a ASCII space \40 is the same, provided there are fewer than 40 previous capturing subpatterns @@ -977,7 +1059,7 @@ For example:

character with octal code 113 \377 might be a back reference, otherwise - the byte consisting entirely of 1 bits + the value 255 (decimal) \81 is either a back reference, or a binary zero followed by the two characters "8" and "1" @@ -987,12 +1069,19 @@ For example:

a leading zero, because no more than three octal digits are ever read.

-

All the sequences that define a single character value can be used -both inside and outside character classes. In addition, inside a -character class, the sequence \b is interpreted as the backspace -character (hex 08), and the sequences \R and \X are interpreted as -the characters "R" and "X", respectively. Outside a character class, -these sequences have different meanings (see below).

+

All the sequences that define a single character value can be used both inside +and outside character classes. In addition, inside a character class, \b is +interpreted as the backspace character (hex 08).

+

\N is not allowed in a character class. \B, \R, and \X are not special +inside a character class. Like other unrecognized escape sequences, they are +treated as the literal characters "B", "R", and "X". Outside a character class, these +sequences have different meanings.

+ +

Unsupported escape sequences

+ +

In Perl, the sequences \l, \L, \u, and \U are recognized by its string +handler and used to modify the case of following characters. PCRE +does not support these escape sequences.

Absolute and relative back references

@@ -1002,30 +1091,42 @@ reference. A named back reference can be coded as \g{name}. Back references are discussed later, following the discussion of parenthesized subpatterns.

+

Absolute and relative subroutine calls

+

For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or +a number enclosed either in angle brackets or single quotes, is an alternative +syntax for referencing a subpattern as a "subroutine". Details are discussed +later. +Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not +synonymous. The former is a back reference; the latter is a +subroutine call.

+

Generic character types

-

Another use of backslash is for specifying generic character types. The -following are always recognized:

+

Another use of backslash is for specifying generic character types:

\d any decimal digit \D any character that is not a decimal digit - \h any horizontal whitespace character - \H any character that is not a horizontal whitespace character - \s any whitespace character - \S any character that is not a whitespace character - \v any vertical whitespace character - \V any character that is not a vertical whitespace character + \h any horizontal white space character + \H any character that is not a horizontal white space character + \s any white space character + \S any character that is not a white space character + \v any vertical white space character + \V any character that is not a vertical white space character \w any "word" character \W any "non-word" character -

Each pair of escape sequences partitions the complete set of characters into -two disjoint sets. Any given character matches one, and only one, of each pair.

+

There is also the single sequence \N, which matches a non-newline character. +This is the same as the "." metacharacter +when dotall is not set. Perl also uses \N to match characters by name; +PCRE does not support this.

-

These character type sequences can appear both inside and outside character +

Each pair of lower and upper case escape sequences partitions the complete set +of characters into two disjoint sets. Any given character matches one, and only +one, of each pair. The sequences can appear both inside and outside character classes. They each match one character of the appropriate type. If the current -matching point is at the end of the subject string, all of them fail, since +matching point is at the end of the subject string, all of them fail, because there is no character to match.

For compatibility with Perl, \s does not match the VT character (code 11). @@ -1034,18 +1135,34 @@ are HT (9), LF (10), FF (12), CR (13), and space (32). If "use locale;" is included in a Perl script, \s may match the VT character. In PCRE, it never does.

-

In UTF-8 mode, characters with values greater than 128 never match \d, \s, or -\w, and always match \D, \S, and \W. This is true even when Unicode -character property support is available. These sequences retain their original -meanings from before UTF-8 support was available, mainly for efficiency -reasons.

+

A "word" character is an underscore or any character that is a letter or digit. +By default, the definition of letters and digits is controlled by PCRE's +low-valued character tables, in Erlang's case (and without the unicode option), +the ISO-Latin-1 character set.

+ +

By default, in unicode mode, characters with values greater than 128 never match +\d, \s, or \w, and always match \D, \S, and \W. These sequences retain +their original meanings from before UTF support was available, mainly for +efficiency reasons. However, if the ucp option is set, the behaviour is changed so that Unicode +properties are used to determine character types, as follows:

+ + \d any character that \p{Nd} matches (decimal digit) + \s any character that \p{Z} matches, plus HT, LF, FF, CR) + \w any character that \p{L} or \p{N} matches, plus underscore) + +

The upper case escapes match the inverse sets of characters. Note that \d +matches only decimal digits, whereas \w matches any Unicode digit, as well as +any Unicode letter, and underscore. Note also that ucp affects \b, and +\B because they are defined in terms of \w and \W. Matching these sequences +is noticeably slower when ucp is set.

-

The sequences \h, \H, \v, and \V are Perl 5.10 features. In contrast to the -other sequences, these do match certain high-valued codepoints in UTF-8 mode. -The horizontal space characters are:

+

The sequences \h, \H, \v, and \V are features that were added to Perl at +release 5.10. In contrast to the other sequences, which match only ASCII +characters by default, these always match certain high-valued codepoints, +whether or not ucp is set. The horizontal space characters are:

- U+0009 Horizontal tab + U+0009 Horizontal tab (HT) U+0020 Space U+00A0 Non-break space U+1680 Ogham space mark @@ -1069,23 +1186,22 @@ The horizontal space characters are:

The vertical space characters are:

- U+000A Linefeed - U+000B Vertical tab - U+000C Formfeed - U+000D Carriage return - U+0085 Next line + U+000A Linefeed (LF) + U+000B Vertical tab (VT) + U+000C Form feed (FF) + U+000D Carriage return (CR) + U+0085 Next line (NEL) U+2028 Line separator U+2029 Paragraph separator -

A "word" character is an underscore or any character less than 256 that is a -letter or digit. The definition of letters and digits is controlled by PCRE's -low-valued character tables, which are always ISO-8859-1.

+

In 8-bit, non-UTF-8 mode, only the characters with codepoints less than 256 are +relevant.

Newline sequences

Outside a character class, by default, the escape sequence \R matches any -Unicode newline sequence. This is a Perl 5.10 feature. In non-UTF-8 mode \R is +Unicode newline sequence. In non-UTF-8 mode \R is equivalent to the following:

(?>\r\n|\n|\x0b|\f|\r|\x85)

 @@ -1094,11 +1210,11 @@ equivalent to the following:

This particular group matches either the two-character sequence CR followed by LF, or one of the single characters LF (linefeed, U+000A), VT (vertical tab, -U+000B), FF (formfeed, U+000C), CR (carriage return, U+000D), or NEL (next +U+000B), FF (form feed, U+000C), CR (carriage return, U+000D), or NEL (next line, U+0085). The two-character sequence is treated as a single unit that cannot be split.

-

In UTF-8 mode, two additional characters whose codepoints are greater than 255 +

In Unicode mode, two additional characters whose codepoints are greater than 255 are added: LS (line separator, U+2028) and PS (paragraph separator, U+2029). Unicode character property support is not needed for these characters to be recognized.

@@ -1115,35 +1231,39 @@ one of the following sequences:

(*BSR_ANYCRLF) CR, LF, or CRLF only (*BSR_UNICODE) any Unicode newline sequence

-

These override the default and the options given to re:compile/2, but -they can be overridden by options given to re:run/3. Note that these -special settings, which are not Perl-compatible, are recognized only at the -very start of a pattern, and that they must be in upper case. If more than one -of them is present, the last one is used. They can be combined with a change of -newline convention, for example, a pattern can start with:

+

These override the default and the options given to the compiling function, but +they can themselves be overridden by options given to a matching function. Note +that these special settings, which are not Perl-compatible, are recognized only +at the very start of a pattern, and that they must be in upper case. If more +than one of them is present, the last one is used. They can be combined with a +change of newline convention; for example, a pattern can start with:

(*ANY)(*BSR_ANYCRLF)

-

Inside a character class, \R matches the letter "R".

- +

They can also be combined with the (*UTF8), (*UTF) or +(*UCP) special sequences. Inside a character class, \R is treated as an +unrecognized escape sequence, and so matches the letter "R" by default.

Unicode character properties

-

When PCRE is built with Unicode character property support, three additional +

Three additional escape sequences that match characters with specific properties are available. -When not in UTF-8 mode, these sequences are of course limited to testing +When in 8-bit non-UTF-8 mode, these sequences are of course limited to testing characters whose codepoints are less than 256, but they do work in this mode. The extra escape sequences are:

+ +\p{xx} a character with the xx property +\P{xx} a character without the xx property +\X a Unicode extended grapheme cluster + -

\p{xx} a character with the xx property - \P{xx} a character without the xx property - \X an extended Unicode sequence

- -

The property names represented by xx above are limited to the Unicode -script names, the general category properties, and "Any", which matches any -character (including newline). Other properties such as "InMusicalSymbols" are -not currently supported by PCRE. Note that \P{Any} does not match any -characters, so always causes a match failure.

+

The property names represented by xx above are limited to the Unicode +script names, the general category properties, "Any", which matches any +character (including newline), and some special PCRE properties (described +in the next section). +Other Perl properties such as "InMusicalSymbols" are not currently supported by +PCRE. Note that \P{Any} does not match any characters, so always causes a +match failure.

Sets of Unicode characters are defined as belonging to certain scripts. A character from one of these sets can be matched using a script name. For @@ -1158,13 +1278,19 @@ example:

Arabic Armenian +Avestan Balinese +Bamum +Batak Bengali Bopomofo Braille Buginese Buhid Canadian_Aboriginal +Carian +Chakma +Cham Cherokee Common Coptic @@ -1173,6 +1299,7 @@ example:

Cyrillic Deseret Devanagari +Egyptian_Hieroglyphs Ethiopic Georgian Glagolitic @@ -1185,16 +1312,31 @@ example:

Hanunoo Hebrew Hiragana +Imperial_Aramaic Inherited +Inscriptional_Pahlavi +Inscriptional_Parthian +Javanese +Kaithi Kannada Katakana +Kayah_Li Kharoshthi Khmer Lao Latin +Lepcha Limbu Linear_B +Lisu +Lycian +Lydian Malayalam +Mandaic +Meetei_Mayek +Meroitic_Cursive +Meroitic_Hieroglyphs +Miao Mongolian Myanmar New_Tai_Lue @@ -1203,17 +1345,29 @@ example:

Old_Italic Old_Persian Oriya +Old_South_Arabian +Old_Turkic +Ol_Chiki Osmanya Phags_Pa Phoenician +Rejang Runic +Samaritan +Saurashtra +Sharada Shavian Sinhala +Sora_Sompeng +Sundanese Syloti_Nagri Syriac Tagalog Tagbanwa Tai_Le +Tai_Tham +Tai_Viet +Takri Tamil Telugu Thaana @@ -1221,13 +1375,14 @@ example:

Tibetan Tifinagh Ugaritic +Vai Yi -

Each character has exactly one general category property, specified by a -two-letter abbreviation. For compatibility with Perl, negation can be specified -by including a circumflex between the opening brace and the property name. For -example, \p{^Lu} is the same as \P{Lu}.

+

Each character has exactly one Unicode general category property, specified by +a two-letter abbreviation. For compatibility with Perl, negation can be +specified by including a circumflex between the opening brace and the property +name. For example, \p{^Lu} is the same as \P{Lu}.

If only one letter is specified with \p or \P, it includes all the general category properties that start with that letter. In this case, in the absence @@ -1303,13 +1458,10 @@ the Lu, Ll, or Lt property, in other words, a letter that is not classified as a modifier or "other".

The Cs (Surrogate) property applies only to characters in the range U+D800 to -U+DFFF. Such characters are not valid in UTF-8 strings (see RFC 3629) and so -cannot be tested by PCRE, unless UTF-8 validity checking has been turned off -(see the discussion of no_utf8_check in the -pcreapi -page).

+U+DFFF. Such characters are not valid in Unicode strings and so +cannot be tested by PCRE. Perl does not support the Cs property

-

The long synonyms for these properties that Perl supports (such as \p{Letter}) +

The long synonyms for property names that Perl supports (such as \p{Letter}) are not supported by PCRE, nor is it permitted to prefix any of these properties with "Is".

@@ -1318,31 +1470,79 @@ Instead, this property is assumed for any code point that is not in the Unicode table.

Specifying caseless matching does not affect these escape sequences. For -example, \p{Lu} always matches only upper case letters.

- -

The \X escape matches any number of Unicode characters that form an extended -Unicode sequence. \X is equivalent to

+example, \p{Lu} always matches only upper case letters. This is different from +the behaviour of current versions of Perl.

+

Matching characters by Unicode property is not fast, because PCRE has to do a +multistage table lookup in order to find a character's property. That is why +the traditional escape sequences such as \d and \w do not use Unicode +properties in PCRE by default, though you can make them do so by setting the +ucp option or by starting the pattern with (*UCP).

+ +

Extended grapheme clusters

+

The \X escape matches any number of Unicode characters that form an "extended +grapheme cluster", and treats the sequence as an atomic group (see below). +Up to and including release 8.31, PCRE matched an earlier, simpler definition +that was equivalent to

(?>\PM\pM*)

 -

That is, it matches a character without the "mark" property, followed by zero -or more characters with the "mark" property, and treats the sequence as an -atomic group -(see below). -Characters with the "mark" property are typically accents that affect the -preceding character. None of them have codepoints less than 256, so in -non-UTF-8 mode \X matches any one character.

+

That is, it matched a character without the "mark" property, followed by zero +or more characters with the "mark" property. Characters with the "mark" +property are typically non-spacing accents that affect the preceding character.

+ +

This simple definition was extended in Unicode to include more complicated +kinds of composite character by giving each character a grapheme breaking +property, and creating rules that use these properties to define the boundaries +of extended grapheme clusters. In releases of PCRE later than 8.31, \X matches +one of these clusters.

-

Matching characters by Unicode property is not fast, because PCRE has to search -a structure that contains data for over fifteen thousand characters. That is -why the traditional escape sequences such as \d and \w do not use Unicode -properties in PCRE.

+

\X always matches at least one character. Then it decides whether to add +additional characters according to the following rules for ending a cluster:

+ +1. End at the end of the subject string. +2. Do not end between CR and LF; otherwise end after any control character. +3. Do not break Hangul (a Korean script) syllable sequences. Hangul characters +are of five types: L, V, T, LV, and LVT. An L character may be followed by an +L, V, LV, or LVT character; an LV or V character may be followed by a V or T +character; an LVT or T character may be follwed only by a T character. +4. Do not end before extending characters or spacing marks. Characters with +the "mark" property always have the "extend" grapheme breaking property. +5. Do not end after prepend characters. +6. Otherwise, end the cluster. + + +

PCRE's additional properties

+ +

As well as the standard Unicode properties described above, PCRE supports four +more that make it possible to convert traditional escape sequences such as \w +and \s and POSIX character classes to use Unicode properties. PCRE uses these +non-standard, non-Perl properties internally when PCRE_UCP is set. However, +they may also be used explicitly. These properties are:

+ + Xan Any alphanumeric character + Xps Any POSIX space character + Xsp Any Perl space character + Xwd Any Perl "word" character + +

Xan matches characters that have either the L (letter) or the N (number) +property. Xps matches the characters tab, linefeed, vertical tab, form feed, or +carriage return, and any other character that has the Z (separator) property. +Xsp is the same as Xps, except that vertical tab is excluded. Xwd matches the +same characters as Xan, plus underscore.

+ +

There is another non-standard property, Xuc, which matches any character that +can be represented by a Universal Character Name in C++ and other programming +languages. These are the characters $, @, ` (grave accent), and all characters +with Unicode code points greater than or equal to U+00A0, except for the +surrogates U+D800 to U+DFFF. Note that most base (ASCII) characters are +excluded. (Universal Character Names are of the form \uHHHH or \UHHHHHHHH +where H is a hexadecimal digit. Note that the Xuc property does not match these +sequences but the characters that they represent.)

Resetting the match start

-

The escape sequence \K, which is a Perl 5.10 feature, causes any previously -matched characters not to be included in the final matched sequence. For -example, the pattern:

+

The escape sequence \K causes any previously matched characters not to be +included in the final matched sequence. For example, the pattern:

foo\Kbar

 @@ -1362,6 +1562,10 @@ For example, when the pattern

matches "foobar", the first substring is still set to "foo".

+

Perl documents that the use of \K within assertions is "not well defined". In +PCRE, \K is acted upon when it occurs inside positive assertions, but is +ignored in negative assertions.

+

Simple assertions

The final use of backslash is for certain simple assertions. An @@ -1382,13 +1586,20 @@ described below. The backslashed assertions are:

subject -

These assertions may not appear in character classes (but note that \b has a -different meaning, namely the backspace character, inside a character class).

+

Inside a character class, \b has a different meaning; it matches the backspace +character. If any other of these assertions appears in a character class, by +default it matches the corresponding literal character (for example, \B +matches the letter B).

A word boundary is a position in the subject string where the current character and the previous character do not both match \w or \W (i.e. one matches \w and the other matches \W), or the start or end of the string if the -first or last character matches \w, respectively.

+first or last character matches \w, respectively. In a UTF mode, the meanings +of \w and \W can be changed by setting the ucp option. When this is +done, it also affects \b and \B. Neither PCRE nor Perl has a separate "start +of word" or "end of word" metasequence. However, whatever follows \b normally +determines which it is. For example, the fragment \ba matches "a" at the start +of a word.

The \A, \Z, and \z assertions differ from the traditional circumflex and dollar (described in the next section) in that they only ever match at the very @@ -1422,9 +1633,13 @@ regular expression.

Circumflex and dollar +

The circumflex and dollar metacharacters are zero-width assertions. That is, +they test for a particular condition being true without consuming any +characters from the subject string.

+

Outside a character class, in the default matching mode, the circumflex -character is an assertion that is true only if the current matching point is -at the start of the subject string. If the startoffset argument of +character is an assertion that is true only if the current matching point is at +the start of the subject string. If the startoffset argument of re:run/3 is non-zero, circumflex can never match if the multiline option is unset. Inside a character class, circumflex has an entirely different meaning (see below).

@@ -1437,12 +1652,12 @@ constrained to match only at the start of the subject, it is said to be an "anchored" pattern. (There are also other constructs that can cause a pattern to be anchored.)

-

A dollar character is an assertion that is true only if the current matching -point is at the end of the subject string, or immediately before a newline -at the end of the string (by default). Dollar need not be the last character of -the pattern if a number of alternatives are involved, but it should be the last -item in any branch in which it appears. Dollar has no special meaning in a -character class.

+

The dollar character is an assertion that is true only if the current matching +point is at the end of the subject string, or immediately before a newline at +the end of the string (by default). Note, however, that it does not actually +match the newline. Dollar need not be the last character of the pattern if a +number of alternatives are involved, but it should be the last item in any +branch in which it appears. Dollar has no special meaning in a character class.

The meaning of dollar can be changed so that it matches only at the very end of the string, by setting the dollar_endonly option at @@ -1471,12 +1686,11 @@ end of the subject in both modes, and if all branches of a pattern start with

-
Full stop (period, dot) +
Full stop (period, dot) and \N

Outside a character class, a dot in the pattern matches any one character in the subject string except (by default) a character that signifies the end of a line. - In UTF-8 mode, the matched character may be more than one byte long.

When a line ending is defined as a single character, dot never matches that @@ -1497,111 +1711,138 @@ the subject string, it takes two dots to match it.

circumflex and dollar, the only relationship being that they both involve newlines. Dot has no special meaning in a character class.

+

The escape sequence \N behaves like a dot, except that it is not affected by +the PCRE_DOTALL option. In other words, it matches any character except one +that signifies the end of a line. Perl also uses \N to match characters by +name; PCRE does not support this.

+
-
Matching a single byte +
Matching a single data unit -

Outside a character class, the escape sequence \C matches any one byte, both -in and out of UTF-8 mode. Unlike a dot, it always matches any line-ending -characters. The feature is provided in Perl in order to match individual bytes -in UTF-8 mode. Because it breaks up UTF-8 characters into individual bytes, -what remains in the string may be a malformed UTF-8 string. For this reason, -the \C escape sequence is best avoided.

+

Outside a character class, the escape sequence \C matches any one data unit, +whether or not a UTF mode is set. One data unit is one +byte. Unlike a dot, \C always +matches line-ending characters. The feature is provided in Perl in order to +match individual bytes in UTF-8 mode, but it is unclear how it can usefully be +used. Because \C breaks up characters into individual data units, matching one +unit with \C in a UTF mode means that the rest of the string may start with a +malformed UTF character. This has undefined results, because PCRE assumes that +it is dealing with valid UTF strings.

-

PCRE does not allow \C to appear in lookbehind assertions (described below), -because in UTF-8 mode this would make it impossible to calculate the length of +

PCRE does not allow \C to appear in lookbehind assertions (described below) +in a UTF mode, because this would make it impossible to calculate the length of the lookbehind.

+

In general, the \C escape sequence is best avoided. However, one +way of using it that avoids the problem of malformed UTF characters is to use a +lookahead to check the length of the next character, as in this pattern, which +could be used with a UTF-8 string (ignore white space and line breaks):

+ + + (?| (?=[\x00-\x7f])(\C) | + (?=[\x80-\x{7ff}])(\C)(\C) | + (?=[\x{800}-\x{ffff}])(\C)(\C)(\C) | + (?=[\x{10000}-\x{1fffff}])(\C)(\C)(\C)(\C)) + +

A group that starts with (?| resets the capturing parentheses numbers in each +alternative (see "Duplicate Subpattern Numbers" +below). The assertions at the start of each branch check the next UTF-8 +character for values whose encoding uses 1, 2, 3, or 4 bytes, respectively. The +character's individual bytes are then captured by the appropriate number of +groups.

+
Square brackets and character classes -

An opening square bracket introduces a character class, terminated -by a closing square bracket. A closing square bracket on its own is -not special. If a closing square bracket is required as a member of -the class, it should be the first data character in the class (after -an initial circumflex, if present) or escaped with a backslash.

- -

A character class matches a single character in the subject. -In -UTF-8 mode, the character may occupy more than one byte. -A matched -character must be in the set of characters defined by the class, -unless the first character in the class definition is a circumflex, in -which case the subject character must not be in the set defined by the -class. If a circumflex is actually required as a member of the class, -ensure it is not the first character, or escape it with a +

An opening square bracket introduces a character class, terminated by a closing +square bracket. A closing square bracket on its own is not special by default. +However, if the PCRE_JAVASCRIPT_COMPAT option is set, a lone closing square +bracket causes a compile-time error. If a closing square bracket is required as +a member of the class, it should be the first data character in the class +(after an initial circumflex, if present) or escaped with a backslash.

+ +

A character class matches a single character in the subject. In a UTF mode, the +character may be more than one data unit long. A matched character must be in +the set of characters defined by the class, unless the first character in the +class definition is a circumflex, in which case the subject character must not +be in the set defined by the class. If a circumflex is actually required as a +member of the class, ensure it is not the first character, or escape it with a backslash.

For example, the character class [aeiou] matches any lower case vowel, while [^aeiou] matches any character that is not a lower case vowel. Note that a circumflex is just a convenient notation for specifying the characters that are in the class by enumerating those that are not. A class that starts with a -circumflex is not an assertion: it still consumes a character from the subject +circumflex is not an assertion; it still consumes a character from the subject string, and therefore it fails if the current pointer is at the end of the string.

-

In UTF-8 mode, characters with values greater than 255 can be included in a -class as a literal string of bytes, or by using the \x{ escaping mechanism.

+

In UTF-8 mode, characters with values greater than 255 (0xffff) +can be included in a class as a literal string of data units, or by using the +\x{ escaping mechanism.

When caseless matching is set, any letters in a class represent both their upper case and lower case versions, so for example, a caseless [aeiou] matches "A" as well as "a", and a caseless [^aeiou] does not match "A", whereas a -caseful version would. -In UTF-8 mode, PCRE always understands the concept of +caseful version would. In a UTF mode, PCRE always understands the concept of case for characters whose values are less than 128, so caseless matching is always possible. For characters with higher values, the concept of case is supported if PCRE is compiled with Unicode property support, but not otherwise. -If you want to use caseless matching for characters 128 and above, you must -ensure that PCRE is compiled with Unicode property support as well as with -UTF-8 support. -

- -

Characters that might indicate line breaks are never treated in any -special way when matching character classes, whatever line-ending -sequence is in use, and whatever setting of the dotall and -multiline options is used. A class such as [^a] always matches -one of these characters.

- -

The minus (hyphen) character can be used to specify a range of -characters in a character class. For example, [d-m] matches any letter -between d and m, inclusive. If a minus character is required in a -class, it must be escaped with a backslash or appear in a position -where it cannot be interpreted as indicating a range, typically as the -first or last character in the class.

- -

It is not possible to have the literal character "]" as the end -character of a range. A pattern such as [W-]46] is interpreted as a -class of two characters ("W" and "-") followed by a literal string -"46]", so it would match "W46]" or "-46]". However, if the "]" is -escaped with a backslash it is interpreted as the end of range, so -[W-\]46] is interpreted as a class containing a range followed by two -other characters. The octal or hexadecimal representation of "]" can -also be used to end a range.

+If you want to use caseless matching in a UTF mode for characters 128 and +above, you must ensure that PCRE is compiled with Unicode property support as +well as with UTF support.

+ +

Characters that might indicate line breaks are never treated in any special way +when matching character classes, whatever line-ending sequence is in use, and +whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is used. A class +such as [^a] always matches one of these characters.

+ +

The minus (hyphen) character can be used to specify a range of characters in a +character class. For example, [d-m] matches any letter between d and m, +inclusive. If a minus character is required in a class, it must be escaped with +a backslash or appear in a position where it cannot be interpreted as +indicating a range, typically as the first or last character in the class.

+ +

It is not possible to have the literal character "]" as the end character of a +range. A pattern such as [W-]46] is interpreted as a class of two characters +("W" and "-") followed by a literal string "46]", so it would match "W46]" or +"-46]". However, if the "]" is escaped with a backslash it is interpreted as +the end of range, so [W-\]46] is interpreted as a class containing a range +followed by two other characters. The octal or hexadecimal representation of +"]" can also be used to end a range.

Ranges operate in the collating sequence of character values. They can also be -used for characters specified numerically, for example [\000-\037]. -In UTF-8 -mode, ranges can include characters whose values are greater than 255, for -example [\x{100}-\x{2ff}]. -

+used for characters specified numerically, for example [\000-\037]. Ranges +can include any characters that are valid for the current mode.

If a range that includes letters is used when caseless matching is set, it matches the letters in either case. For example, [W-c] is equivalent to -[][\\^_`wxyzabc], matched caselessly -, and in non-UTF-8 mode, if character +[][\\^_`wxyzabc], matched caselessly, and in a non-UTF mode, if character tables for a French locale are in use, [\xc8-\xcb] matches accented E -characters in both cases. In UTF-8 mode, PCRE supports the concept of case for +characters in both cases. In UTF modes, PCRE supports the concept of case for characters with values greater than 128 only when it is compiled with Unicode property support.

-

The character types \d, \D, \p, \P, \s, \S, \w, and \W may -also appear in a character class, and add the characters that they -match to the class. For example, [\dABCDEF] matches any hexadecimal -digit. A circumflex can conveniently be used with the upper case -character types to specify a more restricted set of characters than -the matching lower case type. For example, the class [^\W_] matches -any letter or digit, but not underscore.

+

The character escape sequences \d, \D, \h, \H, \p, \P, \s, \S, \v, +\V, \w, and \W may appear in a character class, and add the characters that +they match to the class. For example, [\dABCDEF] matches any hexadecimal +digit. In UTF modes, the ucp option affects the meanings of \d, \s, \w +and their upper case partners, just as it does when they appear outside a +character class, as described in the section entitled +"Generic character types" +above. The escape sequence \b has a different meaning inside a character +class; it matches the backspace character. The sequences \B, \N, \R, and \X +are not special inside a character class. Like any other unrecognized escape +sequences, they are treated as the literal characters "B", "N", "R", and "X".

+ +

A circumflex can conveniently be used with the upper case character types to +specify a more restricted set of characters than the matching lower case type. +For example, the class [^\W_] matches any letter or digit, but not underscore, +whereas [\w] includes underscore. A positive character class should be read as +"something OR something OR ..." and a negative class as "NOT something AND NOT +something AND NOT ...".

The only metacharacters that are recognized in character classes are backslash, hyphen (only where it can be interpreted as specifying @@ -1611,7 +1852,6 @@ next section), and the terminating closing square bracket. However, escaping other non-alphanumeric characters does no harm.

-
POSIX character classes

Perl supports the POSIX notation for character classes. This uses names @@ -1621,7 +1861,7 @@ this notation. For example,

[01[:alpha:]%]

matches "0", "1", any alphabetic character, or "%". The supported class names -are

+are:

alnum letters and digits @@ -1633,7 +1873,7 @@ are

graph printing characters, excluding space lower lower case letters print printing characters, including space - punct printing characters, excluding letters and digits + punct printing characters, excluding letters and digits and space space whitespace (not quite the same as \s) upper upper case letters word "word" characters (same as \w) @@ -1655,8 +1895,26 @@ by a ^ character after the colon. For example,

syntax [.ch.] and [=ch=] where "ch" is a "collating element", but these are not supported, and an error is given if they are encountered.

-

In UTF-8 mode, characters with values greater than 128 do not match any of -the POSIX character classes.

+

By default, in UTF modes, characters with values greater than 128 do not match +any of the POSIX character classes. However, if the PCRE_UCP option is passed +to pcre_compile(), some of the classes are changed so that Unicode +character properties are used. This is achieved by replacing the POSIX classes +by other sequences, as follows:

+ + + [:alnum:] becomes \p{Xan} + [:alpha:] becomes \p{L} + [:blank:] becomes \h + [:digit:] becomes \p{Nd} + [:lower:] becomes \p{Ll} + [:space:] becomes \p{Xps} + [:upper:] becomes \p{Lu} + [:word:] becomes \p{Xwd} + + +

Negated versions, such as [:^alpha:] use \P instead of \p. The other POSIX +classes are unchanged, and match only characters with code points less than +128.

@@ -1703,19 +1961,13 @@ unset.

extra can be changed in the same way as the Perl-compatible options by using the characters J, U and X respectively.

-

When an option change occurs at top level (that is, not inside subpattern -parentheses), the change applies to the remainder of the pattern that follows. -If the change is placed right at the start of a pattern, PCRE extracts it into -the global options - -

+

When one of these option changes occurs at top level (that is, not inside +subpattern parentheses), the change applies to the remainder of the pattern +that follows. If the change is placed right at the start of a pattern, PCRE +extracts it into the global options.

-

An option change within a subpattern (see below for a description -of subpatterns) affects only that part of the current pattern that -follows it, so

+

An option change within a subpattern (see below for a description of +subpatterns) affects only that part of the subpattern that follows it, so

(a(?i)b)c

 @@ -1733,11 +1985,16 @@ option settings happen at compile time. There would be some very weird behaviour otherwise.

Note: There are other PCRE-specific options that can be set by the -application when the compile or match functions are called. In some cases the -pattern can contain special leading sequences to override what the application -has set or what has been defaulted. Details are given in the section entitled -"Newline sequences" above.

- +application when the compiling or matching functions are called. In some cases +the pattern can contain special leading sequences such as (*CRLF) to override +what the application has set or what has been defaulted. Details are given in +the section entitled "Newline sequences" +above. There are also the (*UTF8) and (*UCP) leading +sequences that can be used to set UTF and Unicode property modes; they are +equivalent to setting the unicode and the ucp +options, respectively. The (*UTF) sequence is a generic version that can be +used with any of the libraries. However, the application can set the +never_utf option, which locks out the use of the (*UTF) sequences.

@@ -1751,16 +2008,17 @@ things:

cat(aract|erpillar|)

 -

matches one of the words "cat", "cataract", or "caterpillar". Without the -parentheses, it would match "cataract", "erpillar" or an empty string.

+

matches "cataract", "caterpillar", or "cat". Without the parentheses, it would +match "cataract", "erpillar" or an empty string.

2. It sets up the subpattern as a capturing subpattern. This means that, when the complete pattern matches, that portion of the subject string that matched the subpattern is passed back to the caller via the return value of -re:run/3. Opening parentheses are counted from left to right (starting -from 1) to obtain numbers for the capturing subpatterns.

- -

For example, if the string "the red king" is matched against the pattern

+re:run/3.

+ +

Opening parentheses are counted from left to right (starting +from 1) to obtain numbers for the capturing subpatterns.For example, if the string +"the red king" is matched against the pattern

the ((red|white) (king|queen))

 @@ -1793,7 +2051,6 @@ from left to right, and options are not reset until the end of the subpattern is reached, an option setting in one branch does affect subsequent branches, so the above patterns match "SUNDAY" as well as "Saturday".

-
Duplicate subpattern numbers @@ -1811,18 +2068,30 @@ at captured substring number one, whichever alternative matched. This construct is useful when you want to capture part, but not all, of one of a number of alternatives. Inside a (?| group, parentheses are numbered as usual, but the number is reset at the start of each branch. The numbers of any capturing -buffers that follow the subpattern start after the highest number used in any -branch. The following example is taken from the Perl documentation. -The numbers underneath show in which buffer the captured content will be -stored.

+parentheses that follow the subpattern start after the highest number used in +any branch. The following example is taken from the Perl documentation. The +numbers underneath show in which buffer the captured content will be stored.

# before ---------------branch-reset----------- after / ( a ) (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x # 1 2 2 3 2 3 4 -

A backreference or a recursive call to a numbered subpattern always -refers to the first one in the pattern with the given number.

+

A back reference to a numbered subpattern uses the most recent value that is +set for that number by any subpattern. The following pattern matches "abcabc" +or "defdef":

+ +

/(?|(abc)|(def))\1/

 + +

In contrast, a subroutine call to a numbered subpattern always refers to the +first one in the pattern with the given number. The following pattern matches +"abcabc" or "defabc":

+ +

/(?|(abc)|(def))(?1)/

 + +

If a condition test +for a subpattern's having matched refers to a non-unique number, the test is +true if any of the subpatterns of that number have matched.

An alternative approach to using this "branch reset" feature is to use duplicate named subpatterns, as described in the next section.

@@ -1837,12 +2106,13 @@ if an expression is modified, the numbers may change. To help with this difficulty, PCRE supports the naming of subpatterns. This feature was not added to Perl until release 5.10. Python had the feature earlier, and PCRE introduced it at release 4.0, using the Python syntax. PCRE now supports both -the Perl and the Python syntax.

+the Perl and the Python syntax. Perl allows identically numbered subpatterns to +have different names, but PCRE does not.

In PCRE, a subpattern can be named in one of three ways: (?<name>...) or (?'name'...) as in Perl, or (?P<name>...) as in Python. References to capturing parentheses from other parts of -the pattern, such as backreferences, recursion, and conditions, can be +the pattern, such as back references, recursion, and conditions, can be made by name as well as by number.

Names consist of up to 32 alphanumeric characters and underscores. Named @@ -1857,11 +2127,13 @@ The capture specification to re:run/3 can use named values if they

By default, a name must be unique within a pattern, but it is possible to relax -this constraint by setting the dupnames option at compile time. This can -be useful for patterns where only one instance of the named parentheses can -match. Suppose you want to match the name of a weekday, either as a 3-letter -abbreviation or as the full name, and in both cases you want to extract the -abbreviation. This pattern (ignoring the line breaks) does the job:

+this constraint by setting the dupnames option at compile time. (Duplicate +names are also always permitted for subpatterns with the same number, set up as +described in the previous section.) Duplicate names can be useful for patterns +where only one instance of the named parentheses can match. Suppose you want to +match the name of a weekday, either as a 3-letter abbreviation or as the full +name, and in both cases you want to extract the abbreviation. This pattern +(ignoring the line breaks) does the job:

(?<DN>Mon|Fri|Sun)(?:day)?| @@ -1887,7 +2159,13 @@ details of the interfaces for handling named subpatterns, see the documentation.

--> -

In case of capturing named subpatterns which are not unique, the first occurrence is returned from re:exec/3, if the name is specified int the values part of the capture statement.

+

In case of capturing named subpatterns which names are not unique, the first matching occurrence (counted from left to right in the subject) is returned from re:exec/3, if the name is specified in the values part of the capture statement. The all_names capturing value will match all of the names in the same way.

+ +

Warning: You cannot use different names to distinguish between two +subpatterns with the same number because PCRE uses only the numbers when +matching. For this reason, an error is given at compile time if different names +are given to subpatterns with the same number. However, you can give the same +name to subpatterns with the same number, even when dupnames is not set.

@@ -1900,14 +2178,13 @@ following items:

a literal data character the dot metacharacter the \C escape sequence - the \X escape sequence -(in UTF-8 mode with Unicode properties) - + the \X escape sequence the \R escape sequence - an escape such as \d that matches a single character + an escape such as \d or \pL that matches a single character a character class a back reference (see next section) - a parenthesized subpattern (unless it is an assertion) + a parenthesized subpattern (including assertions) + a subroutine call to a subpattern (recursive or otherwise)

The general repetition quantifier specifies a minimum and maximum number of @@ -1933,14 +2210,18 @@ where a quantifier is not allowed, or one that does not match the syntax of a quantifier, is taken as a literal character. For example, {,6} is not a quantifier, but a literal string of four characters.

-

In UTF-8 mode, quantifiers apply to UTF-8 characters rather than to individual -bytes. Thus, for example, \x{100}{2} matches two UTF-8 characters, each of -which is represented by a two-byte sequence. Similarly, when Unicode property -support is available, \X{3} matches three Unicode extended sequences, each of -which may be several bytes long (and they may be of different lengths).

- +

In Unicode mode, quantifiers apply to characters rather than to individual data +units. Thus, for example, \x{100}{2} matches two characters, each of +which is represented by a two-byte sequence in a UTF-8 string. Similarly, +\X{3} matches three Unicode extended grapheme clusters, each of which may be +several data units long (and they may be of different lengths).

The quantifier {0} is permitted, causing the expression to behave as if the -previous item and the quantifier were not present.

+previous item and the quantifier were not present. This may be useful for +subpatterns that are referenced as subroutines +from elsewhere in the pattern (but see also the section entitled +"Defining subpatterns for use by reference only" +below). Items other than subpatterns that have a {0} quantifier are omitted +from the compiled pattern.

For convenience, the three most common quantifiers have single-character abbreviations:

@@ -2014,8 +2295,8 @@ pattern as though it were preceded by \A.

worth setting dotall in order to obtain this optimization, or alternatively using ^ to indicate anchoring explicitly.

-

However, there is one situation where the optimization cannot be used. When .* -is inside capturing parentheses that are the subject of a backreference +

However, there are some cases where the optimization cannot be used. When .* +is inside capturing parentheses that are the subject of a back reference elsewhere in the pattern, a match at the start may fail where a later one succeeds. Consider, for example:

@@ -2024,6 +2305,15 @@ succeeds. Consider, for example:

If the subject is "xyz123abc123" the match point is the fourth character. For this reason, such a pattern is not implicitly anchored.

+

Another case where implicit anchoring is not applied is when the leading .* is +inside an atomic group. Once again, a match at the start may fail where a later +one succeeds. Consider this pattern:

+ +

(?>.*?a)b

 + +

It matches "ab" in the subject "aab". The use of the backtracking control verbs +(*PRUNE) and (*SKIP) also disable this optimization.

+

When a capturing subpattern is repeated, the value captured is the substring that matched the final iteration. For example, after

@@ -2162,11 +2452,10 @@ further details of the handling of digits following a backslash. There is no such problem when named parentheses are used. A back reference to any subpattern is possible using named parentheses (see below).

-

Another way of avoiding the ambiguity inherent in the use of digits -following a backslash is to use the \g escape sequence, which is a -feature introduced in Perl 5.10. This escape must be followed by an -unsigned number or a negative number, optionally enclosed in -braces. These examples are all identical:

+

Another way of avoiding the ambiguity inherent in the use of digits following a +backslash is to use the \g escape sequence. This escape must be followed by an +unsigned number or a negative number, optionally enclosed in braces. These +examples are all identical:

(ring), \1 @@ -2182,10 +2471,10 @@ reference. Consider this example:

(abc(def)ghi)\g{-1}

The sequence \g{-1} is a reference to the most recently started capturing -subpattern before \g, that is, is it equivalent to \2. Similarly, \g{-2} -would be equivalent to \1. The use of relative references can be helpful in -long patterns, and also in patterns that are created by joining together -fragments that contain references within themselves.

+subpattern before \g, that is, is it equivalent to \2 in this example. +Similarly, \g{-2} would be equivalent to \1. The use of relative references +can be helpful in long patterns, and also in patterns that are created by +joining together fragments that contain references within themselves.

A back reference matches whatever actually matched the capturing subpattern in the current subject string, rather than anything @@ -2234,6 +2523,8 @@ some delimiter must be used to terminate the back reference. If the extended option is set, this can be whitespace. Otherwise an empty comment (see "Comments" below) can be used.

+

Recursive back references

+

A back reference that occurs inside the parentheses to which it refers fails when the subpattern is first used, so, for example, (a\1) never matches. However, such references can be useful inside repeated subpatterns. For @@ -2248,6 +2539,11 @@ that the first iteration does not need to match the back reference. This can be done using alternation, as in the example above, or by a quantifier with a minimum of zero.

+

Back references of this type cause the group that they reference to be treated +as an atomic group. +Once the whole group has been matched, a subsequent matching failure cannot +cause backtracking into the middle of the group.

+
Assertions @@ -2263,12 +2559,27 @@ those that look ahead of the current position in the subject string, and those that look behind it. An assertion subpattern is matched in the normal way, except that it does not cause the current matching position to be changed.

-

Assertion subpatterns are not capturing subpatterns, and may not be repeated, -because it makes no sense to assert the same thing several times. If any kind -of assertion contains capturing subpatterns within it, these are counted for -the purposes of numbering the capturing subpatterns in the whole pattern. -However, substring capturing is carried out only for positive assertions, -because it does not make sense for negative assertions.

+

Assertion subpatterns are not capturing subpatterns. If such an assertion +contains capturing subpatterns within it, these are counted for the purposes of +numbering the capturing subpatterns in the whole pattern. However, substring +capturing is carried out only for positive assertions. (Perl sometimes, but not +always, does do capturing in negative assertions.)

+ +

For compatibility with Perl, assertion subpatterns may be repeated; though +it makes no sense to assert the same thing several times, the side effect of +capturing parentheses may occasionally be useful. In practice, there only three +cases:

+ + +(1) If the quantifier is {0}, the assertion is never obeyed during matching. +However, it may contain internal capturing parenthesized groups that are called +from elsewhere via the subroutine mechanism. +(2) If quantifier is {0,n} where n is greater than zero, it is treated as if it +were {0,1}. At run time, the rest of the pattern match is tried with and +without the assertion, the order depending on the greediness of the quantifier. +(3) If the minimum repetition is greater than zero, the quantifier is ignored. +The assertion is obeyed just once when encountered during matching. +

Lookahead assertions

@@ -2294,7 +2605,8 @@ lookbehind assertion is needed to achieve the other effect.

If you want to force a matching failure at some point in a pattern, the most convenient way to do it is with (?!) because an empty string always matches, so -an assertion that requires there not to be an empty string must always fail.

+an assertion that requires there not to be an empty string must always fail. +The backtracking control verb (*FAIL) or (*F) is a synonym for (?!).

Lookbehind assertions

@@ -2317,33 +2629,38 @@ do not all have to have the same fixed length. Thus

causes an error at compile time. Branches that match different length strings are permitted only at the top level of a lookbehind assertion. This is an -extension compared with Perl (at least for 5.8), which requires all branches to +extension compared with Perl, which requires all branches to match the same length of string. An assertion such as

(?<=ab(c|de))

is not permitted, because its single top-level branch can match two different -lengths, but it is acceptable if rewritten to use two top-level branches:

+lengths, but it is acceptable to PCRE if rewritten to use two top-level +branches:

(?<=abc|abde)

 -

In some cases, the Perl 5.10 escape sequence \K (see above) can be -used instead of a lookbehind assertion; this is not restricted to a -fixed-length.

+

In some cases, the escape sequence \K (see above) can be +used instead of a lookbehind assertion to get round the fixed-length +restriction.

The implementation of lookbehind assertions is, for each alternative, to temporarily move the current position back by the fixed length and then try to match. If there are insufficient characters before the current position, the assertion fails.

-

PCRE does not allow the \C escape (which matches a single byte in UTF-8 mode) -to appear in lookbehind assertions, because it makes it impossible to calculate -the length of the lookbehind. The \X and \R escapes, which can match -different numbers of bytes, are also not permitted.

+

In a UTF mode, PCRE does not allow the \C escape (which matches a single data +unit even in a UTF mode) to appear in lookbehind assertions, because it makes +it impossible to calculate the length of the lookbehind. The \X and \R +escapes, which can match different numbers of data units, are also not +permitted.

+

"Subroutine" calls (see below) such as (?2) or (?&X) are permitted in lookbehinds, as long +as the subpattern matches a fixed-length string. Recursion, +however, is not supported.

Possessive quantifiers can be used in conjunction with lookbehind assertions to -specify efficient matching at the end of the subject string. Consider a simple -pattern such as

+specify efficient matching of fixed-length strings at the end of subject +strings. Consider a simple pattern such as

abcd$

 @@ -2406,8 +2723,8 @@ characters that are not "999".

It is possible to cause the matching process to obey a subpattern conditionally or to choose between two alternative subpatterns, depending on -the result of an assertion, or whether a previous capturing subpattern matched -or not. The two possible forms of conditional subpattern are

+the result of an assertion, or whether a specific capturing subpattern has +already been matched. The two possible forms of conditional subpattern are:

(?(condition)yes-pattern) @@ -2416,7 +2733,13 @@ or not. The two possible forms of conditional subpattern are

If the condition is satisfied, the yes-pattern is used; otherwise the no-pattern (if present) is used. If there are more than two alternatives in the -subpattern, a compile-time error occurs.

+subpattern, a compile-time error occurs. Each of the two alternatives may +itself contain nested subpatterns of any form, including conditional +subpatterns; the restriction to two alternatives applies only at the level of +the condition. This pattern fragment is an example where the alternatives are +complex:

+ +

(?(1) (A|B|C) | (D | (?(2)E|F) | E) )

There are four kinds of condition: references to subpatterns, references to recursion, a pseudo-condition called DEFINE, and assertions.

@@ -2425,13 +2748,16 @@ recursion, a pseudo-condition called DEFINE, and assertions.

Checking for a used subpattern by number

If the text between the parentheses consists of a sequence of -digits, the condition is true if the capturing subpattern of that -number has previously matched. An alternative notation is to precede -the digits with a plus or minus sign. In this case, the subpattern -number is relative rather than absolute. The most recently opened -parentheses can be referenced by (?(-1), the next most recent by -(?(-2), and so on. In looping constructs it can also make sense to -refer to subsequent groups with constructs such as (?(+2).

+digits, the condition is true if a capturing subpattern of that number has previously +matched. If there is more than one capturing subpattern with the same number +(see the earlier section about duplicate subpattern numbers), +the condition is true if any of them have matched. An alternative notation is +to precede the digits with a plus or minus sign. In this case, the subpattern +number is relative rather than absolute. The most recently opened parentheses +can be referenced by (?(-1), the next most recent by (?(-2), and so on. Inside +loops it can also make sense to refer to subsequent groups. The next +parentheses to be opened can be referenced as (?(+1), and so on. (The value +zero in any of these forms is not used; it provokes a compile-time error.)

Consider the following pattern, which contains non-significant whitespace to make it more readable (assume the extended @@ -2442,7 +2768,7 @@ option) and to divide it into three parts for ease of discussion:

The first part matches an optional opening parenthesis, and if that character is present, sets it as the first captured substring. The second part matches one or more characters that are not parentheses. The third part is a -conditional subpattern that tests whether the first set of parentheses matched +conditional subpattern that tests whether or not the first set of parentheses matched or not. If they did, that is, if subject started with an opening parenthesis, the condition is true, and so the yes-pattern is executed and a closing parenthesis is required. Otherwise, since no-pattern is not present, the @@ -2472,6 +2798,10 @@ consist entirely of digits is not recommended.

(?<OPEN> \( )? [^()]+ (?(<OPEN>) \) )

 +

If the name used in a condition of this kind is a duplicate, the test is +applied to all subpatterns of the same name, and is true if any one of them has +matched.

+

Checking for pattern recursion

If the condition is the string (R), and there is no subpattern with @@ -2481,12 +2811,14 @@ by ampersand follow the letter R, for example:

(?(R3)...) or (?(R&name)...)

 -

the condition is true if the most recent recursion is into the +

the condition is true if the most recent recursion is into a subpattern whose number or name is given. This condition does not -check the entire recursion stack.

+check the entire recursion stack. If the name used in a condition of this kind is a duplicate, the test is +applied to all subpatterns of the same name, and is true if any one of them is +the most recent recursion.

-

At "top level", all these recursion test conditions are false. Recursive -patterns are described below.

+

At "top level", all these recursion test conditions are false. The syntax for recursive +patterns is described below.

Defining subpatterns for use by reference only

@@ -2494,21 +2826,21 @@ patterns are described below.

name DEFINE, the condition is always false. In this case, there may be only one alternative in the subpattern. It is always skipped if control reaches this point in the pattern; the idea of DEFINE is that it can be used to define -"subroutines" that can be referenced from elsewhere. (The use of "subroutines" -is described below.) For example, a pattern to match an IPv4 address could be +"subroutines" that can be referenced from elsewhere. (The use of subroutines +is described below.) For example, a pattern to match an IPv4 address such as +"192.168.23.245" could be written like this (ignore whitespace and line breaks):

(?(DEFINE) (?<byte> 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) ) \b (?&byte) (\.(?&byte)){3} \b

 -

The first part of the pattern is a DEFINE group inside which a another group -named "byte" is defined. This matches an individual component of an IPv4 -address (a number less than 256). When matching takes place, this part of the -pattern is skipped because DEFINE acts like a false condition.

- -

The rest of the pattern uses references to the named group to match the four -dot-separated components of an IPv4 address, insisting on a word boundary at -each end.

+

The first part of the pattern is a DEFINE group inside which a +another group named "byte" is defined. This matches an individual +component of an IPv4 address (a number less than 256). When matching +takes place, this part of the pattern is skipped because DEFINE acts +like a false condition. The rest of the pattern uses references to the +named group to match the four dot-separated components of an IPv4 +address, insisting on a word boundary at each end.

Assertion conditions

@@ -2533,14 +2865,31 @@ dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits.

Comments -

The sequence (?# marks the start of a comment that continues up to the next -closing parenthesis. Nested parentheses are not permitted. The characters -that make up a comment play no part in the pattern matching at all.

- -

If the extended option is set, an unescaped # character outside a -character class introduces a comment that continues to immediately after the -next newline in the pattern.

+

There are two ways of including comments in patterns that are processed by +PCRE. In both cases, the start of the comment must not be in a character class, +nor in the middle of any other sequence of related characters such as (?: or a +subpattern name or number. The characters that make up a comment play no part +in the pattern matching.

+

The sequence (?# marks the start of a comment that continues up to the next +closing parenthesis. Nested parentheses are not permitted. If the PCRE_EXTENDED +option is set, an unescaped # character also introduces a comment, which in +this case continues to immediately after the next newline character or +character sequence in the pattern. Which characters are interpreted as newlines +is controlled by the options passed to a compiling function or by a special +sequence at the start of the pattern, as described in the section entitled +"Newline conventions" +above. Note that the end of this type of comment is a literal newline sequence +in the pattern; escape sequences that happen to represent a newline do not +count. For example, consider this pattern when extended is set, and the +default newline convention is in force:

+ +

abc #comment \n still comment

 + +

On encountering the # character, pcre_compile() skips along, looking for +a newline in the pattern. The sequence \n is still literal at this stage, so +it does not terminate the comment. Only an actual character with the code value +0x0a (the default newline) does so.

@@ -2566,51 +2915,45 @@ case refers recursively to the pattern in which it appears.

Obviously, PCRE cannot support the interpolation of Perl code. Instead, it supports special syntax for recursion of the entire pattern, and also for individual subpattern recursion. After its introduction in PCRE and Python, -this kind of recursion was introduced into Perl at release 5.10.

+this kind of recursion was subsequently introduced into Perl at release 5.10.

A special item that consists of (? followed by a number greater -than zero and a closing parenthesis is a recursive call of the +than zero and a closing parenthesis is a recursive subroutine call of the subpattern of the given number, provided that it occurs inside that -subpattern. (If not, it is a "subroutine" call, which is described in +subpattern. (If not, it is a non-recursive subroutine call, which is described in the next section.) The special item (?R) or (?0) is a recursive call of the entire regular expression.

-

In PCRE (like Python, but unlike Perl), a recursive subpattern call -is always treated as an atomic group. That is, once it has matched -some of the subject string, it is never re-entered, even if it -contains untried alternatives and there is a subsequent matching -failure.

-

This PCRE pattern solves the nested parentheses problem (assume the extended option is set so that whitespace is ignored):

-

\( ( (?>[^()]+) | (?R) )* \)

 +

\( ( [^()]++ | (?R) )* \)

First it matches an opening parenthesis. Then it matches any number of substrings which can either be a sequence of non-parentheses, or a recursive match of the pattern itself (that is, a correctly -parenthesized substring). Finally there is a closing parenthesis.

+parenthesized substring). Finally there is a closing +parenthesis. Note the use of a possessive quantifier to avoid +backtracking into sequences of non-parentheses.

If this were part of a larger pattern, you would not want to recurse the entire pattern, so instead you could use this:

-

( \( ( (?>[^()]+) | (?1) )* \) )

 +

( \( ( [^()]++ | (?1) )* \) )

We have put the pattern into parentheses, and caused the recursion to refer to them instead of the whole pattern.

-

In a larger pattern, keeping track of parenthesis numbers can be -tricky. This is made easier by the use of relative references. (A Perl -5.10 feature.) Instead of (?1) in the pattern above you can write -(?-2) to refer to the second most recently opened parentheses -preceding the recursion. In other words, a negative number counts -capturing parentheses leftwards from the point at which it is -encountered.

+

In a larger pattern, keeping track of parenthesis numbers can be tricky. This +is made easier by the use of relative references. Instead of (?1) in the +pattern above you can write (?-2) to refer to the second most recently opened +parentheses preceding the recursion. In other words, a negative number counts +capturing parentheses leftwards from the point at which it is encountered.

It is also possible to refer to subsequently opened parentheses, by writing references such as (?+2). However, these cannot be recursive because the reference is not inside the parentheses that are -referenced. They are always "subroutine" calls, as described in the +referenced. They are always non-recursive subroutine calls, as described in the next section.

An alternative approach is to use named parentheses instead. The @@ -2618,75 +2961,136 @@ Perl syntax for this is (?&name); PCRE's earlier syntax (?P>name) is also supported. We could rewrite the above example as follows:

-

(?<pn> \( ( (?>[^()]+) | (?&pn) )* \) )

 +

(?<pn> \( ( [^()]++ | (?&pn) )* \) )

If there is more than one subpattern with the same name, the earliest one is used.

This particular example pattern that we have been looking at contains nested -unlimited repeats, and so the use of atomic grouping for matching strings of -non-parentheses is important when applying the pattern to strings that do not -match. For example, when this pattern is applied to

+unlimited repeats, and so the use of a possessive quantifier for matching +strings of non-parentheses is important when applying the pattern to strings +that do not match. For example, when this pattern is applied to

(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()

 -

it yields "no match" quickly. However, if atomic grouping is not used, +

it yields "no match" quickly. However, if a possessive quantifier is not used, the match runs for a very long time indeed because there are so many different ways the + and * repeats can carve up the subject, and all have to be tested before failure can be reported.

-

At the end of a match, the values set for any capturing subpatterns are those -from the outermost level of the recursion at which the subpattern value is set. +

At the end of a match, the values of capturing parentheses are those from +the outermost level. If the pattern above is matched against

- -If the pattern above is matched against

+

Do not confuse the (?R) item with the condition (R), which tests for recursion. +Consider this pattern, which matches text in angle brackets, allowing for +arbitrary nesting. Only digits are allowed in nested brackets (that is, when +recursing), whereas any characters are permitted at the outer level.

-

(ab(cd)ef)

 +

< (?: (?(R) \d++ | [^<>]*+) | (?R)) * >

 -

the value for the capturing parentheses is "ef", which is the last value taken -on at the top level. If additional parentheses are added, giving

+

In this pattern, (?(R) is the start of a conditional subpattern, with two +different alternatives for the recursive and non-recursive cases. The (?R) item +is the actual recursive call.

+ +

Differences in recursion processing between PCRE and Perl

+ +

Recursion processing in PCRE differs from Perl in two important ways. In PCRE +(like Python, but unlike Perl), a recursive subpattern call is always treated +as an atomic group. That is, once it has matched some of the subject string, it +is never re-entered, even if it contains untried alternatives and there is a +subsequent matching failure. This can be illustrated by the following pattern, +which purports to match a palindromic string that contains an odd number of +characters (for example, "a", "aba", "abcba", "abcdcba"):

+ +

^(.|(.)(?1)\2)$

 + +

The idea is that it either matches a single character, or two identical +characters surrounding a sub-palindrome. In Perl, this pattern works; in PCRE +it does not if the pattern is longer than three characters. Consider the +subject string "abcba":

+ +

At the top level, the first character is matched, but as it is not at the end +of the string, the first alternative fails; the second alternative is taken +and the recursion kicks in. The recursive call to subpattern 1 successfully +matches the next character ("b"). (Note that the beginning and end of line +tests are not part of the recursion).

+ +

Back at the top level, the next character ("c") is compared with what +subpattern 2 matched, which was "a". This fails. Because the recursion is +treated as an atomic group, there are now no backtracking points, and so the +entire match fails. (Perl is able, at this point, to re-enter the recursion and +try the second alternative.) However, if the pattern is written with the +alternatives in the other order, things are different:

+ +

^((.)(?1)\2|.)$

 + +

This time, the recursing alternative is tried first, and continues to recurse +until it runs out of characters, at which point the recursion fails. But this +time we do have another alternative to try at the higher level. That is the big +difference: in the previous case the remaining alternative is at a deeper +recursion level, which PCRE cannot use.

+ +

To change the pattern so that it matches all palindromic strings, not just +those with an odd number of characters, it is tempting to change the pattern to +this:

- - \( ( ( (?>[^()]+) | (?R) )* ) \) - ^ ^ - ^ ^ +

^((.)(?1)\2|.?)$

 -

the string they capture is "ab(cd)ef", the contents of the top level -parentheses. - -

+

Again, this works in Perl, but not in PCRE, and for the same reason. When a +deeper recursion has matched a single character, it cannot be entered again in +order to match an empty string. The solution is to separate the two cases, and +write out the odd and even cases as alternatives at the higher level:

-

Do not confuse the (?R) item with the condition (R), which tests -for recursion. Consider this pattern, which matches text in angle -brackets, allowing for arbitrary nesting. Only digits are allowed in -nested brackets (that is, when recursing), whereas any characters are -permitted at the outer level.

+

^(?:((.)(?1)\2|)|((.)(?3)\4|.))

 -

< (?: (?(R) \d++ | [^<>]*+) | (?R)) * >

 +

If you want to match typical palindromic phrases, the pattern has to ignore all +non-word characters, which can be done like this:

+ +

^\W*+(?:((.)\W*+(?1)\W*+\2|)|((.)\W*+(?3)\W*+\4|\W*+.\W*+))\W*+$

 + +

If run with the caseless option, this pattern matches phrases such as "A +man, a plan, a canal: Panama!" and it works well in both PCRE and Perl. Note +the use of the possessive quantifier *+ to avoid backtracking into sequences of +non-word characters. Without this, PCRE takes a great deal longer (ten times or +more) to match typical phrases, and Perl takes so long that you think it has +gone into a loop.

+ +

WARNING: The palindrome-matching patterns above work only if the subject +string does not start with a palindrome that is shorter than the entire string. +For example, although "abcba" is correctly matched, if the subject is "ababa", +PCRE finds the palindrome "aba" at the start, then fails at top level because +the end of the string does not follow. Once again, it cannot jump back into the +recursion to try other alternatives, so the entire match fails.

-

In this pattern, (?(R) is the start of a conditional subpattern, -with two different alternatives for the recursive and non-recursive -cases. The (?R) item is the actual recursive call.

+

The second way in which PCRE and Perl differ in their recursion processing is +in the handling of captured values. In Perl, when a subpattern is called +recursively or as a subpattern (see the next section), it has no access to any +values that were captured outside the recursion, whereas in PCRE these values +can be referenced. Consider this pattern:

+ +

^(.)(\1|a(?2))

 + +

In PCRE, this pattern matches "bab". The first capturing parentheses match "b", +then in the second group, when the back reference \1 fails to match "b", the +second alternative matches "a" and then recurses. In the recursion, \1 does +now match "b" and so the whole match succeeds. In Perl, the pattern fails to +match because inside the recursive call \1 cannot access the externally set +value.

Subpatterns as subroutines -

If the syntax for a recursive subpattern reference (either by number or by +

If the syntax for a recursive subpattern call (either by number or by name) is used outside the parentheses to which it refers, it operates like a -subroutine in a programming language. The "called" subpattern may be defined +subroutine in a programming language. The called subpattern may be defined before or after the reference. A numbered reference can be absolute or relative, as in these examples:

@@ -2708,23 +3112,40 @@ relative, as in these examples:

is used, it does match "sense and responsibility" as well as the other two strings. Another example is given in the discussion of DEFINE above.

-

Like recursive subpatterns, a "subroutine" call is always treated -as an atomic group. That is, once it has matched some of the subject -string, it is never re-entered, even if it contains untried -alternatives and there is a subsequent matching failure.

- -

When a subpattern is used as a subroutine, processing options such as -case-independence are fixed when the subpattern is defined. They cannot be -changed for different calls. For example, consider this pattern:

+

All subroutine calls, whether recursive or not, are always treated as atomic +groups. That is, once a subroutine has matched some of the subject string, it +is never re-entered, even if it contains untried alternatives and there is a +subsequent matching failure. Any capturing parentheses that are set during the +subroutine call revert to their previous values afterwards.

+

Processing options such as case-independence are fixed when a subpattern is +defined, so if it is used as a subroutine, such options cannot be changed for +different calls. For example, consider this pattern:

(abc)(?i:(?-1))

It matches "abcabc". It does not match "abcABC" because the change of processing option does not affect the called subpattern.

-
+
Oniguruma subroutine syntax +

For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or +a number enclosed either in angle brackets or single quotes, is an alternative +syntax for referencing a subpattern as a subroutine, possibly recursively. Here +are two of the examples used above, rewritten using this syntax:

+ +

(?<pn> \( ( (?>[^()]+) | \g<pn> )* \) )

+

(sens|respons)e and \g'1'ibility

+ +

PCRE supports an extension to Oniguruma: if a number is preceded by a +plus or a minus sign it is taken as a relative reference. For example:

+ +

(abc)(?i:\g<-1>)

 + +

Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not +synonymous. The former is a back reference; the latter is a subroutine call.

+ +
+

The behaviour of these verbs in +repeated groups, assertions, +and in subpatterns called as subroutines +(whether or not recursively) is documented below.

-

The new verbs make use of what was previously invalid syntax: an opening -parenthesis followed by an asterisk. In Perl, they are generally of the form -(*VERB:ARG) but PCRE does not support the use of arguments, so its general -form is just (*VERB). Any number of these verbs may occur in a pattern. There -are two kinds:

+

Optimizations that affect backtracking verbs

+

PCRE contains some optimizations that are used to speed up matching by running +some checks at the start of each match attempt. For example, it may know the +minimum length of matching subject, or that a particular character must be +present. When one of these optimizations bypasses the running of a match, any +included backtracking verbs will not, of course, be processed. You can suppress +the start-of-match optimizations by setting the no_start_optimize option +when calling re:compile/2 or re:run/3, or by starting the +pattern with (*NO_START_OPT).

+ +

Experiments with Perl suggest that it too has similar optimizations, sometimes +leading to anomalous results.

Verbs that act immediately

-

The following verbs act as soon as they are encountered:

+

The following verbs act as soon as they are encountered. They may not be +followed by a name.

-

(*ACCEPT)

 +

(*ACCEPT)

This verb causes the match to end successfully, skipping the remainder of the -pattern. When inside a recursion, only the innermost pattern is ended -immediately. PCRE differs from Perl in what happens if the (*ACCEPT) is inside -capturing parentheses. In Perl, the data so far is captured: in PCRE no data is -captured. For example:

+pattern. However, when it is inside a subpattern that is called as a +subroutine, only that subpattern is ended successfully. Matching then continues +at the outer level. If (*ACCEPT) in triggered in a positive assertion, the +assertion succeeds; in a negative assertion, the assertion fails.

-

A(A|B(*ACCEPT)|C)D

 +

If (*ACCEPT) is inside capturing parentheses, the data so far is captured. For +example:

-

This matches "AB", "AAD", or "ACD", but when it matches "AB", no data is -captured.

+

A((?:A|B(*ACCEPT)|C)D)

 -

(*FAIL) or (*F)

 +

This matches "AB", "AAD", or "ACD"; when it matches "AB", "B" is captured by +the outer parentheses.

-

This verb causes the match to fail, forcing backtracking to occur. It is +

(*FAIL) or (*F)

+ +

This verb causes a matching failure, forcing backtracking to occur. It is equivalent to (?!) but easier to read. The Perl documentation notes that it is probably useful only when combined with (?{}) or (??{}). Those are, of course, Perl features that are not present in PCRE. The nearest equivalent is the callout feature, as for example in this pattern:

-

a+(?C)(*FAIL)

 +

a+(?C)(*FAIL)

A match with the string "aaaa" always fails, but the callout is taken before each backtrack happens (in this example, 10 times).

- +

Recording which path was taken

+ +

There is one verb whose main purpose is to track how a match was arrived at, +though it also has a secondary use in conjunction with advancing the match +starting point (see (*SKIP) below).

+ + +

In Erlang, there is no interface to retrieve a mark with re:run/{2,3], +so only the secondary purpose is relevant to the Erlang programmer!

+

The rest of this section is therefore deliberately not adapted for reading +by the Erlang programmer, however the examples might help in understanding NAMES as +they can be used by (*SKIP).

+ + +

(*MARK:NAME) or (*:NAME)

 + +

A name is always required with this verb. There may be as many instances of +(*MARK) as you like in a pattern, and their names do not have to be unique.

+ +

When a match succeeds, the name of the last-encountered (*MARK:NAME), +(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the +caller as described in the section entitled "Extra data for pcre_exec()" +in the pcreapi +documentation. Here is an example of pcretest output, where the /K +modifier requests the retrieval and outputting of (*MARK) data:

+ + re> /X(*MARK:A)Y|X(*MARK:B)Z/K + data> XY + 0: XY + MK: A + XZ + 0: XZ + MK: B + +

The (*MARK) name is tagged with "MK:" in this output, and in this example it +indicates which of the two alternatives matched. This is a more efficient way +of obtaining this information than putting each alternative in its own +capturing parentheses.

+ +

If a verb with a name is encountered in a positive assertion that is true, the +name is recorded and passed back if it is the last-encountered. This does not +happen for negative assertions or failing positive assertions.

+ +

After a partial match or a failed match, the last encountered name in the +entire match process is returned. For example:

+ + re> /X(*MARK:A)Y|X(*MARK:B)Z/K + data> XP + No match, mark = B + +

Note that in this unanchored example the mark is retained from the match +attempt that started at the letter "X" in the subject. Subsequent match +attempts starting at "P" and then with an empty string do not get as far as the +(*MARK) item, but nevertheless do not reset it.

+ +

Verbs that act after backtracking

The following verbs do nothing when they are encountered. Matching continues -with what follows, but if there is no subsequent match, a failure is forced. -The verbs differ in exactly what kind of failure occurs.

- -

(*COMMIT)

 - -

This verb causes the whole match to fail outright if the rest of the pattern -does not match. Even if the pattern is unanchored, no further attempts to find -a match by advancing the start point take place. Once (*COMMIT) has been -passed, re:run/3 is committed to finding a match at the current -starting point, or not at all. For example:

+with what follows, but if there is no subsequent match, causing a backtrack to +the verb, a failure is forced. That is, backtracking cannot pass to the left of +the verb. However, when one of these verbs appears inside an atomic group or an +assertion that is true, its effect is confined to that group, because once the +group has been matched, there is never any backtracking into it. In this +situation, backtracking can "jump back" to the left of the entire atomic group +or assertion. (Remember also, as stated above, that this localization also +applies in subroutine calls.)

+ +

These verbs differ in exactly what kind of failure occurs when backtracking +reaches them. The behaviour described below is what happens when the verb is +not in a subroutine or an assertion. Subsequent sections cover these special +cases.

+ +

(*COMMIT)

 + +

This verb, which may not be followed by a name, causes the whole match to fail +outright if there is a later matching failure that causes backtracking to reach +it. Even if the pattern is unanchored, no further attempts to find a match by +advancing the starting point take place. If (*COMMIT) is the only backtracking +verb that is encountered, once it has been passed re:run/{2,3} is +committed to finding a match at the current starting point, or not at all. For +example:

-

a+(*COMMIT)b

 +

a+(*COMMIT)b

This matches "xxaab" but not "aacaab". It can be thought of as a kind of -dynamic anchor, or "I've started, so I must finish."

- -

(*PRUNE)

 - -

This verb causes the match to fail at the current position if the rest of the -pattern does not match. If the pattern is unanchored, the normal "bumpalong" -advance to the next starting character then happens. Backtracking can occur as -usual to the left of (*PRUNE), or when matching to the right of (*PRUNE), but -if there is no match to the right, backtracking cannot cross (*PRUNE). -In simple cases, the use of (*PRUNE) is just an alternative to an atomic -group or possessive quantifier, but there are some uses of (*PRUNE) that cannot -be expressed in any other way.

- -

(*SKIP)

 +dynamic anchor, or "I've started, so I must finish." The name of the most +recently passed (*MARK) in the path is passed back when (*COMMIT) forces a +match failure.

-

This verb is like (*PRUNE), except that if the pattern is unanchored, the -"bumpalong" advance is not to the next character, but to the position in the -subject where (*SKIP) was encountered. (*SKIP) signifies that whatever text -was matched leading up to it cannot be part of a successful match. Consider:

+

If there is more than one backtracking verb in a pattern, a different one that +follows (*COMMIT) may be triggered first, so merely passing (*COMMIT) during a +match does not always guarantee that a match must be at this starting point.

-

a+(*SKIP)b

 +

Note that (*COMMIT) at the start of a pattern is not the same as an anchor, +unless PCRE's start-of-match optimizations are turned off, as shown in this + example:

+ + 1> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list}]). + {match,["abc"]} + 2> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list},no_start_optimize]). + nomatch + +

PCRE knows that any match must start with "a", so the optimization skips along +the subject to "a" before running the first match attempt, which succeeds. When +the optimization is disabled by the no_start_optimize option, the match +starts at "x" and so the (*COMMIT) causes it to fail without trying any other +starting points.

+ +

(*PRUNE) or (*PRUNE:NAME)

 + +

This verb causes the match to fail at the current starting position in the +subject if there is a later matching failure that causes backtracking to reach +it. If the pattern is unanchored, the normal "bumpalong" advance to the next +starting character then happens. Backtracking can occur as usual to the left of +(*PRUNE), before it is reached, or when matching to the right of (*PRUNE), but +if there is no match to the right, backtracking cannot cross (*PRUNE). In +simple cases, the use of (*PRUNE) is just an alternative to an atomic group or +possessive quantifier, but there are some uses of (*PRUNE) that cannot be +expressed in any other way. In an anchored pattern (*PRUNE) has the same effect +as (*COMMIT).

+ +

The behaviour of (*PRUNE:NAME) is the not the same as (*MARK:NAME)(*PRUNE). +It is like (*MARK:NAME) in that the name is remembered for passing back to the +caller. However, (*SKIP:NAME) searches only for names set with (*MARK).

+ + +

The fact that (*PRUNE:NAME) remembers the name is useless to the Erlang programmer, +as names can not be retrieved.

+ + +

(*SKIP)

 + +

This verb, when given without a name, is like (*PRUNE), except that if the +pattern is unanchored, the "bumpalong" advance is not to the next character, +but to the position in the subject where (*SKIP) was encountered. (*SKIP) +signifies that whatever text was matched leading up to it cannot be part of a +successful match. Consider:

+ +

a+(*SKIP)b

If the subject is "aaaac...", after the first match attempt fails (starting at the first character in the string), the starting point skips on to start the -next attempt at "c". Note that a possessive quantifier does not have the same -effect in this example; although it would suppress backtracking during the +next attempt at "c". Note that a possessive quantifer does not have the same +effect as this example; although it would suppress backtracking during the first match attempt, the second attempt would start at the second character instead of skipping on to "c".

-

(*THEN)

 +

(*SKIP:NAME)

 + +

When (*SKIP) has an associated name, its behaviour is modified. When it is +triggered, the previous path through the pattern is searched for the most +recent (*MARK) that has the same name. If one is found, the "bumpalong" advance +is to the subject position that corresponds to that (*MARK) instead of to where +(*SKIP) was encountered. If no (*MARK) with a matching name is found, the +(*SKIP) is ignored.

+ +

Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It ignores +names that are set by (*PRUNE:NAME) or (*THEN:NAME).

+ +

(*THEN) or (*THEN:NAME)

 -

This verb causes a skip to the next alternation if the rest of the pattern does -not match. That is, it cancels pending backtracking, but only within the -current alternation. Its name comes from the observation that it can be used -for a pattern-based if-then-else block:

+

This verb causes a skip to the next innermost alternative when backtracking +reaches it. That is, it cancels any further backtracking within the current +alternative. Its name comes from the observation that it can be used for a +pattern-based if-then-else block:

-

( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...

 +

( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...

If the COND1 pattern matches, FOO is tried (and possibly further items after -the end of the group if FOO succeeds); on failure the matcher skips to the -second alternative and tries COND2, without backtracking into COND1. If (*THEN) -is used outside of any alternation, it acts exactly like (*PRUNE).

+the end of the group if FOO succeeds); on failure, the matcher skips to the +second alternative and tries COND2, without backtracking into COND1. If that +succeeds and BAR fails, COND3 is tried. If subsequently BAZ fails, there are no +more alternatives, so there is a backtrack to whatever came before the entire +group. If (*THEN) is not inside an alternation, it acts like (*PRUNE).

+ +

The behaviour of (*THEN:NAME) is the not the same as (*MARK:NAME)(*THEN). +It is like (*MARK:NAME) in that the name is remembered for passing back to the +caller. However, (*SKIP:NAME) searches only for names set with (*MARK).

+ + +

The fact that (*THEN:NAME) remembers the name is useless to the Erlang programmer, +as names can not be retrieved.

+ + +

A subpattern that does not contain a | character is just a part of the +enclosing alternative; it is not a nested alternation with only one +alternative. The effect of (*THEN) extends beyond such a subpattern to the +enclosing alternative. Consider this pattern, where A, B, etc. are complex +pattern fragments that do not contain any | characters at this level:

+ +

A (B(*THEN)C) | D

 + +

If A and B are matched, but there is a failure in C, matching does not +backtrack into A; instead it moves to the next alternative, that is, D. +However, if the subpattern containing (*THEN) is given an alternative, it +behaves differently:

+ +

A (B(*THEN)C | (*FAIL)) | D

 + +

The effect of (*THEN) is now confined to the inner subpattern. After a failure +in C, matching moves to (*FAIL), which causes the whole subpattern to fail +because there are no more alternatives to try. In this case, matching does now +backtrack into A.

+ +

Note that a conditional subpattern is not considered as having two +alternatives, because only one is ever used. In other words, the | character in +a conditional subpattern has a different meaning. Ignoring white space, +consider:

+ +

^.*? (?(?=a) a | b(*THEN)c )

 + +

If the subject is "ba", this pattern does not match. Because .*? is ungreedy, +it initially matches zero characters. The condition (?=a) then fails, the +character "b" is matched, but "c" is not. At this point, matching does not +backtrack to .*? as might perhaps be expected from the presence of the | +character. The conditional subpattern is part of the single alternative that +comprises the whole pattern, and so the match fails. (If there was a backtrack +into .*?, allowing it to match "b", the match would succeed.)

+ +

The verbs just described provide four different "strengths" of control when +subsequent matching fails. (*THEN) is the weakest, carrying on the match at the +next alternative. (*PRUNE) comes next, failing the match at the current +starting position, but allowing an advance to the next character (for an +unanchored pattern). (*SKIP) is similar, except that the advance may be more +than one character. (*COMMIT) is the strongest, causing the entire match to +fail.

+ + +

More than one backtracking verb

+ +

If more than one backtracking verb is present in a pattern, the one that is +backtracked onto first acts. For example, consider this pattern, where A, B, +etc. are complex pattern fragments:

+ +

(A(*COMMIT)B(*THEN)C|ABD)

 + +

If A matches but B fails, the backtrack to (*COMMIT) causes the entire match to +fail. However, if A and B match, but C fails, the backtrack to (*THEN) causes +the next alternative (ABD) to be tried. This behaviour is consistent, but is +not always the same as Perl's. It means that if two or more backtracking verbs +appear in succession, all the the last of them has no effect. Consider this +example:

+ +

...(*COMMIT)(*PRUNE)...

 + +

If there is a matching failure to the right, backtracking onto (*PRUNE) cases +it to be triggered, and its action is taken. There can never be a backtrack +onto (*COMMIT).

+ +

Backtracking verbs in repeated groups

+ +

PCRE differs from Perl in its handling of backtracking verbs in repeated +groups. For example, consider:

+ +

/(a(*COMMIT)b)+ac/

 + +

If the subject is "abac", Perl matches, but PCRE fails because the (*COMMIT) in +the second repeat of the group acts.

+ +

Backtracking verbs in assertions

+ +

(*FAIL) in an assertion has its normal effect: it forces an immediate backtrack.

+ +

(*ACCEPT) in a positive assertion causes the assertion to succeed without any +further processing. In a negative assertion, (*ACCEPT) causes the assertion to +fail without any further processing.

+ +

The other backtracking verbs are not treated specially if they appear in a +positive assertion. In particular, (*THEN) skips to the next alternative in the +innermost enclosing group that has alternations, whether or not this is within +the assertion.

+ +

Negative assertions are, however, different, in order to ensure that changing a +positive assertion into a negative assertion changes its result. Backtracking +into (*COMMIT), (*SKIP), or (*PRUNE) causes a negative assertion to be true, +without considering any further alternative branches in the assertion. +Backtracking into (*THEN) causes it to skip to the next enclosing alternative +within the assertion (the normal behaviour), but if the assertion does not have +such an alternative, (*THEN) behaves like (*PRUNE).

+ +

Backtracking verbs in subroutines

+ +

These behaviours occur whether or not the subpattern is called recursively. +Perl's treatment of subroutines is different in some cases.

+ +

(*FAIL) in a subpattern called as a subroutine has its normal effect: it forces +an immediate backtrack.

+ +

(*ACCEPT) in a subpattern called as a subroutine causes the subroutine match to +succeed without any further processing. Matching then continues after the +subroutine call.

+ +

(*COMMIT), (*SKIP), and (*PRUNE) in a subpattern called as a subroutine cause +the subroutine match to fail.

+ +

(*THEN) skips to the next alternative in the innermost enclosing group within +the subpattern that has alternatives. If there is no such group within the +subpattern, (*THEN) causes the subroutine match to fail.

-- cgit v1.2.3 From 7e8e435fc04623caefbd1a9e7ce3ce57690753ea Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Thu, 8 Aug 2013 11:39:15 +0200 Subject: stdlib: Include file:all datatypes in filelib --- lib/stdlib/doc/src/filelib.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml index bd780b2b2f..d24d17be80 100644 --- a/lib/stdlib/doc/src/filelib.xml +++ b/lib/stdlib/doc/src/filelib.xml @@ -49,6 +49,12 @@ + + + + + + -- cgit v1.2.3 From 811134171adb1c926111338dba8f36b02a0ff4e0 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Fri, 19 Jul 2013 14:49:17 +0200 Subject: Add documentation of extensions to re module The following compile options are documented: no_start_optimize ucp never_utf The following run options are documented: notempty_atstart {capture, all_names} The following new functions are documented: re:inspect/2 --- lib/stdlib/doc/src/re.xml | 81 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 16 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index aae6345e84..8a47b1579d 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -101,7 +101,7 @@

The options have the following meanings:

unicode - The regular expression is given as a Unicode charlist() and the resulting regular expression code is to be run against a valid Unicode charlist() subject. + The regular expression is given as a Unicode charlist() and the resulting regular expression code is to be run against a valid Unicode charlist() subject. Also consider the ucp option when using Unicode characters. anchored The pattern is forced to be "anchored", that is, it is constrained to match only at the first matching point in the string that is being searched (the "subject string"). This effect can also be achieved by appropriate constructs in the pattern itself. caseless @@ -147,10 +147,50 @@ This option makes it possible to include comments inside complicated patterns. N Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters. bsr_unicode Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default). + no_start_optimize + This option disables optimization that may malfunction if "Special start-of-pattern items" are present in the regular expression. A typical example would be when matching "DEFABC" against "(*COMMIT)ABC", where the start optimization of PCRE would skip the subject up to the "A" and would never realize that the (*COMMIT) instruction should have made the matching fail. This option is only relevant if you use "start-of-pattern items", as discussed in the section "PCRE regular expression details" below. + ucp + Specifies that Unicode Character Properties should be used when resolving \B, \b, \D, \d, \S, \s, \Wand \w. Without this flag, only ISO-Latin-1 properties are used. Using Unicode properties hurts performance, but is semantically correct when working with Unicode characters beyond the ISO-Latin-1 range. + never_utf + Specifies that the (*UTF) and/or (*UTF8) "start-of-pattern items" are forbidden. This flag can not be combined with unicode. Useful if ISO-Latin-1 patterns from an external source are to be compiled. + + + Inspects a compiled regular expression + +

This function takes a compiled regular expression and an item, returning the relevant data from the regular expression. Currently the only supported item is namelist, which returns the tuple {namelist, [ binary()]}, containing the names of all (unique) named subpatterns in the regular expression.

+

Example:

+ +1> {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)"). +{ok,{re_pattern,3,0,0, + <<69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255, + 255,255,...>>}} +2> re:inspect(MP,namelist). +{namelist,[<<"A">>,<<"B">>,<<"C">>]} +3> {ok,MPD} = re:compile("(?<C>A)|(?<B>B)|(?<C>C)",[dupnames]). +{ok,{re_pattern,3,0,0, + <<69,82,67,80,119,0,0,0,0,0,8,0,1,0,0,0,255,255,255,255, + 255,255,...>>}} +4> re:inspect(MPD,namelist). +{namelist,[<<"B">>,<<"C">>]} +

Note specifically in the second example that the duplicate name only occurs once in the returned list, and that the list is in alphabetical order regardless of where the names are positioned in the regular expression. The order of the names is the same as the order of captured subexpressions if {capture, all_names} is given as an option to re:run/3. You can therefore create a name-to-value mapping from the result of re:run/3 like this:

+ +1> {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)"). +{ok,{re_pattern,3,0,0, + <<69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255, + 255,255,...>>}} +2> {namelist, N} = re:inspect(MP,namelist). +{namelist,[<<"A">>,<<"B">>,<<"C">>]} +3> {match,L} = re:run("AA",MP,[{capture,all_names,binary}]). +{match,[<<"A">>,<<>>,<<>>]} +4> NameMap = lists:zip(N,L). +[{<<"A">>,<<"A">>},{<<"B">>,<<>>},{<<"C">>,<<>>}] +

More items are expected to be added in the future.

+ + Match a subject against regular expression and capture subpatterns @@ -179,7 +219,7 @@ This option makes it possible to include comments inside complicated patterns. N

If the regular expression is previously compiled, the option list can only contain the options anchored, global, notbol, noteol, - notempty, {offset, integer() >= 0}, {newline, + notempty, notempty_atstart, {offset, integer() >= 0}, {newline, NLSpec} and {capture, ValueSpec}/{capture, ValueSpec, Type}. Otherwise all options valid for the re:compile/2 function are allowed as well. Options @@ -241,7 +281,7 @@ This option makes it possible to include comments inside complicated patterns. N When the global option is given, re:run/3 handles empty matches in the same way as Perl: a zero-length match at any point will be retried with the options [anchored, - notempty] as well. If that search gives a result of length + notempty_atstart] as well. If that search gives a result of length > 0, the result is included. For example:

re:run("cat","(|at)",[global]). @@ -254,9 +294,9 @@ This option makes it possible to include comments inside complicated patterns. N [{0,0},{0,0}] (the second {0,0} is due to the subexpression marked by the parentheses). As the length of the match is 0, we don't advance to the next position yet. - At offset 0 with [anchored, notempty] + At offset 0 with [anchored, notempty_atstart] The search is retried - with the options [anchored, notempty] at the same + with the options [anchored, notempty_atstart] at the same position, which does not give any interesting result of longer length, so the search position is now advanced to the next character (a). @@ -264,7 +304,7 @@ This option makes it possible to include comments inside complicated patterns. N This time, the search results in [{1,0},{1,0}], so this search will also be repeated with the extra options. - At offset 1 with [anchored, notempty] + At offset 1 with [anchored, notempty_atstart] Now the ab alternative is found and the result will be [{1,2},{1,2}]. The result is added to the list of results and the position in the @@ -272,7 +312,7 @@ This option makes it possible to include comments inside complicated patterns. N At offset 3 The search now once again matches the empty string, giving [{3,0},{3,0}]. - At offset 1 with [anchored, notempty] + At offset 1 with [anchored, notempty_atstart] This will give no result of length > 0 and we are at the last position, so the global search is complete. @@ -293,15 +333,21 @@ This option makes it possible to include comments inside complicated patterns. N subject. With the notempty option, this match is not valid, so re:run/3 searches further into the string for occurrences of "a" or "b".

- -

Perl has no direct equivalent of notempty, but it does - make a special case of a pattern match of the empty string - within its split() function, and when using the /g modifier. It - is possible to emulate Perl's behavior after matching a null - string by first trying the match again at the same offset with - notempty and anchored, and then, if that fails, by - advancing the starting offset (see below) and trying an ordinary - match again.

+ + notempty_atstart + +

This is like notempty, except that an empty string + match that is not at the start of the subject is permitted. If + the pattern is anchored, such a match can occur only if the + pattern contains \K.

+

Perl has no direct equivalent of notempty or notempty_atstart, but it does + make a special case of a pattern match of the empty string + within its split() function, and when using the /g modifier. It + is possible to emulate Perl's behavior after matching a null + string by first trying the match again at the same offset with + notempty_atstart and anchored, and then, if that fails, by + advancing the starting offset (see below) and trying an ordinary + match again.

 notbol @@ -394,6 +440,9 @@ This option makes it possible to include comments inside complicated patterns. N all All captured subpatterns including the complete matching string. This is the default. + all_names + All named subpatterns in the regular expression, as if a list() + of all the names in alphabetical order was given. The list of all names can also be retrieved with the inspect/2 function. first Only the first captured subpattern, which is always the complete matching part of the subject. All explicitly captured subpatterns are discarded. all_but_first -- cgit v1.2.3 From a8221e1844dc6f5235be9a88fd6832183871fc6c Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Wed, 31 Jul 2013 17:36:50 +0200 Subject: Add documentation of report_errors and match_limit(_recursion) --- lib/stdlib/doc/src/re.xml | 154 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 136 insertions(+), 18 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 8a47b1579d..b2cde3f72d 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -218,13 +218,18 @@ This option makes it possible to include comments inside complicated patterns. N

If the regular expression is previously compiled, the option list can only contain the options anchored, - global, notbol, noteol, - notempty, notempty_atstart, {offset, integer() >= 0}, {newline, - NLSpec} and {capture, ValueSpec}/{capture, ValueSpec, + global, notbol, noteol, report_errors, + notempty, notempty_atstart, {offset, integer() >= 0}, + {match_limit, integer() >= 0}, + {match_limit_recursion, integer() >= 0}, + {newline, + NLSpec} and + {capture, ValueSpec}/{capture, ValueSpec, Type}. Otherwise all options valid for the re:compile/2 function are allowed as well. Options allowed both for compilation and execution of a match, namely - anchored and {newline, NLSpec}, will affect both + anchored and {newline, NLSpec}, + will affect both the compilation and execution if present together with a non pre-compiled regular expression.

@@ -254,6 +259,17 @@ This option makes it possible to include comments inside complicated patterns. N be done either by specifying none or an empty list as ValueSpec.

+

The report_errors option adds the possibility that an + error tuple is returned. The tuple will either indicate a + matching error (match_limit or + match_limit_recursion) or a compilation error, where the + error tuple has the format {error, {compile, + CompileErr}}. Note that if the option + report_errors is not given, the function never returns + error tuples, but will report compilation errors as a badarg + exception and failed matches due to exceeded match limits simply + as nomatch.

+

The options relevant for execution are:

@@ -368,6 +384,116 @@ This option makes it possible to include comments inside complicated patterns. N behavior of the dollar metacharacter. It does not affect \Z or \z. + report_errors + +

This option gives better control of the error handling in re:run/3. When it is given, compilation errors (if the regular expression isn't already compiled) as well as run-time errors are explicitly returned as an error tuple.

+

The possible run-time errors are:

+ + match_limit + + The PCRE library sets a limit on how many times the + internal match function can be called. The default value for + this is 10000000 in the library compiled for Erlang. If + {error, match_limit} is returned, it means that the + execution of the regular expression has reached this + limit. Normally this is to be regarded as a nomatch, + which is the default return value when this happens, but by + specifying report_errors, you will get informed when + the match fails due to to many internal calls. + + match_limit_recursion + + This error is very similar to match_limit, but + occurs when the internal match function of PCRE is + "recursively" called more times than the + "match_limit_recursion" limit, which is by default 10000000 as + well. Note that as long as the match_limit and + match_limit_default values are kept at the default + values, the match_limit_recursion error can not occur, + as the match_limit error will occur before that (each + recursive call is also a call, but not vice versa). Both + limits can however be changed, either by setting limits + directly in the regular expression string (see reference + section below) or by giving options to re:run/3 + + +

It is important to understand that what is referred to as + "recursion" when limiting matches is not actually recursion on + the C stack of the Erlang machine, neither is it recursion on + the Erlang process stack. The version of PCRE compiled into the + Erlang VM uses machine "heap" memory to store values that needs to be + kept over recursion in regular expression matches.

+ + {match_limit, integer() >= 0} + +

This option limits the execution time of a match in an + implementation-specific way. It is described in the following + way by the PCRE documentation:

+ + +The match_limit field provides a means of preventing PCRE from using +up a vast amount of resources when running patterns that are not going +to match, but which have a very large number of possibilities in their +search trees. The classic example is a pattern that uses nested +unlimited repeats. + +Internally, pcre_exec() uses a function called match(), which it calls +repeatedly (sometimes recursively). The limit set by match_limit is +imposed on the number of times this function is called during a match, +which has the effect of limiting the amount of backtracking that can +take place. For patterns that are not anchored, the count restarts +from zero for each position in the subject string. + +

This means that runaway regular expression matches can fail + faster if the limit is lowered using this option. The default + value compiled into the Erlang virtual machine is 10000000

+ +

This option does in no way affect the execution of the + Erlang virtual machine in terms of "long running + BIF's". re:run always give control back to the scheduler + of Erlang processes at intervals that ensures the real time + properties of the Erlang system.

 + + + {match_limit_recursion, integer() >= 0} + +

This option limits the execution time and memory + consumption of a match in an implementation-specific way, very + similar to match_limit. It is described in the following + way by the PCRE documentation:

+ + +The match_limit_recursion field is similar to match_limit, but instead +of limiting the total number of times that match() is called, it +limits the depth of recursion. The recursion depth is a smaller number +than the total number of calls, because not all calls to match() are +recursive. This limit is of use only if it is set smaller than +match_limit. + +Limiting the recursion depth limits the amount of machine stack that +can be used, or, when PCRE has been compiled to use memory on the heap +instead of the stack, the amount of heap memory that can be +used. + +

The Erlang virtual machine uses a PCRE library where heap + memory is used when regular expression match recursion happens, + why this limits the usage of machine heap, not C stack.

+ +

Specifying a lower value may result in matches with deep recursion failing, when they should actually have matched:

+ +1> re:run("aaaaaaaaaaaaaz","(a+)*z"). +{match,[{0,14},{0,13}]} +2> re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5}]). +nomatch +3> re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5},report_errors]). +{error,match_limit_recursion} + +

This option, as well as the match_limit option should + only be used in very rare cases. Understanding of the PCRE + library internals is recommended before tampering with these + limits.

+ + {offset, integer() >= 0} Start matching at the offset (position) given in the @@ -442,7 +568,7 @@ This option makes it possible to include comments inside complicated patterns. N All captured subpatterns including the complete matching string. This is the default. all_names All named subpatterns in the regular expression, as if a list() - of all the names in alphabetical order was given. The list of all names can also be retrieved with the inspect/2 function. + of all the names in alphabetical order was given. The list of all names can also be retrieved with the inspect/2 function. first Only the first captured subpattern, which is always the complete matching part of the subject. All explicitly captured subpatterns are discarded. all_but_first @@ -894,27 +1020,19 @@ below. A change of \R setting can be combined with a change of newline convention.

Setting match and recursion limits

-

The internal limits on how many calls (and recursive calls) can be done to the internal matching -engine of PCRE during one call to re:run/{2,3}, -can be set by items at the start of the pattern:

+ +

The caller of re:run/3 can set a limit on the number of times the internal match() function is called and on the maximum depth of recursive calls. These facilities are provided to catch runaway matches that are provoked by patterns with huge matching trees (a typical example is a pattern with nested unlimited repeats) and to avoid running out of system stack by too much recursion. When one of these limits is reached, pcre_exec() gives an error return. The limits can also be set by items at the start of the pattern of the form

(*LIMIT_MATCH=d)

(*LIMIT_RECURSION=d)

 -

where d is any number of decimal digits. However, the value of the setting must -be less than the value set by the Erlang virtual machine for it to have -any effect. In other words, the pattern writer can lower the limit set by the -VM, but not raise it. If there is more than one setting of one of these -limits, the lower value is used. -

+

where d is any number of decimal digits. However, the value of the setting must be less than the value set by the caller of re:run/3 for it to have any effect. In other words, the pattern writer can lower the limit set by the programmer, but not raise it. If there is more than one setting of one of these limits, the lower value is used.

-

The current value for both the limits are 10000000 in the Erlang +

The current default value for both the limits are 10000000 in the Erlang VM. Note that the recursion limit does not actually affect the stack depth of the VM, as PCRE for Erlang is compiled in such a way that the -match function is never called recursively.

+match function never does recursion on the "C-stack".

-

Basically, tampering with these limits is seldom useful.

-
Characters and metacharacters -- cgit v1.2.3 From c83abd94e3b69cad2927378123c5f10c7f8aafe5 Mon Sep 17 00:00:00 2001 From: Patrik Nyblom Date: Thu, 18 Jul 2013 18:56:16 +0200 Subject: Correct UTF-8 in stdlib's notes.xml --- lib/stdlib/doc/src/notes.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index c0f236cd71..2c1daf10ba 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -126,20 +126,20 @@

- Optimizations to gen mechanism. Thanks to Loc Hoguin.

+ Optimizations to gen mechanism. Thanks to Loïc Hoguin.

Own Id: OTP-11025

- Optimizations to gen.erl. Thanks to Loc Hoguin.

+ Optimizations to gen.erl. Thanks to Loïc Hoguin.

Own Id: OTP-11035

Use erlang:demonitor(Ref, [flush]) where applicable. - Thanks to Loc Hoguin.

+ Thanks to Loïc Hoguin.

Own Id: OTP-11039

 @@ -194,7 +194,7 @@

- Improve erl_lint performance. Thanks to Jos Valim.

+ Improve erl_lint performance. Thanks to José Valim.

Own Id: OTP-11143

 -- cgit v1.2.3 From a474bdfda30a3b6a520bf2be4b4550b251095703 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Wed, 21 Aug 2013 13:50:20 +0200 Subject: Correct the specifications of io_lib:fread/2,3 Thanks to Chris King and Kostis Sagonas for pinpointing the bug. --- lib/stdlib/doc/src/io_lib.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml index 3dac259477..68352ffeb1 100644 --- a/lib/stdlib/doc/src/io_lib.xml +++ b/lib/stdlib/doc/src/io_lib.xml @@ -53,6 +53,9 @@ + + + -- cgit v1.2.3 From c011973178d860f280c6ce18b07ce4176aec5b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 6 Sep 2013 13:40:21 +0200 Subject: Change encoding of troublesome notes.xml files to utf-8 Most notes.xml files will be updated in every release and cause the kind of the problems described in the previous commit. --- lib/stdlib/doc/src/notes.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 38cd44def6..2c1daf10ba 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -1,4 +1,4 @@ - + @@ -126,20 +126,20 @@

- Optimizations to gen mechanism. Thanks to Loc Hoguin.

+ Optimizations to gen mechanism. Thanks to Loïc Hoguin.

Own Id: OTP-11025

- Optimizations to gen.erl. Thanks to Loc Hoguin.

+ Optimizations to gen.erl. Thanks to Loïc Hoguin.

Own Id: OTP-11035

Use erlang:demonitor(Ref, [flush]) where applicable. - Thanks to Loc Hoguin.

+ Thanks to Loïc Hoguin.

Own Id: OTP-11039

 @@ -194,7 +194,7 @@

- Improve erl_lint performance. Thanks to Jos Valim.

+ Improve erl_lint performance. Thanks to José Valim.

Own Id: OTP-11143

 @@ -297,7 +297,7 @@

Two adjacent * used as a single pattern will match all files and zero or more directories and subdirectories. - (Thanks to Jos Valim)

+ (Thanks to José Valim)

Own Id: OTP-10431

@@ -535,7 +535,7 @@ Fix filename:nativename/1 on Win32

Don't choke on paths given as binary argument on Win32. - Thanks to Jan Kltzke

+ Thanks to Jan Klötzke

Own Id: OTP-10188

@@ -644,7 +644,7 @@

Fix the type spec from the doc of binary:part/3 (Thanks - to Ricardo Catalinas Jimnez)

+ to Ricardo Catalinas Jiménez)

Own Id: OTP-9920

 @@ -3209,7 +3209,7 @@ It is now possible to hibernate a gen_server/gen_event/gen_fsm. In gen_server and gen_fsm, hibernation is triggered by returning the atom - 'hibernate'instead of a timeout value. In the gen_event + 'hibernate' instead of a timeout value. In the gen_event case hibernation is triggered by a event handler returning a tuple with an extra element containing the atom 'hibernate'.

-- cgit v1.2.3 From 0e4b0ae7ce57117a561f70fa51026d85b4702aaa Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Wed, 4 Sep 2013 14:08:34 +0100 Subject: Add dict:is_empty/1 and orddict:is_empty/1 dict:size/1 runs in constant time, but orddict:size/1 does not. With this change, the two modules stay API compatible and gain a constant-time function for checking whether a dictionary is empty. --- lib/stdlib/doc/src/dict.xml | 7 +++++++ lib/stdlib/doc/src/orddict.xml | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index b8cf61af80..6ff81b56ee 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -176,6 +176,13 @@ merge(Fun, D1, D2) ->

Returns the number of elements in a Dict.

+ + + Return true if the dictionary is empty + +

Returns true if Dict has no elements, false otherwise.

+ + Store a value in a dictionary diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index b6aee7a7d6..6d1702bc59 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -186,6 +186,13 @@ merge(Fun, D1, D2) ->

Returns the number of elements in an Orddict.

 + + + Return true if the dictionary is empty + +

Returns true if Orddict has no elements, false otherwise.

+ + Store a value in a dictionary -- cgit v1.2.3 From 20641fe0f2ea745873fc7557448d3a7deb1bd639 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 16 Sep 2013 20:11:53 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 80 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 2c1daf10ba..2f404523dd 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -30,6 +30,86 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 1.19.3 + +
Fixed Bugs and Malfunctions + + +

The functions dets:foldl/3, + dets:foldr/3, and dets:traverse/2 did not + release the table after having traversed the table to the + end. The bug was introduced in R16B. (Thanks to Manuel + Duran Aguete.)

+

+ Own Id: OTP-11245

+ + +

If the fun M:F/A construct was used + erroneously the linter could crash. (Thanks to Mikhail + Sobolev.)

+

+ Own Id: OTP-11254

+ + +

The specifications of io_lib:fread/2,3 have + been corrected. (Thanks to Chris King and Kostis Sagonas + for pinpointing the bug.)

+

+ Own Id: OTP-11261

+ + +
+ + +
Improvements and New Features + + +

+ Fixed type typo in gen_server.

+

+ Own Id: OTP-11200

+ + +

+ Update type specs in filelib and io_prompt. Thanks to + Jose Valim.

+

+ Own Id: OTP-11208

+ + +

+ Fix typo in abcast() function comment. Thanks to Johannes + Weissl.

+

+ Own Id: OTP-11219

+ + +

+ Make edlin understand a few important control keys. + Thanks to Stefan Zegenhagen.

+

+ Own Id: OTP-11251

+ + +

+ Export the edge/0 type from the digraph module. Thanks to + Alex Ronne Petersen.

+

+ Own Id: OTP-11266

+ + +

+ Fix variable usage tracking in erl_lint and fixed unsafe + variable tracking in try expressions. Thanks to Anthony + Ramine.

+

+ Own Id: OTP-11268

+ + +
+ +
+
STDLIB 1.19.2
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 8f4d1081433032a16c94c051844b48e22908b895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kan=20Mattsson?= Date: Fri, 25 Oct 2013 09:45:59 +0200 Subject: Add XML marker for regexp syntax --- lib/stdlib/doc/src/re.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 71a6e34513..7a9f37ca90 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -40,8 +40,8 @@

This module contains regular expression matching functions for strings and binaries.

-

The regular expression syntax and semantics resemble that of - Perl.

+

The regular expression + syntax and semantics resemble that of Perl.

The library's matching algorithms are currently based on the PCRE library, but not all of the PCRE library is interfaced and @@ -702,7 +702,7 @@ This option makes it possible to include comments inside complicated patterns. N - +

PERL LIKE REGULAR EXPRESSIONS SYNTAX

The following sections contain reference material for the -- cgit v1.2.3 From 25237481ccccd3ddfa74582dc267632ad618ba30 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 9 Dec 2013 20:12:33 +0100 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 2f404523dd..e94a4d6a55 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -30,6 +30,41 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 1.19.4 + +
Fixed Bugs and Malfunctions + + +

+ Fix typo in gen_server.erl. Thanks to Brian L. Troutwine.

+

+ Own Id: OTP-11398

+ + +

+ Spec for atan2 should be atan2(Y, X), not atan2(X, Y). + Thanks to Ary Borenszweig.

+

+ Own Id: OTP-11465

+ + +
+ + +
Improvements and New Features + + +

+ Add XML marker for regexp syntax. Thanks to Håkan + Mattson.

+

+ Own Id: OTP-11442

+ + +
+ +
+
STDLIB 1.19.3
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 875b58c8119858676af0139b0f6b69537cae5706 Mon Sep 17 00:00:00 2001 From: Hans Svensson Date: Wed, 22 Jan 2014 22:10:44 +0100 Subject: Added documentation of lists:droplast/1 --- lib/stdlib/doc/src/lists.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 16f81bdba1..9c7cef066b 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -122,6 +122,14 @@ element.

+ + + Drop the last element of a list + +

Drops the last element of a List. The list should + be non-empty, otherwise the function will crash with a function_clause

+ + Drop elements from a list while a predicate is true -- cgit v1.2.3 From 0cc9753f7f873bbcf8a528e05ab0adbd5c8fc79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 27 Jan 2014 13:10:54 +0100 Subject: Change the default file name encoding mode to +fnaw --- lib/stdlib/doc/src/unicode_usage.xml | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index 33cd70e0b7..ee7dd128f1 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -52,8 +52,8 @@ for UTF-8 and more support for Unicode character sets in the I/O-system.

-

In R17, the encoding default for Erlang source files will be - switched to UTF-8 and in R18 Erlang will support atoms in the full +

In 17.0, the encoding default for Erlang source files was + switched to UTF-8 and in 18.0 Erlang will support atoms in the full Unicode range, meaning full Unicode function and module names

@@ -290,7 +290,7 @@ Having the source code in UTF-8 also allows you to write string literals containing Unicode characters with code points > 255, although atoms, module names and function names will be - restricted to the ISO-Latin-1 range until the R18 release. Binary + restricted to the ISO-Latin-1 range until the 18.0 release. Binary literals where you use the /utf8 type, can also be expressed using Unicode characters > 255. Having module names using characters other than 7-bit ASCII can cause trouble on @@ -385,7 +385,7 @@ external_charlist() = maybe_improper_list(char() | using characters from the ISO-latin-1 character set and atoms are restricted to the same ISO-latin-1 range. These restrictions in the language are of course independent of the encoding of the source - file. Erlang/OTP R18 is expected to handle functions named in + file. Erlang/OTP 18.0 is expected to handle functions named in Unicode as well as Unicode atoms.

Bit-syntax @@ -662,11 +662,14 @@ Eshell V5.10.1 (abort with ^G) containing characters having code points between 128 and 255 may be named either as plain ISO-latin-1 or using UTF-8 encoding. As no consistency is enforced, the Erlang VM can do no consistent - translation of all file names. If the VM would automatically - select encoding based on heuristics, one could get unexpected - behavior on these systems. By default, Erlang starts in "latin1" - file name mode on such systems, meaning bytewise encoding in file - names. This allows for list representation of all file names in + translation of all file names.

+ +

By default on such systems, Erlang starts in utf8 file + name mode if the terminal supports UTF-8, otherwise in + latin1 mode.

+ +

In the latin1 mode, file names are bytewise endcoded. + This allows for list representation of all file names in the system, but, for example, a file named "Östersund.txt", will appear in file:list_dir/1 as either "Östersund.txt" (if the file name was encoded in bytewise ISO-Latin-1 by the program @@ -752,7 +755,7 @@ Eshell V5.10.1 (abort with ^G)

Notes About Raw File Names - +

Raw file names were introduced together with Unicode file name support in erts-5.8.2 (OTP R14B01). The reason "raw file names" was introduced in the system was to be able to @@ -1014,7 +1017,8 @@ ok allowed. This setting should correspond to the actual terminal you are using.

The environment can also affect file name interpretation, if - Erlang is started with the +fna flag.

+ Erlang is started with the +fna flag (which is default from + Erlang/OTP 17.0).

You can check the setting of this by calling io:getopts(), which will give you an option list containing {encoding,unicode} or @@ -1046,8 +1050,7 @@ ok > 255.

+fnl means bytewise interpretation of file names, which was the usual way to represent ISO-Latin-1 file names before - UTF-8 file naming got widespread. This is the default on all - Unix-like operating systems except MacOS X.

+ UTF-8 file naming got widespread.

+fnu means that file names are encoded in UTF-8, which is nowadays the common scheme (although not enforced).

+fna means that you automatically select between @@ -1055,8 +1058,8 @@ ok LC_CTYPE environment variables. This is optimistic heuristics indeed, nothing enforces a user to have a terminal with the same encoding as the file system, but usually, this is - the case. This might be the default behavior in a future - release.

+ the case. This is the default on all Unix-like operating + systems except MacOS X.

The file name translation mode can be read with the file:native_name_encoding/0 function, which returns @@ -1068,7 +1071,7 @@ ok

This function returns the default encoding for Erlang source files (if no encoding comment is present) in the currently running release. For R16 this returns latin1 (meaning - bytewise encoding). In R17 and forward it is expected to return + bytewise encoding). In 17.0 and forward it returns utf8.

The encoding of each file can be specified using comments as described in -- cgit v1.2.3 From cffcb7e445d6fdc8dc5e65a43ee04d5b7cb59c00 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 6 Feb 2014 15:14:11 +0100 Subject: Make the references to various Erlang/OTP releases verbose --- lib/stdlib/doc/src/unicode_usage.xml | 44 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index ee7dd128f1..75505d7d84 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -5,7 +5,7 @@

1999 - 2013 + 2014 Ericsson AB. All Rights Reserved. @@ -41,10 +41,10 @@ future.

The functionality described in EEP10 was implemented in Erlang/OTP - as of R13A, but that was by no means the end of it. In R14B01 support + R13A, but that was by no means the end of it. In Erlang/OTP R14B01 support for Unicode file names was added, although it was in no way complete and was by default disabled on platforms where no guarantee was given - for the file name encoding. With R16A came support for UTF-8 encoded + for the file name encoding. With Erlang/OTP R16A came support for UTF-8 encoded source code, among with enhancements to many of the applications to support both Unicode encoded file names as well as support for UTF-8 encoded files in several circumstances. Most notable is the support @@ -52,8 +52,8 @@ for UTF-8 and more support for Unicode character sets in the I/O-system.

-

In 17.0, the encoding default for Erlang source files was - switched to UTF-8 and in 18.0 Erlang will support atoms in the full +

In Erlang/OTP 17.0, the encoding default for Erlang source files was + switched to UTF-8 and in Erlang/OTP 18.0 Erlang will support atoms in the full Unicode range, meaning full Unicode function and module names

@@ -222,7 +222,7 @@ Representation To handle Unicode characters in Erlang, we have to have a common representation both in lists and binaries. The EEP (10) and - the subsequent initial implementation in R13A settled a standard + the subsequent initial implementation in Erlang/OTP R13A settled a standard representation of Unicode characters in Erlang. Manipulation The Unicode characters need to be processed by the Erlang @@ -274,9 +274,9 @@ (+fnu) on platforms where this is not the default. Source code encoding When it comes to the Erlang source code, there is support - for the UTF-8 encoding and bytewise encoding. The default in R16B - is bytewise (or latin1) encoding. You can control the encoding by - a comment like: + for the UTF-8 encoding and bytewise encoding. The default in + Erlang/OTP R16B was bytewise (or latin1) encoding; in Erlang/OTP 17.0 + it was changed to UTF-8. You can control the encoding by a comment like: %% -*- coding: utf-8 -*- @@ -290,7 +290,7 @@ Having the source code in UTF-8 also allows you to write string literals containing Unicode characters with code points > 255, although atoms, module names and function names will be - restricted to the ISO-Latin-1 range until the 18.0 release. Binary + restricted to the ISO-Latin-1 range until the Erlang/OTP 18.0 release. Binary literals where you use the /utf8 type, can also be expressed using Unicode characters > 255. Having module names using characters other than 7-bit ASCII can cause trouble on @@ -304,7 +304,7 @@
Standard Unicode Representation

In Erlang, strings are actually lists of integers. A string was - up until R13 defined to be encoded in the ISO-latin-1 (ISO8859-1) + up until Erlang/OTP R13 defined to be encoded in the ISO-latin-1 (ISO8859-1) character set, which is, code point by code point, a sub-range of the Unicode character set.

The standard list encoding for strings was therefore easily @@ -321,7 +321,7 @@ encoding has to be decided upon and the string should be converted to a binary in the preferred encoding using unicode:characters_to_binary/{1,2,3}. Strings are not - generally lists of bytes, as they were before R13. They are lists of + generally lists of bytes, as they were before Erlang/OTP R13. They are lists of characters. Characters are not generally bytes, they are Unicode code points.

@@ -447,8 +447,8 @@ Bin4 = <<"Hello"/utf16>>, probably will not appreciate). Another way is to keep it backwards compatible so that only the ISO-Latin-1 character set is used to detect a string. A third way would be to let the user decide - exactly what Unicode ranges are to be viewed as characters. In - R16B you can select either the whole Unicode range or the + exactly what Unicode ranges are to be viewed as characters. Since + Erlang/OTP R16B you can select either the whole Unicode range or the ISO-Latin-1 range by supplying the startup flag +pc Range, where Range is either latin1 or unicode. For backwards compatibility, the default is @@ -685,7 +685,7 @@ Eshell V5.10.1 (abort with ^G) -

The Unicode file naming support was introduced with OTP release +

The Unicode file naming support was introduced with Erlang/OTP R14B01. A VM operating in Unicode file name translation mode can work with files having names in any language or character set (as long as it is supported by the underlying OS and file system). The @@ -709,7 +709,7 @@ Eshell V5.10.1 (abort with ^G) problem even if it uses transparent file naming. Very few systems have mixed file name encodings. A consistent UTF-8 named system will work perfectly in Unicode file name mode. It was still however - considered experimental in R14B01 and is still not the default on + considered experimental in Erlang/OTP R14B01 and is still not the default on such systems. Unicode file name translation is turned on with the +fnu switch to the On Linux, a VM started without explicitly stating the file name translation mode will default to latin1 @@ -757,7 +757,7 @@ Eshell V5.10.1 (abort with ^G) Notes About Raw File Names

Raw file names were introduced together with Unicode file name - support in erts-5.8.2 (OTP R14B01). The reason "raw file + support in erts-5.8.2 (Erlang/OTP R14B01). The reason "raw file names" was introduced in the system was to be able to consistently represent file names given in different encodings on the same system. Having the VM automatically translate a file name @@ -798,10 +798,10 @@ Eshell V5.10.1 (abort with ^G) the argument as a binary.

To force Unicode file name translation mode on systems where this - is not the default was considered experimental in OTP R14B01 due to + is not the default was considered experimental in Erlang/OTP R14B01 due to the fact that the initial implementation did not ignore wrongly encoded file names, so that raw file names could spread unexpectedly - throughout the system. Beginning with R16B, the wrongly encoded file + throughout the system. Beginning with Erlang/OTP R16B, the wrongly encoded file names are only retrieved by special functions (e.g. file:list_dir_all/1), so the impact on existing code is much lower, why it is now supported. Unicode file name translation @@ -1032,7 +1032,7 @@ ok io/io_lib:format with the "~tp" and ~tP formatting instructions, as described above.

You can check this option by calling io:printable_range/0, - which in R16B will return unicode or latin1. To be + which will return unicode or latin1. To be compatible with future (expected) extensions to the settings, one should rather use io_lib:printable_list/1 to check if a list is printable according to the setting. That function will @@ -1070,8 +1070,8 @@ ok

This function returns the default encoding for Erlang source files (if no encoding comment is present) in the currently - running release. For R16 this returns latin1 (meaning - bytewise encoding). In 17.0 and forward it returns + running release. In Erlang/OTP R16B latin1 was returned (meaning + bytewise encoding). In Erlang/OTP 17.0 and forward it returns utf8.

The encoding of each file can be specified using comments as described in -- cgit v1.2.3 From 5006a54b032a82ad55f33e532e4068c34fe143a9 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Thu, 6 Feb 2014 17:15:05 +0100 Subject: erts: Fix race bug in ets:all/0 causing recently created/deleted tables to not be included/excluded. --- lib/stdlib/doc/src/ets.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 21cf8e4149..3df24bf688 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -4,7 +4,7 @@

- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -171,6 +171,10 @@

Returns a list of all tables at the node. Named tables are given by their names, unnamed tables are given by their table identifiers.

+

There is no guarantee of consistency in the returned list. Tables created + or deleted by other processes "during" the ets:all() call may or may + not be included in the list. Only tables created/deleted before + ets:all() is called are guaranteed to be included/excluded.

-- cgit v1.2.3 From b66e75c285cba469c5225f3394da149456d17d16 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 3 Feb 2014 10:27:39 +0100 Subject: Deprecate pre-defined built-in types The types array(), dict(), digraph(), gb_set(), gb_tree(), queue(), set(), and tid() have been deprecated. They will be removed in OTP 18.0. Instead the types array:array(), dict:dict(), digraph:graph(), gb_set:set(), gb_tree:tree(), queue:queue(), sets:set(), and ets:tid() can be used. (Note: it has always been necessary to use ets:tid().) It is allowed in OTP 17.0 to locally re-define the types array(), dict(), and so on. New types array:array/1, dict:dict/2, gb_sets:set/1, gb_trees:tree/2, queue:queue/1, and sets:set/1 have been added. --- lib/stdlib/doc/src/array.xml | 16 +++++--- lib/stdlib/doc/src/dict.xml | 10 ++++- lib/stdlib/doc/src/digraph.xml | 4 +- lib/stdlib/doc/src/gb_sets.xml | 90 +++++++++++++++++++++++------------------ lib/stdlib/doc/src/gb_trees.xml | 46 +++++++++++++-------- lib/stdlib/doc/src/queue.xml | 10 ++++- lib/stdlib/doc/src/sets.xml | 10 ++++- 7 files changed, 117 insertions(+), 69 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index b0b3aa6dc1..b03a2fa0cc 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -3,7 +3,7 @@
- 20072013 + 20072014 Ericsson AB. All Rights Reserved. @@ -84,13 +84,19 @@ the default value cannot be confused with the values of set entries.

{'EXIT',{badarg,_}} = (catch array:get(18, A3)). - array() +

A functional, extendible array. The representation is not documented and is subject to change without notice. Note that arrays cannot be directly compared for equality.

 + + + +

array() is equivalent to array(term()).

+ + @@ -189,7 +195,7 @@ the default value cannot be confused with the values of set entries.

-

Convert an ordered list of pairs {Index, Value} to a +

Convert an ordered list of pairs {Index, Value} to a corresponding extendible array. Default is used as the value for uninitialized entries of the array. If Orddict is not a proper, ordered list of pairs whose first elements are nonnegative @@ -455,7 +461,7 @@ cannot be changed once the array has been created.

-

Convert the array to an ordered list of pairs {Index, Value}, +

Convert the array to an ordered list of pairs {Index, Value}, skipping default-valued entries.

See also: to_orddict/1.

@@ -476,7 +482,7 @@ cannot be changed once the array has been created.

-

Convert the array to an ordered list of pairs {Index, Value}. +

Convert the array to an ordered list of pairs {Index, Value}.

See also: from_orddict/2, sparse_to_orddict/1.

 diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index 6ff81b56ee..942fd1f45e 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -41,9 +41,15 @@ - dict() +

Dictionary as returned by new/0.

 + + + +

dict() is equivalent to dict(term(), term()).

+ + diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index c5d5707f4f..9b9b48584b 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -98,7 +98,7 @@ - digraph() +

A digraph as returned by new/0,1.

 diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index 8ca95df8fc..ea96c14472 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -4,7 +4,7 @@
- 20012013 + 20012014 Ericsson AB. All Rights Reserved. @@ -115,28 +115,40 @@ - gb_set() +

A GB set.

 - + + +

set() is equivalent to set(term()).

+ + + +

A GB set iterator.

 + + + +

iter() is equivalent to iter(term()).

+ + - Add a (possibly existing) element to a gb_set + Add a (possibly existing) element to a set -

Returns a new gb_set formed from Set1 with +

Returns a new set formed from Set1 with Element inserted. If Element is already an element in Set1, nothing is changed.

 - Rebalance tree representation of a gb_set + Rebalance tree representation of a set

Rebalances the tree representation of Set1. Note that this is rarely necessary, but may be motivated when a large @@ -148,9 +160,9 @@ - Remove an element from a gb_set + Remove an element from a set -

Returns a new gb_set formed from Set1 with +

Returns a new set formed from Set1 with Element removed. Assumes that Element is present in Set1.

 @@ -158,9 +170,9 @@ - Remove a (possibly non-existing) element from a gb_set + Remove a (possibly non-existing) element from a set -

Returns a new gb_set formed from Set1 with +

Returns a new set formed from Set1 with Element removed. If Element is not an element in Set1, nothing is changed.

 @@ -168,7 +180,7 @@ - Return the difference of two gb_sets + Return the difference of two sets

Returns only the elements of Set1 which are not also elements of Set2.

@@ -177,14 +189,14 @@ - Return an empty gb_set + Return an empty set -

Returns a new empty gb_set.

+

Returns a new empty set.

 - Filter gb_set elements + Filter set elements

Filters elements in Set1 using predicate function Pred.

@@ -192,7 +204,7 @@ - Fold over gb_set elements + Fold over set elements

Folds Function over every element in Set returning the final value of the accumulator.

@@ -200,46 +212,46 @@ - Convert a list into a gb_set + Convert a list into a set -

Returns a gb_set of the elements in List, where +

Returns a set of the elements in List, where List may be unordered and contain duplicates.

 - Make a gb_set from an ordset list + Make a set from an ordset list -

Turns an ordered-set list List into a gb_set. The list +

Turns an ordered-set list List into a set. The list must not contain duplicates.

 - Add a new element to a gb_set + Add a new element to a set -

Returns a new gb_set formed from Set1 with +

Returns a new set formed from Set1 with Element inserted. Assumes that Element is not present in Set1.

 - Return the intersection of two gb_sets + Return the intersection of two sets

Returns the intersection of Set1 and Set2.

 - Return the intersection of a list of gb_sets + Return the intersection of a list of sets -

Returns the intersection of the non-empty list of gb_sets.

+

Returns the intersection of the non-empty list of sets.

 - Check whether two gb_sets are disjoint + Check whether two sets are disjoint

Returns true if Set1 and Set2 are disjoint (have no elements in common), @@ -248,7 +260,7 @@ - Test for empty gb_set + Test for empty set

Returns true if Set is an empty set, and false otherwise.

@@ -257,7 +269,7 @@ - Test for membership of a gb_set + Test for membership of a set

Returns true if Element is an element of Set, otherwise false.

@@ -265,9 +277,9 @@ - Test for a gb_set + Test for a set -

Returns true if Term appears to be a gb_set, +

Returns true if Term appears to be a set, otherwise false.

 @@ -281,7 +293,7 @@ - Return an iterator for a gb_set + Return an iterator for a set

Returns an iterator that can be used for traversing the entries of Set; see next/1. The implementation @@ -303,7 +315,7 @@ - Traverse a gb_set with an iterator + Traverse a set with an iterator

Returns {Element, Iter2} where Element is the smallest element referred to by the iterator Iter1, @@ -314,14 +326,14 @@ - Return a gb_set with one element + Return a set with one element -

Returns a gb_set containing only the element Element.

+

Returns a set containing only the element Element.

 - Return the number of elements in a gb_set + Return the number of elements in a set

Returns the number of elements in Set.

 @@ -356,24 +368,24 @@ - Convert a gb_set into a list + Convert a set into a list

Returns the elements of Set as a list.

 - Return the union of two gb_sets + Return the union of two sets -

Returns the merged (union) gb_set of Set1 and +

Returns the merged (union) set of Set1 and Set2.

 - Return the union of a list of gb_sets + Return the union of a list of sets -

Returns the merged (union) gb_set of the list of gb_sets.

+

Returns the merged (union) set of the list of sets.

 diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index 57e60eacb7..b2f237e1d7 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -4,7 +4,7 @@
- 20012013 + 20012014 Ericsson AB. All Rights Reserved. @@ -59,13 +59,25 @@ - gb_tree() +

A GB tree.

 - + + +

tree() is equivalent to tree(term(), term()).

+ + + +

A GB tree iterator.

 + + + +

iter() is equivalent to iter(term(), term()).

+ + @@ -108,9 +120,9 @@ Insert or update key with value in a tree -

Inserts Key with value Val into Tree1 if +

Inserts Key with value Value into Tree1 if the key is not present in the tree, otherwise updates - Key to value Val in Tree1. Returns the + Key to value Value in Tree1. Returns the new tree.

 @@ -135,7 +147,7 @@ Insert a new key and value in a tree -

Inserts Key with value Val into Tree1; +

Inserts Key with value Value into Tree1; returns the new tree. Assumes that the key is not present in the tree, crashes otherwise.

 @@ -181,8 +193,8 @@ Return largest key and value -

Returns {Key, Val}, where Key is the largest - key in Tree, and Val is the value associated +

Returns {Key, Value}, where Key is the largest + key in Tree, and Value is the value associated with this key. Assumes that the tree is nonempty.

 @@ -191,7 +203,7 @@ Look up a key in a tree

Looks up Key in Tree; returns - {value, Val}, or none if Key is not + {value, Value}, or none if Key is not present.

 @@ -207,7 +219,7 @@ Traverse a tree with an iterator -

Returns {Key, Val, Iter2} where Key is the +

Returns {Key, Value, Iter2} where Key is the smallest key referred to by the iterator Iter1, and Iter2 is the new iterator to be used for traversing the remaining nodes, or the atom none if no @@ -225,8 +237,8 @@ Return smallest key and value -

Returns {Key, Val}, where Key is the smallest - key in Tree, and Val is the value associated +

Returns {Key, Value}, where Key is the smallest + key in Tree, and Value is the value associated with this key. Assumes that the tree is nonempty.

 @@ -234,8 +246,8 @@ Extract largest key and value -

Returns {Key, Val, Tree2}, where Key is the - largest key in Tree1, Val is the value +

Returns {Key, Value, Tree2}, where Key is the + largest key in Tree1, Value is the value associated with this key, and Tree2 is this tree with the corresponding node deleted. Assumes that the tree is nonempty.

@@ -245,8 +257,8 @@ Extract smallest key and value -

Returns {Key, Val, Tree2}, where Key is the - smallest key in Tree1, Val is the value +

Returns {Key, Value, Tree2}, where Key is the + smallest key in Tree1, Value is the value associated with this key, and Tree2 is this tree with the corresponding node deleted. Assumes that the tree is nonempty.

@@ -263,7 +275,7 @@ Update a key to new value in a tree -

Updates Key to value Val in Tree1; +

Updates Key to value Value in Tree1; returns the new tree. Assumes that the key is present in the tree.

 diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index bcf063bf0f..9c994154d4 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -90,9 +90,15 @@ - queue() +

As returned by new/0.

 + + + +

queue() is equivalent to queue(term()).

+ + diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index 4b220bdd85..c5b8dce4b7 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -4,7 +4,7 @@
- 20002013 + 20002014 Ericsson AB. All Rights Reserved. @@ -45,9 +45,15 @@ - set() +

As returned by new/0.

 + + + +

set() is equivalent to set(term()).

+ + -- cgit v1.2.3 From aab8156f22f62c11bbd0cf83d40be385c6411b3d Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 4 Mar 2014 15:06:53 +0100 Subject: stdlib: Improve the doc of the supervisor's via reference Most of the updates have already been made in 'Fix alternative registry type annotations in supervisor', a5412706f4185fddbac29216a49affd1e9f11da0. Thanks to MaximMinin. --- lib/stdlib/doc/src/supervisor.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 8197684d2d..3a5027d595 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -262,12 +262,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules} locally as Name using register/2. If SupName={global,Name} the supervisor is registered globally as Name using global:register_name/2. If - SupName={via,Module,Name} the supervisor + SupName={via,Module,Name} the supervisor is registered as Name using the registry represented by Module. The Module callback should export the functions register_name/2, unregister_name/1 and send/2, which should behave like the corresponding functions in global. - Thus, {via,global,Name} is a valid reference.

+ Thus, {via,global,Name} is a valid reference.

If no name is provided, the supervisor is not registered.

Module is the name of the callback module.

Args is an arbitrary term which is passed as -- cgit v1.2.3 From e7bfe47762065c87ff11a810988260d1e677f38e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Fri, 28 Feb 2014 17:31:20 +0100 Subject: stdlib: Document Maps module --- lib/stdlib/doc/src/Makefile | 1 + lib/stdlib/doc/src/maps.xml | 318 +++++++++++++++++++++++++++++++++++++++++ lib/stdlib/doc/src/ref_man.xml | 1 + lib/stdlib/doc/src/specs.xml | 1 + 4 files changed, 321 insertions(+) create mode 100644 lib/stdlib/doc/src/maps.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index 6f1e61e70c..ff77c3eea0 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -71,6 +71,7 @@ XML_REF3_FILES = \ lib.xml \ lists.xml \ log_mf_h.xml \ + maps.xml \ math.xml \ ms_transform.xml \ orddict.xml \ diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml new file mode 100644 index 0000000000..76137e3dee --- /dev/null +++ b/lib/stdlib/doc/src/maps.xml @@ -0,0 +1,318 @@ + + + + +

+ + 20132014 + Ericsson AB. All Rights Reserved. + + + The contents of this file are subject to the Erlang Public License, + Version 1.1, (the "License"); you may not use this file except in + compliance with the License. You should have received a copy of the + Erlang Public License along with this software. If not, it can be + retrieved online at http://www.erlang.org/. + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + + maps + Björn-Egil Dahlberg + 1 + 2014-02-28 + A +
+ maps + Maps Processing Functions + +

This module contains functions for maps processing.

+ + + + + + + +

+ Returns a tuple {ok, Value} where Value is the value associated with Key, + or error if no value is associated with Key in Map. +

+

Example:

+ +> Map = #{"hi" => 42}, + Key = "hi", + maps:find(Key,Map). +{ok,42} + + + + + + + +

+ Calls F(K, V, AccIn) for every K to value V + association in Map in + arbitrary order. The function fun F/3 must return a new accumulator + which is passed to the next successive call. maps:fold/3 returns the final + value of the accumulator. The initial accumulator value Init is returned if + the map is empty. +

+

Example:

+ +> Fun = fun(K,V,AccIn) when is_list(K) -> AccIn + V end, + Map = #{"k1" => 1, "k2" => 2, "k3" => 3}, + maps:fold(Fun,0,Map). +6 + + + + + + + +

+ The function takes a list of key-value tuples elements and builds a + map. The associations may be in any order and both keys and values in the + association may be of any term. If the same key appears more than once, + the latter (rightmost) value is used and the previous values are ignored. +

+

Example:

+ +> List = [{"a",ignored},{1337,"value two"},{42,value_three},{"a",1}], + maps:from_list(List). +#{42 => value_three,1337 => "value two","a" => 1} + + + + + + + +

+ Returns the value Value associated with Key if + Map contains Key. + If no value is associated with Key then the call will + fail with an exception. +

+

Example:

+ +> Key = 1337, + Map = #{42 => value_two,1337 => "value one","a" => 1}, + maps:get(Key,Map). +"value one" + + + + + + + +

+ Returns true if map Map contains Key and returns + false if it does not contain the Key. + The function will fail with an exception if Map is not a Map. +

+

Example:

+ +> Map = #{"42" => value}. +#{"42"> => value} +> maps:is_key("42",Map). +true +> maps:is_key(value,Map). +false + + + + + + + +

+ Returns a complete list of keys, in arbitrary order, which resides within Map. +

+

Example:

+ +> Map = #{42 => value_three,1337 => "value two","a" => 1}, + maps:keys(Map). +[42,1337,"a"] + + + + + + + +

+ The function produces a new map Map2 by calling the function fun F(K, V1) for + every K to value V1 association in Map1 in arbitrary order. + The function fun F/2 must return the value V2 to be associated with key K for + the new map Map2. +

+

Example:

+ +> Fun = fun(K,V1) when is_list(K) -> V1*2 end, + Map = #{"k1" => 1, "k2" => 2, "k3" => 3}, + maps:map(Fun,Map). +#{"k1" => 2,"k2" => 4,"k3" => 6} + + + + + + + +

+ Merges two maps into a single map Map3. If two keys exists in both maps the + value in Map1 will be superseded by the value in Map2. +

+

Example:

+ +> Map1 = #{a => "value_one", b => "value_two"}, + Map2 = #{a => 1, c => 2}, + maps:merge(Map1,Map2). +#{a => 1,b => "value_two",c => 2} + + + + + + + +

+ Returns a new empty map. +

+

Example:

+ +> maps:new(). +#{} + + + + + + + +

+ Associates Key with value Value and inserts the association into map Map2. + If key Key already exists in map Map1, the old associated value is + replaced by value Value. The function returns a new map Map2 containing the new association and + the old associations in Map1. +

+

Example:

+ +> Map = #{"a" => 1}. +#{"a" => 1} +> maps:put("a", 42, Map). +#{"a" => 42} +> maps:put("b", 1337, Map). +#{"a" => 1,"b" => 1337} + + + + + + + +

+ The function removes the Key, if it exists, and its associated value from + Map1 and returns a new map Map2 without key Key. +

+

Example:

+ +> Map = #{"a" => 1}. +#{"a" => 1} +> maps:remove("a",Map). +#{} +> maps:remove("b",Map). +#{"a" => 1} + + + + + + + +

+ The function returns the number of key-value associations in the Map. + This operation happens in constant time. +

+

Example:

+ +> Map = #{42 => value_two,1337 => "value one","a" => 1}, + maps:size(Map). +3 + + + + + + + +

+ The fuction returns a list of pairs representing the key-value associations of Map, + where the pairs, [{K1,V1}, ..., {Kn,Vn}], are returned in arbitrary order. +

+

Example:

+ +> Map = #{42 => value_three,1337 => "value two","a" => 1}, + maps:to_list(Map). +[{42,value_three},{1337,"value two"},{"a",1}] + + + + + + + +

+ If Key exists in Map1 the old associated value is + replaced by value Value. The function returns a new map Map2 containing + the new associated value. If Key does not exist in Map1 an exception is + generated. +

+

Example:

+ +> Map = #{"a" => 1}. +#{"a" => 1} +> maps:update("a", 42, Map). +#{"a" => 42} + + + + + + + +

+ Returns a complete list of values, in arbitrary order, contained in map M. +

+

Example:

+ +> Map = #{42 => value_three,1337 => "value two","a" => 1}, + maps:values(Map). +[value_three,"value two",1] + + + + + + + +

+ Returns a new map Map2 without the keys K1 through Kn and their associated values from map Map1. + Any key in Ks that does not exist in Map1 are ignored. +

+

Example:

+ +> Map = #{42 => value_three,1337 => "value two","a" => 1}, + Ks = ["a",42,"other key"], + maps:without(Ks,Map). +#{1337 => "value two"} + + + + diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index 4ecd02a4bf..6c35578bdf 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -68,6 +68,7 @@ + diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index 213ce7563f..60a04ed5e7 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -34,6 +34,7 @@ + -- cgit v1.2.3 From 785cb2081ff2c84453506380c97aced147df2b73 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 11 Mar 2014 09:41:19 +0100 Subject: erts: Clarify escript's encoding of the I/O-server A note has been added that clarifies that the encoding of the I/O-server has to be set explicitly, irrespective of any encoding comment. --- lib/stdlib/doc/src/unicode_usage.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index 75505d7d84..c843ef7736 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -996,7 +996,8 @@ ok
- <marker id="unicode_options_summary"/>Summary of Options + Summary of Options +

The Unicode support is controlled by both command line switches, some standard environment variables and the version of OTP you are using. Most options affect mainly the way Unicode data is displayed, -- cgit v1.2.3 From 6be3e658d9999274d5c0c702bf799b90a110c745 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 17 Mar 2014 12:05:18 +0100 Subject: Clarify the reference manual regarding source file encoding --- lib/stdlib/doc/src/epp.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index cf33530395..8cc977681f 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -4,7 +4,7 @@

- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -46,8 +46,10 @@ valid encodings are Latin-1 and UTF-8 where the case of the characters can be chosen freely. Examples:

-%% coding: utf-8
-%% For this file we have chosen encoding = Latin-1
+%% coding: utf-8
+ 
+%% For this file we have chosen encoding = Latin-1
+ 
 %% -*- coding: latin-1 -*-
-- cgit v1.2.3 From f3cee0e9f409c5850709f11ba15cec22d7387401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Mon, 3 Mar 2014 13:50:23 +0100 Subject: epp: Make it possible to specify a default encoding In the next commit, we will need a way to tell epp which the default encoding should be for files that have no encoding comment. We could add new open() and parse_file() functions with one extra argument for the encoding, but there are already too many variants. To avoid having to add an additional argument to epp:open() and epp:parse_file() each time new options are needed, introduce epp:open/1 and epp:parse_file/2 that takes a property list with options. Also support the new 'default_encoding' option for specifying the default encoding for source files. Thanks to Richard Carlsson for the idea and the implementation of the new functionality in epp.erl. --- lib/stdlib/doc/src/epp.xml | 56 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index cf33530395..50baad04a9 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -63,12 +63,30 @@ + + + Open a file for preprocessing + +

Opens a file for preprocessing.

+

If extra is given in + Options, the return value will be + {ok, Epp, Extra} instead + of {ok, Epp}.

+ + + Open a file for preprocessing + +

Equivalent to epp:open([{name, FileName}, {includes, IncludePath}]).

+ + + Open a file for preprocessing -

Opens a file for preprocessing.

+

Equivalent to epp:open([{name, FileName}, {includes, IncludePath}, + {macros, PredefMacros}]).

 @@ -89,12 +107,24 @@ - + Preprocess and parse an Erlang source file

Preprocesses and parses an Erlang source file. - Note that the tuple {eof, Line} returned at end-of-file is - included as a "form".

+ Note that the tuple {eof, Line} returned + at end-of-file is included as a "form".

+

If extra is given in + Options, the return value will be + {ok, [Form], Extra} instead + of {ok, [Form]}.

+ + + + + Preprocess and parse an Erlang source file + +

Equivalent to epp:parse_file(FileName, [{includes, IncludePath}, + {macros, PredefMacros}]).

 @@ -111,7 +141,7 @@

Returns a string representation of an encoding. The string is recognized by read_encoding/1,2, read_encoding_from_binary/1,2, and - set_encoding/1 as a valid encoding.

+ set_encoding/1,2 as a valid encoding.

 @@ -156,6 +186,22 @@ encoding was found.

 + + + Read and set the encoding of an IO device + +

Reads the encoding from + an IO device and sets the encoding of the device + accordingly. The position of the IO device referenced by + File is not affected. If no valid + encoding can be read from the IO device the encoding of the + IO device is set to the + encoding given by + Default.

+

Returns the read encoding, or none if no valid + encoding was found.

+ + Format an error descriptor -- cgit v1.2.3 From 6c298a7bfa332e5b7d153648d741740abc3bcdf8 Mon Sep 17 00:00:00 2001 From: Steve Vinoski Date: Wed, 19 Mar 2014 11:45:11 -0400 Subject: fix sys:get_state/1,2 and sys:replace_state/2,3 when sys suspended Add two new system callbacks Module:system_get_state/1 and Module:system_replace_state/2 to allow sys:get_state/1,2 and sys:replace_state/2,3 to operate correctly even if a process is sys suspended. Modify gen_server, gen_fsm, and gen_event to support the new callbacks. If a callback module does not export these functions, then by default the Misc value (the same as that passed as the final argument to sys:handle_system_msg/6, and returned as part of the return value of sys:get_status/1,2) is treated as the callback module's state. The previous behaviour of intercepting the system message and passing a tuple of size 2 as the last argument to sys:handle_system_msg/6 is no longer supported. Add tests to verify the correctness of sys:get_state/1,2 and sys:replace_state/2,3 when processes are sys suspended. Add two tests for modules that implement special processes, one that exports system_get_state/1 and system_replace_state/2 and one that doesn't. Much of the credit for this patch goes to James Fish, who reported the initial problem and implemented much of the fix. --- lib/stdlib/doc/src/sys.xml | 73 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index ab8b380f49..a46fa1289f 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -246,6 +246,22 @@ {Module, Id, HandlerState}, where Module is the event handler's module name, Id is the handler's ID (which is the value false if it was registered without an ID), and HandlerState is the handler's state.

+

If the callback module exports a system_get_state/1 function, it will be called in the + target process to get its state. Its argument is the same as the Misc value returned by + get_status/1,2, and the system_get_state/1 + function is expected to extract the callback module's state from it. The system_get_state/1 + function must return {ok, State} where State is the callback module's state.

+

If the callback module does not export a system_get_state/1 function, get_state/1,2 + assumes the Misc value is the callback module's state and returns it directly instead.

+

If the callback module's system_get_state/1 function crashes or throws an exception, the + caller exits with error {callback_failed, {Module, system_get_state}, {Class, Reason}} where + Module is the name of the callback module and Class and Reason indicate + details of the exception.

+

The system_get_state/1 function is primarily useful for user-defined + behaviours and modules that implement OTP special + processes. The gen_server, gen_fsm, and gen_event OTP + behaviour modules export this function, and so callback modules for those behaviours + need not supply their own.

To obtain more information about a process, including its state, see get_status/1 and get_status/2.

@@ -289,6 +305,28 @@ function means that only the state of the particular event handler it was working on when it failed or crashed is unchanged; it can still succeed in changing the states of other event handlers registered in the same gen_event process.

+

If the callback module exports a system_replace_state/2 function, it will be called in the + target process to replace its state using StateFun. Its two arguments are StateFun + and Misc, where Misc is the same as the Misc value returned by + get_status/1,2. A system_replace_state/2 function + is expected to return {ok, NewState, NewMisc} where NewState is the callback module's + new state obtained by calling StateFun, and NewMisc is a possibly new value used to + replace the original Misc (required since Misc often contains the callback + module's state within it).

+

If the callback module does not export a system_replace_state/2 function, + replace_state/2,3 assumes the Misc value is the callback module's state, passes it + to StateFun and uses the return value as both the new state and as the new value of + Misc.

+

If the callback module's system_replace_state/2 function crashes or throws an exception, + the caller exits with error {callback_failed, {Module, system_replace_state}, {Class, Reason}} + where Module is the name of the callback module and Class and Reason indicate details + of the exception. If the callback module does not provide a system_replace_state/2 function and + StateFun crashes or throws an exception, the caller exits with error + {callback_failed, StateFun, {Class, Reason}}.

+

The system_replace_state/2 function is primarily useful for user-defined behaviours and + modules that implement OTP special processes. The + gen_server, gen_fsm, and gen_event OTP behaviour modules export this function, + and so callback modules for those behaviours need not supply their own.

 @@ -322,7 +360,7 @@
Process Implementation Functions -

The following functions are used when implementing a +

The following functions are used when implementing a special process. This is an ordinary process which does not use a standard behaviour, but a process which understands the standard system messages.

@@ -375,8 +413,9 @@ process continues the execution, or Module:system_terminate(Reason, Parent, Debug, Misc) if the process should terminate. The Module must export - system_continue/3, system_terminate/4, and - system_code_change/4 (see below). + system_continue/3, system_terminate/4, + system_code_change/4, system_get_state/1 and + system_replace_state/2 (see below).

The Misc argument can be used to save internal data in a process, for example its state. It is sent to @@ -444,6 +483,34 @@ defined, the atom undefined is sent.

 + + Mod:system_get_state(Misc) -> {ok, State} + Called when the process should return its current state + + Misc = term() + State = term() + + +

This function is called from sys:handle_system_msg/6 when the process + should return a term that reflects its current state. State is the + value returned by sys:get_state/2.

+ + + + Mod:system_replace_state(StateFun, Misc) -> {ok, NState, NMisc} + Called when the process should replace its current state + + StateFun = fun((State :: term()) -> NState) + Misc = term() + NState = term() + NMisc = term() + + +

This function is called from sys:handle_system_msg/6 when the process + should replace its current state. NState is the value returned by + sys:replace_state/3.

+ + -- cgit v1.2.3 From a9fd7c1ffbb2b3509821b6655f460e27f70c2892 Mon Sep 17 00:00:00 2001 From: Vlad Dumitrescu Date: Fri, 21 Mar 2014 21:24:28 +0100 Subject: Specify that +fn* flags affect even command-line parameters and environment variables --- lib/stdlib/doc/src/unicode_usage.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index c843ef7736..bebfbd4514 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -848,6 +848,7 @@ Eshell V5.10.1 (abort with ^G)
Unicode in Environment and Parameters +

Environment variables and their interpretation is handled much in the same way as file names. If Unicode file names are enabled, environment variables as well as parameters to the Erlang VM are -- cgit v1.2.3 From 83b6daef8d52f69c3b583bcc67c0c11fb8dcba0b Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Fri, 21 Mar 2014 15:34:18 +0100 Subject: stdlib: Generalize erl_parse:abstract/2 The 'encoding' option of erl_parse:abstract/2 has been extended to include 'none' and a callback function (a predicate). The rationale is that a more general means of determining what integer lists are to be represented as strings may help readability when generating Erlang code given input in some other encoding than Latin-1 or UTF-8. --- lib/stdlib/doc/src/erl_parse.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 2d5aff3c6c..cf0bff48cd 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -4,7 +4,7 @@

- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -173,6 +173,7 @@ + Convert an Erlang term into an abstract form

Converts the Erlang data structure Data into an @@ -183,7 +184,12 @@ selecting which integer lists will be considered as strings. The default is to use the encoding returned by - epp:default_encoding/0

+ epp:default_encoding/0. + The value none means that no integer lists will be + considered as strings. The encoding_func() will be + called with one integer of a list at a time, and if it + returns true for every integer the list will be + considered a string.

 -- cgit v1.2.3 From be34551be2119a6c3c1a7edf113b7db12789423b Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Thu, 19 Dec 2013 14:36:06 +0000 Subject: Document an escript:create/2 hidden feature escript:create/2 accepts a 3-elements tuple containing files and zip:create/3 options to build a zip file. Also had to update zip typespecs to allow referral from escript docs. --- lib/stdlib/doc/src/zip.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 484bf0e080..d7c655672d 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -123,6 +123,18 @@ + + +

The name of a zip file.

+ + + + + + +

These options are described in create/3.

+ + @@ -160,6 +172,7 @@ set to ["gif", "jpg"] and uncompress is set to ["jpg"], only files with "gif" as extension will be compressed. No other files will be compressed.

+

The following options are available:

cooked -- cgit v1.2.3 From b52458dfbbb6e9a0c9f62dfcd0dd7f9247efa0af Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Wed, 2 Apr 2014 18:27:17 +0200 Subject: Deprecate module pg To be removed in Erlang/OTP 18 --- lib/stdlib/doc/src/pg.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/pg.xml b/lib/stdlib/doc/src/pg.xml index 7cc1b805b4..a3b69884b6 100644 --- a/lib/stdlib/doc/src/pg.xml +++ b/lib/stdlib/doc/src/pg.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2014 Ericsson AB, All Rights Reserved @@ -32,6 +32,9 @@ pg Distributed, Named Process Groups + +

This module is deprecated and will be removed in Erlang/OTP 18.

+

This (experimental) module implements process groups. A process group is a group of processes that can be accessed by a common name. For example, a group named foobar can include a set -- cgit v1.2.3 From f719d0fe308f00b85f92c29d7cdf9b0dc20d98a2 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 7 Apr 2014 19:52:48 +0200 Subject: Update release notes --- lib/stdlib/doc/src/notes.xml | 384 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 384 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index e94a4d6a55..15e6fdfa9f 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -30,6 +30,390 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.0 + +
Fixed Bugs and Malfunctions + + +

+ The option dupnames did not work as intended in re. When + looking for names with {capture, [Name, ...]}, re:run + returned a random instance of the match for that name, + instead of the leftmost matching instance, which was what + the documentation stated. This is now corrected to adhere + to the documentation. The option {capture,all_names} + along with a re:inspect/2 function is also added to + further help in using named subpatterns.

+

+ Own Id: OTP-11205

+ + +

+ If option 'binary' was set for standard_input, then c:i() + would hang if the output was more than one page long - + i.e. then input after "(c)ontinue (q)uit -->" could + not be read. This has been corrected. (Thanks to José + Valim)

+

+ Own Id: OTP-11589

+ + +

+ stdlib/lists: Add function droplast/1 This functions + drops the last element of a non-empty list. lists:last/1 + and lists:droplast/1 are the dual of hd/1 and tl/1 but + for the end of a list. (Thanks to Hans Svensson)

+

+ Own Id: OTP-11677

+ + +

+ Allow all auto imports to be suppressed at once. + Introducing the no_auto_import attribute: + -compile(no_auto_import). Useful for code generation + tools that always use the qualified function names and + want to avoid the auto imported functions clashing with + local ones. (Thanks to José Valim.)

+

+ Own Id: OTP-11682

+ + +

+ supervisor_bridge does no longer report normal + termination of children. The reason is that in some + cases, for instance when the restart strategy is + simple_one_for_one, the log could be completely + overloaded with reports about normally terminating + processes. (Thanks to Artem Ocheredko)

+

+ Own Id: OTP-11685

+ + +

The type annotations for alternative registries using + the {via, Module, Name} syntax for sup_name() and + sup_ref() in the supervisor module are now consistent + with the documentation. Dialyzer should no longer + complain about valid supervisor:start_link() and + supervisor:start_child() calls. (Thanks to Caleb + Helbling.)

+

+ Own Id: OTP-11707

+ + +

Two Dets bugs have been fixed. When trying to open a + short file that is not a Dets file, the file was deleted + even with just read access. Calling + dets:is_dets_file/1 with a file that is not a Dets + file, a file descriptor was left open. (Thanks to Håkan + Mattsson for reporting the bugs.)

+

+ Own Id: OTP-11709

+ + +

+ Fix race bug in ets:all. Concurrent creation of + tables could cause other tables to not be included in the + result. (Thanks to Florian Schintke for bug report)

+

+ Own Id: OTP-11726

+ + +

+ erl_eval now properly evaluates '=='/2 when it is used in + guards. (Thanks to José Valim)

+

+ Own Id: OTP-11747

+ + +

+ Calls to proplists:get_value/3 are replaced by the faster + lists:keyfind/3 in io_lib_pretty. Elements in the list + are always 2-tuples. (Thanks to Andrew Thompson)

+

+ Own Id: OTP-11752

+ + +

A qlc bug where filters were erroneously optimized + away has been fixed. Thanks to Sam Bobroff for reporting + the bug.

+

+ Own Id: OTP-11758

+ + +

+ A number of compiler errors where unusual or nonsensical + code would crash the compiler have been reported by Ulf + Norell and corrected by Anthony Ramine.

+

+ Own Id: OTP-11770

+ + +

Since Erlang/OTP R16B the Erlang Core Linter + (erl_lint) has not emitted errors when built-in + types were re-defined. This bug has been fixed. (Thanks + to Roberto Aloi.)

+

+ Own Id: OTP-11772

+ + +

+ The functions sys:get_state/1,2 and + sys:replace_state/2,3 are fixed so they can now be + run while the process is sys suspended. To accomplish + this, the new callbacks Mod:system_get_state/1 and + Mod:system_replace_state/2 are added, which are + also implemented by the generic behaviours + gen_server, gen_event and gen_fsm.

+

+ The potential incompatibility refers to

+

+ The previous behaviour of intercepting the + system message and passing a tuple of size 2 as the last + argument to sys:handle_system_msg/6 is no longer + supported. The error handling when + StateFun in sys:replace_state/2,3 fails is + changed from being totally silent to possibly (if the + callback module does not catch) throw an exception in the + client process.

+

+ (Thanks to James Fish and Steve Vinoski)

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11817

+ + +
+ + +
Improvements and New Features + + +

+ Options to set match_limit and match_limit_recursion are + added to re:run. The option report_errors is also added + to get more information when re:run fails due to limits + or compilation errors.

+

+ Own Id: OTP-10285

+ + +

The pre-defined types array/0, dict/0, + digraph/0, gb_set/0, gb_tree/0, + queue/0, set/0, and tid/0 have been + deprecated. They will be removed in Erlang/OTP 18.0.

+

Instead the types array:array/0, + dict:dict/0, digraph:graph/0, + gb_set:set/0, gb_tree:tree/0, + queue:queue/0, sets:set/0, and + ets:tid/0 can be used. (Note: it has always been + necessary to use ets:tid/0.)

It is + allowed in Erlang/OTP 17.0 to locally re-define the types + array/0, dict/0, and so on.

New + types array:array/1, dict:dict/2, + gb_sets:set/1, gb_trees:tree/2, + queue:queue/1, and sets:set/1 have been + added.

A compiler option, + nowarn_deprecated_type, has been introduced. By + including the attribute

+ -compile(nowarn_deprecated_type).

in an Erlang + source file, warnings about deprecated types can be + avoided in Erlang/OTP 17.0.

The option can also + be given as a compiler flag:

erlc + +nowarn_deprecated_type file.erl +

+ Own Id: OTP-10342

+ + +

+ Calls to erlang:open_port/2 with 'spawn' are updated to + handle space in the command path.

+

+ Own Id: OTP-10842

+ + +

Dialyzer's unmatched_return warnings have been + corrected.

+

+ Own Id: OTP-10908

+ + +

+ Forbid unsized fields in patterns of binary generators + and simplified v3_core's translation of bit string + generators. (Thanks to Anthony Ramine.)

+

+ Own Id: OTP-11186

+ + +

+ The version of the PCRE library Used by Erlang's re + module is raised to 8.33 from 7.6. This means, among + other things, better Unicode and Unicode Character + Properties support. New options connected to PCRE 8.33 + are also added to the re module (ucd, notempty_atstart, + no_start_optimize). PCRE has extended the regular + expression syntax between 7.6 and 8.33, why this imposes + a potential incompatibility. Only very complicated + regular expressions may be affected, but if you know you + are using obscure features, please test run your regular + expressions and verify that their behavior has not + changed.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11204

+ + +

+ Added dict:is_empty/1 and orddict:is_empty/1. (Thanks to + Magnus Henoch.)

+

+ Own Id: OTP-11353

+ + +

+ A call to either the garbage_collect/1 BIF or the + check_process_code/2 BIF may trigger garbage + collection of another processes than the process calling + the BIF. The previous implementations performed these + kinds of garbage collections without considering the + internal state of the process being garbage collected. In + order to be able to more easily and more efficiently + implement yielding native code, these types of garbage + collections have been rewritten. A garbage collection + like this is now triggered by an asynchronous request + signal, the actual garbage collection is performed by the + process being garbage collected itself, and finalized by + a reply signal to the process issuing the request. Using + this approach processes can disable garbage collection + and yield without having to set up the heap in a state + that can be garbage collected.

+

+ The garbage_collect/2, + and check_process_code/3 + BIFs have been introduced. Both taking an option list as + last argument. Using these, one can issue asynchronous + requests.

+

+ code:purge/1 and code:soft_purge/1 have + been rewritten to utilize asynchronous + check_process_code requests in order to + parallelize work.

+

+ Characteristics impact: A call to the + garbage_collect/1 BIF or the + check_process_code/2 BIF will normally take longer + time to complete while the system as a whole wont be as + much negatively effected by the operation as before. A + call to code:purge/1 and code:soft_purge/1 + may complete faster or slower depending on the state of + the system while the system as a whole wont be as much + negatively effected by the operation as before.

+

+ Own Id: OTP-11388 Aux Id: OTP-11535, OTP-11648

+ + +

Improve the documentation of the supervisor's + via reference. (Thanks to MaximMinin.)

+

+ Own Id: OTP-11399

+ + +

orddict:from_list/1 now uses the optimized sort + routines in the lists module instead of + (essentially) an insertion sort. Depending on the input + data, the speed of the new from_list/1 is anything + from slightly faster up to several orders of magnitude + faster than the old from_list/1.

(Thanks to + Steve Vinoski.) +

+ Own Id: OTP-11552

+ + +

+ EEP43: New data type - Maps

+

+ With Maps you may for instance: M0 = + #{ a => 1, b => 2}, % create + associations M1 = M0#{ a := 10 }, % + update values M2 = M1#{ "hi" => + "hello"}, % add new associations #{ + "hi" := V1, a := V2, b := V3} = M2. % match keys with + values

+

+ For information on how to use Maps please see the + Reference + Manual.

+

+ The current implementation is without the following + features: No variable keys + No single value access No map + comprehensions

+

+ Note that Maps is experimental during OTP 17.0.

+

+ Own Id: OTP-11616

+ + +

+ When tab completing the erlang shell now expands + zero-arity functions all the way to closing parenthesis, + unless there is another function with the same name and a + different arity. (Thanks to Pierre Fenoll.)

+

+ Own Id: OTP-11684

+ + +

The Erlang Code Preprocessor (epp) could loop + when encountering a circular macro definition in an + included file. This bug has been fixed.

Thanks + to Maruthavanan Subbarayan for reporting the bug, and to + Richard Carlsson for providing a bug fix.

+

+ Own Id: OTP-11728

+ + +

The Erlang Code Linter (erl_lint) has since + Erlang/OTP R13B emitted warnings whenever any of the + types arity(), bitstring(), + iodata(), or boolean() were re-defined. Now + errors are emitted instead.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11771

+ + +

The encoding option of + erl_parse:abstract/2 has been extended to include + none and a callback function (a predicate).

+

+ Own Id: OTP-11807

+ + +

+ Export zip option types to allow referal from other + modules.

+

+ Thanks to Pierre Fenoll and Håkan Mattson

+

+ Own Id: OTP-11828

+ + +

+ The module pg has been deprecated and will be + removed in Erlang/OTP 18.

+

+ Own Id: OTP-11840

+ + +
+ +
+
STDLIB 1.19.4
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 6e6b66218b8ce1f68ca9fd68690ee93d6c98bb05 Mon Sep 17 00:00:00 2001 From: Sergey Abramyan Date: Tue, 15 Apr 2014 11:45:37 +0400 Subject: Add docs and test for maps:get/3 --- lib/stdlib/doc/src/maps.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index 76137e3dee..a6bb120d07 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -107,6 +107,26 @@ + + + + +

+ Returns the value Value associated with Key if + Map contains Key. + If no value is associated with Key then returns Default. +

+

Example:

+ +>Map = #{ key1 => val1, key2 => val2 }. + #{key1 => val1,key2 => val2} + maps:get(key1, Map, "Default value"). + val1 + maps:get(key3, Map, "Default value"). + "Default value" + + + -- cgit v1.2.3 From 0e38f3d443842728be24e4cbd1608dcaa3a41bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= Date: Fri, 28 Mar 2014 15:08:30 +0100 Subject: Remove the pg module and related documentation This module has been marked experimental for more than 15 years, and has largely been superseded by the pg2 module from the kernel application. The original pg also has no tests and has not been updated in the last 15 years other than small maintenance edits (like adding specs or replacing pid/1 by is_pid/1). It is pretty unlikely that anyone uses it today and its presence is simply confusing as people should be using pg2 anyway. --- lib/stdlib/doc/src/Makefile | 1 - lib/stdlib/doc/src/pg.xml | 114 ----------------------------------------- lib/stdlib/doc/src/ref_man.xml | 1 - lib/stdlib/doc/src/specs.xml | 1 - 4 files changed, 117 deletions(-) delete mode 100644 lib/stdlib/doc/src/pg.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index ff77c3eea0..f5d8b2072a 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -76,7 +76,6 @@ XML_REF3_FILES = \ ms_transform.xml \ orddict.xml \ ordsets.xml \ - pg.xml \ pool.xml \ proc_lib.xml \ proplists.xml \ diff --git a/lib/stdlib/doc/src/pg.xml b/lib/stdlib/doc/src/pg.xml deleted file mode 100644 index a3b69884b6..0000000000 --- a/lib/stdlib/doc/src/pg.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - -
- - 1996 - 2014 - Ericsson AB, All Rights Reserved - - - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. - - The Initial Developer of the Original Code is Ericsson AB. - - - pg - - - - -
- pg - Distributed, Named Process Groups - - -

This module is deprecated and will be removed in Erlang/OTP 18.

- -

This (experimental) module implements process groups. A process - group is a group of processes that can be accessed by a common - name. For example, a group named foobar can include a set - of processes as members of this group and they can be located on - different nodes.

-

When messages are sent to the named group, all members of - the group receive the message. The messages are serialized. If - the process P1 sends the message M1 to the group, - and process P2 simultaneously sends message M2, then - all members of the group receive the two messages in the same - order. If members of a group terminate, they are automatically - removed from the group.

-

This module is not complete. The module is inspired by the ISIS - system and the causal order protocol of the ISIS system should - also be implemented. At the moment, all messages are serialized - by sending them through a group master process.

- - - - - Create an empty group - -

Creates an empty group named PgName on the current - node.

- - - - - Create an empty group on another node - -

Creates an empty group named PgName on the node - Node.

- - - - - Join a pid to a process group - -

Joins the pid Pid to the process group - PgName. - Returns a list of all old members of the group.

- - - - - Send a message to all members of a process group - -

Sends the tuple {pg_message, From, PgName, Msg} to - all members of the process group PgName.

-

Failure: {badarg, {PgName, Msg}} - if PgName is - not a process group (a globally registered name).

- - - - - Send a message to all members of a process group, except ourselves - -

Sends the tuple {pg_message, From, PgName, Msg} to - all members of the process group PgName, except - ourselves.

-

Failure: {badarg, {PgName, Msg}} - if PgName is - not a process group (a globally registered name).

- - - - - Return a list of all members of a process group - -

Returns a list of all members of the process group - PgName.

- - - - - diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index 6c35578bdf..ea4009dc3e 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -73,7 +73,6 @@ - diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index 60a04ed5e7..fd77b52da6 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -39,7 +39,6 @@ - -- cgit v1.2.3 From baf80f03d623bc995183da5347eef2ac5ef3a29a Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 29 Apr 2014 10:11:14 +0200 Subject: Remove pre-defined types dict(), digraph(), &c The pre-defined types array(), dict(), digraph(), gb_set(), gb_tree(), queue(), set(), and tid() have been removed. --- lib/stdlib/doc/src/binary.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 2410f1f9b8..0fde763bfb 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -5,7 +5,7 @@
2009 - 2013 + 2014 Ericsson AB, All Rights Reserved @@ -450,7 +450,7 @@ store(Binary, GBSet) ->

In this example, we chose to copy the binary content before - inserting it in the gb_set() if it references a binary more than + inserting it in the gb_sets:set() if it references a binary more than twice the size of the data we're going to keep. Of course different rules for when copying will apply to different programs.

-- cgit v1.2.3 From 61138cb31e1f6ad44d3ca54e668de9d2d4adb2ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 9 Apr 2014 12:42:32 +0200 Subject: Support path names with characters outside the US ASCII range --- lib/stdlib/doc/src/erl_tar.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index f81e36f810..afa4196be1 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -64,6 +64,20 @@ format_error/1 function.

+
+ UNICODE SUPPORT +

If file:native_name_encoding/0 + returns utf8, path names will be encoded in UTF-8 when + creating tar files and path names will be assumed to be encoded in + UTF-8 when extracting tar files.

+ +

If file:native_name_encoding/0 + returns latin1, no translation of path names will be + done.

+
+
LIMITATIONS

For maximum compatibility, it is safe to archive files with names -- cgit v1.2.3 From fa67c39896487a3f6f382d8a38c3663ca25646af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 10 Apr 2014 13:55:01 +0200 Subject: Update information about compatibility GNU tar now supports the 'ustar' format. --- lib/stdlib/doc/src/erl_tar.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index afa4196be1..ccf0f3901f 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -35,10 +35,11 @@ Unix 'tar' utility for reading and writing tar archives

The erl_tar module archives and extract files to and from - a tar file. The tar file format is the POSIX extended tar file format - specified in IEEE Std 1003.1 and ISO/IEC 9945-1. That is the same - format as used by tar program on Solaris, but is not the same - as used by the GNU tar program.

+ a tar file. erl_tar supports the ustar format + (IEEE Std 1003.1 and ISO/IEC 9945-1). All modern tar + programs (including GNU tar) can read this format. To ensure that + that GNU tar produces a tar file that erl_tar can read, + give the --format=ustar option to GNU tar.

By convention, the name of a tar file should end in ".tar". To abide to the convention, you'll need to add ".tar" yourself to the name.

-- cgit v1.2.3 From 92a5b09ed50c905a6480b74f10af770d98eea5bd Mon Sep 17 00:00:00 2001 From: Yuki Ito Date: Sat, 12 Apr 2014 20:46:26 +0900 Subject: Fix typo in erl_tar docs --- lib/stdlib/doc/src/erl_tar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index ccf0f3901f..6d5b07059a 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -128,7 +128,7 @@ TarDescriptor = term() FilenameOrBin = Filename()|binary() - Filename = filename()() + Filename = filename() NameInArchive = filename() Options = [Option] Option = dereference|verbose -- cgit v1.2.3 From d02469d12f103276345dc0a3b024f76f6d6763fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 17 Apr 2014 12:09:20 +0200 Subject: Correct typo in type specification Types start with a lower-case letter. --- lib/stdlib/doc/src/erl_tar.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 6d5b07059a..7f25f5b7bc 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -127,7 +127,7 @@ Add a file to an open tar file TarDescriptor = term() - FilenameOrBin = Filename()|binary() + FilenameOrBin = filename()|binary() Filename = filename() NameInArchive = filename() Options = [Option] -- cgit v1.2.3 From 6c3d24ccbc597e6d31db1f559470cc59585fdf52 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Wed, 7 May 2014 11:17:24 +0200 Subject: Add system message 'terminate' This is to be used when implementing synchronous stop of generic behaviours and other 'sys special processes'. --- lib/stdlib/doc/src/sys.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index a46fa1289f..7fb82e0e7e 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -356,6 +356,17 @@ installed.

+ + + + Terminate the process + +

This function orders the process to terminate with the + given Reason. The termination is done + asynchronously, so there is no guarantee that the process is + actually terminated when the function returns.

+ +
-- cgit v1.2.3 From 9a0635c297503e2ce0ae394c9c44c72fc61a2a31 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Tue, 29 Apr 2014 11:29:51 +0200 Subject: Add synchronous stop function to proc_lib The new function utilizes sys:terminate. --- lib/stdlib/doc/src/proc_lib.xml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 5bf5744622..88630b1fdb 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -298,6 +298,39 @@ init(Parent) -> proc_lib functions.

+ + + Terminate a process synchronously. + + Equivalent + to stop(Process, normal, infinity). + + + + + Terminate a process synchronously. + + + + +

Orders the process to exit with the given Reason and + waits for it to terminate.

+

The function returns ok if the process exits with + the given Reason within Timeout + milliseconds.

+

If the call times out, a timeout exception is + raised.

+

If the process does not exist, a noproc + exception is raised.

+

The implementation of this function is based on the + terminate system message, and requires that the + process handles system messages correctly. + See sys(3) + and OTP + Design Principles for information about system + messages.

+ +
-- cgit v1.2.3 From 9d7d1207ff1240b9711f192deb0893c3a044a3d8 Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Wed, 30 Apr 2014 09:35:06 +0200 Subject: Add synchronous stop functions to gen_server and gen_fsm The functions utilize proc_lib:stop, which in turn utilizes sys:terminate. --- lib/stdlib/doc/src/gen_fsm.xml | 38 +++++++++++++++++++++++++++++++++++++- lib/stdlib/doc/src/gen_server.xml | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 75 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 1713367bd8..24468b0e8e 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -4,7 +4,7 @@
- 19962013 + 19962014 Ericsson AB. All Rights Reserved. @@ -43,8 +43,11 @@ 
 gen_fsm module                    Callback module
 --------------                    ---------------
+gen_fsm:start
 gen_fsm:start_link                -----> Module:init/1
 
+gen_fsm:stop                      -----> Module:terminate/3
+
 gen_fsm:send_event                -----> Module:StateName/2
 
 gen_fsm:send_all_state_event      -----> Module:handle_event/3
@@ -186,6 +189,39 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
           for a description of arguments and return values.

       
     
+    
+      stop(FsmRef) -> ok
+      stop(FsmRef, Reason, Timeout) -> ok
+      Synchronously stop a generic FSM.
+      
+        FsmRef = Name | {Name,Node} | {global,GlobalName}
+	| {via,Module,ViaName} | pid()
+         Node = atom()
+         GlobalName = ViaName = term()
+        Reason = term()
+        Timeout = int()>0 | infinity
+      
+      
+	
Orders a generic FSM to exit with the given Reason
+	  and waits for it to terminate. The gen_fsm will call
+          Module:terminate/3
+	  before exiting.

+	
The function returns ok if the generic FSM terminates
+	  with the expected reason. Any other reason than normal,
+          shutdown, or {shutdown,Term} will cause an
+          error report to be issued using
+          error_logger:format/2.
+	  The default Reason is normal.

+	
Timeout is an integer greater than zero which
+          specifies how many milliseconds to wait for the generic FSM
+          to terminate, or the atom infinity to wait
+          indefinitely. The default value is infinity. If the
+          generic FSM has not terminated within the specified time, a
+	  timeout exception is raised.

+	
If the process does not exist, a noproc exception
+	  is raised.

+      
+    
     
       send_event(FsmRef, Event) -> ok
       Send an event asynchronously to a generic FSM.
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 4c83fde237..4bef50245d 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -4,7 +4,7 @@
 
   

     
-      19962013
+      19962014
       Ericsson AB. All Rights Reserved.
     
     
@@ -43,8 +43,11 @@
     
 gen_server module            Callback module
 -----------------            ---------------
+gen_server:start
 gen_server:start_link -----> Module:init/1
 
+gen_server:stop       -----> Module:terminate/2
+
 gen_server:call
 gen_server:multi_call -----> Module:handle_call/3
 
@@ -183,6 +186,40 @@ gen_server:abcast     -----> Module:handle_cast/2
           for a description of arguments and return values.

       
     
+    
+      stop(ServerRef) -> ok
+      stop(ServerRef, Reason, Timeout) -> ok
+      Synchronously stop a generic server.
+      
+        ServerRef = Name | {Name,Node} | {global,GlobalName}
+	| {via,Module,ViaName} | pid()
+         Node = atom()
+         GlobalName = ViaName = term()
+        Reason = term()
+        Timeout = int()>0 | infinity
+      
+      
+	
Orders a generic server to exit with the
+	  given Reason and waits for it to terminate. The
+	  gen_server will call
+          Module:terminate/2
+	  before exiting.

+	
The function returns ok if the server terminates
+	  with the expected reason. Any other reason than normal,
+          shutdown, or {shutdown,Term} will cause an
+          error report to be issued using
+          error_logger:format/2.
+	  The default Reason is normal.

+	
Timeout is an integer greater than zero which
+          specifies how many milliseconds to wait for the server to
+          terminate, or the atom infinity to wait
+          indefinitely. The default value is infinity. If the
+          server has not terminated within the specified time, a
+          timeout exception is raised.

+	
If the process does not exist, a noproc exception
+	  is raised.

+      
+    
     
       call(ServerRef, Request) -> Reply
       call(ServerRef, Request, Timeout) -> Reply
-- 
cgit v1.2.3


From f979493bfa777e61d4da1460982370c0cecc1ef3 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Tue, 6 May 2014 11:50:45 +0200
Subject: Update gen_event:stop to be synchronous

This function now uses proc_lib:stop, which guarantees that the
process is terminated before the function return.
---
 lib/stdlib/doc/src/gen_event.xml | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml
index b9dfff833e..5c96d6e576 100644
--- a/lib/stdlib/doc/src/gen_event.xml
+++ b/lib/stdlib/doc/src/gen_event.xml
@@ -4,7 +4,7 @@
 
   

     
-      19962013
+      19962014
       Ericsson AB. All Rights Reserved.
     
     
@@ -44,6 +44,7 @@
     
 gen_event module                   Callback module
 ----------------                   ---------------
+gen_event:start
 gen_event:start_link       ----->  -
 
 gen_event:add_handler
@@ -177,7 +178,7 @@ gen_event:stop             ----->  Module:terminate/2
       add_handler(EventMgrRef, Handler, Args) -> Result
       Add an event handler to a generic event manager.
       
-        EventMgr = Name | {Name,Node} | {global,GlobalName}
+        EventMgrRef = Name | {Name,Node} | {global,GlobalName}
 	| {via,Module,ViaName} | pid()
          Name = Node = atom()
          GlobalName = ViaName = term()
@@ -223,7 +224,7 @@ gen_event:stop             ----->  Module:terminate/2
       add_sup_handler(EventMgrRef, Handler, Args) -> Result
       Add a supervised event handler to a generic event manager.
       
-        EventMgr = Name | {Name,Node} | {global,GlobalName}
+        EventMgrRef = Name | {Name,Node} | {global,GlobalName}
 	| {via,Module,ViaName} | pid()
          Name = Node = atom()
          GlobalName = ViaName = term()
@@ -456,19 +457,37 @@ gen_event:stop             ----->  Module:terminate/2
     
     
       stop(EventMgrRef) -> ok
+      stop(EventMgrRef, Reason, Timeout) -> ok
       Terminate a generic event manager.
       
         EventMgrRef = Name | {Name,Node} | {global,GlobalName}
 	| {via,Module,ViaName} | pid()
         Name = Node = atom()
         GlobalName = ViaName = term()
+        Reason = term()
+        Timeout = int()>0 | infinity
       
       
-        
Terminates the event manager EventMgrRef. Before
-          terminating, the event manager will call
-          Module:terminate(stop,...) for each installed event
-          handler.

-        
See add_handler/3 for a description of the argument.

+        
Orders the event manager EventMgrRef to exit with
+          the given Reason and waits for it to
+          terminate. Before terminating, the gen_event will call
+          Module:terminate(stop,...)
+	  for each installed event handler.

+	
The function returns ok if the event manager terminates
+	  with the expected reason. Any other reason than normal,
+          shutdown, or {shutdown,Term} will cause an
+          error report to be issued using
+          error_logger:format/2.
+	  The default Reason is normal.

+	
Timeout is an integer greater than zero which
+          specifies how many milliseconds to wait for the event manager to
+          terminate, or the atom infinity to wait
+          indefinitely. The default value is infinity. If the
+          event manager has not terminated within the specified time, a
+          timeout exception is raised.

+	
If the process does not exist, a noproc exception
+	  is raised.

+        
See add_handler/3 for a description of EventMgrRef.

       
     
   
-- 
cgit v1.2.3


From 47463022cea3b7ca89124c1607cf10b92fbb536f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= 
Date: Mon, 26 May 2014 15:51:00 +0200
Subject: stdlib: Fix indentation of maps doc

---
 lib/stdlib/doc/src/maps.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index a6bb120d07..b37f7fd7fd 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -108,22 +108,22 @@
 		
 
 		
-            		
- 			
- 			
-	                	

-	                		Returns the value Value associated with Key if
+			
+			
+			
+				

+					Returns the value Value associated with Key if
 					Map contains Key.
 					If no value is associated with Key then returns Default.
 				

 				
Example:

 				
->Map = #{ key1 => val1, key2 => val2 }.
- #{key1 => val1,key2 => val2}
- maps:get(key1, Map, "Default value").
- val1
- maps:get(key3, Map, "Default value").
- "Default value"
+> Map = #{ key1 => val1, key2 => val2 }.
+#{key1 => val1,key2 => val2}
+> maps:get(key1, Map, "Default value").
+val1
+> maps:get(key3, Map, "Default value").
+"Default value"
 			
 		
 
-- 
cgit v1.2.3


From 2ed9d5efee338f704c9fb4c1d48e8a3fc7e09a44 Mon Sep 17 00:00:00 2001
From: Luca Favatella 
Date: Tue, 27 May 2014 11:41:55 +0100
Subject: Fix small copy&paste mistakes in doc of alternative process registry

---
 lib/stdlib/doc/src/gen_fsm.xml    | 4 ++--
 lib/stdlib/doc/src/gen_server.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index 1713367bd8..848d57f3e6 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -115,7 +115,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
           If FsmName={global,GlobalName}, the gen_fsm is
           registered globally as GlobalName using
           global:register_name/2.
-	  If EventMgrName={via,Module,ViaName}, the event manager will
+	  If FsmName={via,Module,ViaName}, the gen_fsm will
 	  register with the registry represented by Module.
 	  The Module callback should export the functions
 	  register_name/2, unregister_name/1,
@@ -210,7 +210,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
 	  registered at another node, or
 	  {global,GlobalName}, if the gen_fsm is globally
 	  registered.
-	  {via,Module,ViaName}, if the event manager is registered
+	  {via,Module,ViaName}, if the gen_fsm is registered
 	  through an alternative process registry.
         
         
Event is an arbitrary term which is passed as one of
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 4c83fde237..62c0394479 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -113,7 +113,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           registered globally as GlobalName using
           global:register_name/2. If no name is provided,
           the gen_server is not registered.
-	  If EventMgrName={via,Module,ViaName}, the event manager will
+	  If ServerName={via,Module,ViaName}, the gen_server will
 	  register with the registry represented by Module.
 	  The Module callback should export the functions
 	  register_name/2, unregister_name/1,
-- 
cgit v1.2.3


From 90b779ed59c734b31d26f0b18571a531923ce9f5 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Wed, 7 May 2014 11:47:40 +0200
Subject: Fix minor bugs in gen_server and gen_fsm documentation

These are probably old copy-and-paste bugs from initial version of
this document.
---
 lib/stdlib/doc/src/gen_fsm.xml    | 10 ++++++----
 lib/stdlib/doc/src/gen_server.xml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml
index 24468b0e8e..b1bba3eff0 100644
--- a/lib/stdlib/doc/src/gen_fsm.xml
+++ b/lib/stdlib/doc/src/gen_fsm.xml
@@ -118,7 +118,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
           If FsmName={global,GlobalName}, the gen_fsm is
           registered globally as GlobalName using
           global:register_name/2.
-	  If EventMgrName={via,Module,ViaName}, the event manager will
+	  If FsmName={via,Module,ViaName}, the gen_fsm will
 	  register with the registry represented by Module.
 	  The Module callback should export the functions
 	  register_name/2, unregister_name/1,
@@ -246,7 +246,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
 	  registered at another node, or
 	  {global,GlobalName}, if the gen_fsm is globally
 	  registered.
-	  {via,Module,ViaName}, if the event manager is registered
+	  {via,Module,ViaName}, if the gen_fsm is registered
 	  through an alternative process registry.
         
         
Event is an arbitrary term which is passed as one of
@@ -564,7 +564,8 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
           Module:init/1 for a description of Timeout and hibernate.

         
If the function returns {stop,Reason,NewStateData},
           the gen_fsm will call
-          Module:terminate(Reason,NewStateData) and terminate.

+          Module:terminate(Reason,StateName,NewStateData) and
+          terminate.

       
     
     
@@ -650,7 +651,8 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
           {stop,Reason,NewStateData}, any reply to From
           must be given explicitly using gen_fsm:reply/2.
           The gen_fsm will then call
-          Module:terminate(Reason,NewStateData) and terminate.

+          Module:terminate(Reason,StateName,NewStateData) and
+          terminate.

       
     
     
diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml
index 4bef50245d..a915e567a5 100644
--- a/lib/stdlib/doc/src/gen_server.xml
+++ b/lib/stdlib/doc/src/gen_server.xml
@@ -116,7 +116,7 @@ gen_server:abcast     -----> Module:handle_cast/2
           registered globally as GlobalName using
           global:register_name/2. If no name is provided,
           the gen_server is not registered.
-	  If EventMgrName={via,Module,ViaName}, the event manager will
+	  If ServerName={via,Module,ViaName}, the gen_server will
 	  register with the registry represented by Module.
 	  The Module callback should export the functions
 	  register_name/2, unregister_name/1,
-- 
cgit v1.2.3


From 7adc2c36b0e839384baac50be35c0999d1e546df Mon Sep 17 00:00:00 2001
From: Anthony Ramine 
Date: Sun, 25 May 2014 16:06:17 +0200
Subject: Implement ets:take/2

This new ETS BIF returns and deletes objects from tables.
---
 lib/stdlib/doc/src/ets.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 3df24bf688..ef08f3c0cc 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -1586,6 +1586,21 @@ true

           writing complicated ets:select/2 calls.

       
     
+    
+      
+      Return and remove all objects with a given key from an ETS
+        table.
+      
+        
Returns a list of all objects with the key Key in
+          the table Tab and removes.

+        
The given Key is used to identify the object by
+          either comparing equal the key of an object in an
+          ordered_set table, or matching in other types of
+          tables (see lookup/2 and
+          new/2 for details on the
+          difference).

+      
+    
     
       
       Fill a Dets table with objects from an ETS table.
-- 
cgit v1.2.3


From f47320f43c3fb39f78054834e60ae9424ac79f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= 
Date: Tue, 17 Jun 2014 16:26:50 +0200
Subject: doc: Fix broken links

---
 lib/stdlib/doc/src/notes.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 15e6fdfa9f..2671936dda 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -343,10 +343,10 @@
 	    "hello"}, % add new associations #{
 	    "hi" := V1, a := V2, b := V3} = M2. % match keys with
 	    values 

-          

-	    For information on how to use Maps please see the
-	    Reference
-	    Manual.

+        

+	    For information on how to use Maps please see Map Expressions in the
+		
+			Reference Manual.

           

 	    The current implementation is without the following
 	    features:  No variable keys
-- 
cgit v1.2.3


From 139825694c587b0f543224bf083170fad0e1ad75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= 
Date: Tue, 17 Jun 2014 16:56:09 +0200
Subject: doc: Fix broken links in Installation Guide

---
 lib/stdlib/doc/src/notes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 2671936dda..6af38b3166 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -2193,7 +2193,7 @@
 	    platforms than before. If configure warns about no
 	    atomic implementation available, try using the
 	    libatomic_ops library. Use the --with-libatomic_ops=PATH
+	    marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--with-libatomic_ops=PATH
 	    configure command line argument when specifying
 	    where the libatomic_ops installation is located.
 	    The libatomic_ops library can be downloaded from:
@@ -2211,7 +2211,7 @@
 	    the pentium 4 processor. If you want the runtime system
 	    to be compatible with older processors (back to 486) you
 	    need to pass the --enable-ethread-pre-pentium4-compatibility
+	    marker="doc/installation_guide:INSTALL#Advanced-configuration-and-build-of-ErlangOTP">--enable-ethread-pre-pentium4-compatibility
 	    configure command line argument when configuring
 	    the system.

           

-- 
cgit v1.2.3


From 77da984614ae462912a1896ba1bb73c798ffd4f8 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Thu, 19 Jun 2014 13:47:21 +0200
Subject: Prepare release

---
 lib/stdlib/doc/src/notes.xml | 81 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 6af38b3166..0421d560b6 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,87 @@
   

   
This document describes the changes made to the STDLIB application.

 
+
STDLIB 2.1
+
+    
Fixed Bugs and Malfunctions
+      
+        
+	    
filelib:wildcard("broken_symlink") would return
+	    an empty list if "broken_symlink" was a symlink that did
+	    not point to an existing file.

+          

+	    Own Id: OTP-11850 Aux Id: seq12571 

+        
+        
+	    
erl_tar can now handle files names that contain
+	    Unicode characters. See "UNICODE SUPPORT" in the
+	    documentation for erl_tar.

+	    
When creating a tar file, erl_tar would
+	    sometime write a too short end of tape marker. GNU tar
+	    would correctly extract files from such tar file, but
+	    would complain about "A lone zero block at...".

+          

+	    Own Id: OTP-11854

+        
+        
+	    
 When redefining and exporting the type map()
+	    the Erlang Code Linter (erl_lint) erroneously
+	    emitted an error. This bug has been fixed. 

+          

+	    Own Id: OTP-11872

+        
+        
+          

+	    Fix evaluation of map updates in the debugger and
+	    erl_eval

+          

+	    Reported-by: José Valim

+          

+	    Own Id: OTP-11922

+        
+      
+    

+
+
+    
Improvements and New Features
+      
+        
+	    
The following native functions now bump an appropriate
+	    amount of reductions and yield when out of
+	    reductions:
 
+	    erlang:binary_to_list/1
+	    erlang:binary_to_list/3
+	    erlang:bitstring_to_list/1
+	    erlang:list_to_binary/1
+	    erlang:iolist_to_binary/1
+	    erlang:list_to_bitstring/1
+	    binary:list_to_bin/1 
+	    
Characteristics impact:
 
+	    Performance The functions converting
+	    from lists got a performance loss for very small lists,
+	    and a performance gain for very large lists.
+	    Priority Previously a process executing
+	    one of these functions effectively got an unfair priority
+	    boost. This priority boost depended on the input size.
+	    The larger the input was, the larger the priority boost
+	    got. This unfair priority boost is now lost. 
+	    
+          

+	    Own Id: OTP-11888

+        
+        
+          

+	    Add maps:get/3 to maps module. The function will
+	    return the supplied default value if the key does not
+	    exist in the map.

+          

+	    Own Id: OTP-11951

+        
+      
+    

+
+

+
 
STDLIB 2.0
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 5234f6f608d647b31a8f95e1f2a28f5c026d5b26 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Wed, 2 Jul 2014 09:53:09 +0200
Subject: Fix man page warning in proc_lib.xml

---
 lib/stdlib/doc/src/proc_lib.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index 88630b1fdb..f27a974242 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -302,8 +302,9 @@ init(Parent) ->
       
       Terminate a process synchronously.
       
-      Equivalent
-	to stop(Process, normal, infinity).
+      
+	
Equivalent to stop(Process,
+	    normal, infinity).

       
     
     
-- 
cgit v1.2.3


From bbf3e70e806b796611d14d4660372072dce8bffb Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Thu, 3 Jul 2014 09:48:37 +0200
Subject: Fix spec of format function in sys

The argument FormFunc is sys:handle_debug/4war erronously specified as
dbg_fun(), which is a debug function. This has now been corrected by
adding a new type, format_fun().
---
 lib/stdlib/doc/src/sys.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml
index a46fa1289f..19605f325b 100644
--- a/lib/stdlib/doc/src/sys.xml
+++ b/lib/stdlib/doc/src/sys.xml
@@ -4,7 +4,7 @@
 
   

     
-      19962013
+      19962014
       Ericsson AB. All Rights Reserved.
     
     
@@ -115,6 +115,9 @@
     
       
     
+    
+      
+    
   
   
     
-- 
cgit v1.2.3


From 41d2dc56d5d2a3be1ba59c6999e1003360b1e308 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Thu, 10 Jul 2014 10:45:27 +0200
Subject: Prepare release

---
 lib/stdlib/doc/src/notes.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 0421d560b6..5e74616099 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,25 @@
   

   
This document describes the changes made to the STDLIB application.

 
+
STDLIB 2.1.1
+
+    
Fixed Bugs and Malfunctions
+      
+        
+          

+	    OTP-11850 fixed filelib:wildcard/1 to work with broken
+	    symlinks. This correction, however, introduced problems
+	    since symlinks were no longer followed for functions like
+	    filelib:ensure_dir/1, filelib:is_dir/1,
+	    filelib:file_size/1, etc. This is now corrected.

+          

+	    Own Id: OTP-12054 Aux Id: seq12660 

+        
+      
+    

+
+

+
 
STDLIB 2.1
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 8c9352bfad6864a0c00e72500d67492c072f4372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= 
Date: Tue, 26 Aug 2014 17:22:18 +0200
Subject: stdlib: Document maps:with/2

---
 lib/stdlib/doc/src/maps.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index b37f7fd7fd..64229fa8d3 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -318,6 +318,23 @@ false
 			
 		
 
+		
+			
+			
+			
+				

+					Returns a new map Map2 with the keys K1 through Kn and their associated values from map Map1.
+					Any key in Ks that does not exist in Map1 are ignored.
+				

+				
Example:

+				
+> Map = #{42 => value_three,1337 => "value two","a" => 1},
+  Ks = ["a",42,"other key"],
+  maps:without(Ks,Map).
+#{42 => value_three,"a" => 1}
+			
+		
+
 		
 			
 			
-- 
cgit v1.2.3


From 950d808c97a4c5b579f4f1cc16b95f2d419d3505 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Mon, 15 Sep 2014 12:02:14 +0200
Subject: Update release notes

---
 lib/stdlib/doc/src/notes.xml | 73 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 5e74616099..ebc750a399 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,79 @@
   

   
This document describes the changes made to the STDLIB application.

 
+
STDLIB 2.2
+
+    
Fixed Bugs and Malfunctions
+      
+        
+          

+	    The type spec of the FormFunc argument to
+	    sys:handle_debug/4 was erroneously pointing to dbg_fun().
+	    This is now corrected and the new type is format_fun().

+          

+	    Own Id: OTP-11800

+        
+        
+          

+	    Behaviors such as gen_fsm and gen_server should always
+	    invoke format_status/2 before printing the state to the
+	    logs.

+          

+	    Own Id: OTP-11967

+        
+        
+	    
 The documentation of dets:insert_new/2 has
+	    been corrected. (Thanks to Alexei Sholik for reporting
+	    the bug.) 

+          

+	    Own Id: OTP-12024

+        
+        
+          

+	    Printing a term with io_lib:format and control sequence
+	    w, precision P and field width F, where F< P would
+	    fail in one of the two following ways:

+          

+	    1) If P < printed length of the term, an infinite loop
+	    would be entered, consuming all available memory.

+          

+	    2) If P >= printed length of the term, an exception
+	    would be raised.

+          

+	    These two problems are now corrected.

+          

+	    Own Id: OTP-12041

+        
+        
+          

+	    The documentation of maps:values/1 has been
+	    corrected.

+          

+	    Own Id: OTP-12055

+        
+        
+          

+	    Expand shell functions in map expressions.

+          

+	    Own Id: OTP-12063

+        
+      
+    

+
+
+    
Improvements and New Features
+      
+        
+          

+	    Add maps:with/2

+          

+	    Own Id: OTP-12137

+        
+      
+    

+
+

+
 
STDLIB 2.1.1
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From cb834efd4d430936fd19ac2350d724010cc0dd01 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Thu, 18 Sep 2014 14:08:09 +0200
Subject: Add note about adjacent separator characters in string:tokens/2

Adjacent separator characters are treated as one in
string:tokens/2. This was shown in the example in the reference manual
but it was not written in words. A note about this is now added.
---
 lib/stdlib/doc/src/string.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml
index c96cc95a44..b05d5cbc08 100644
--- a/lib/stdlib/doc/src/string.xml
+++ b/lib/stdlib/doc/src/string.xml
@@ -4,7 +4,7 @@
 
   

     
-      19962013
+      19962014
       Ericsson AB. All Rights Reserved.
     
     
@@ -124,6 +124,10 @@
         
 > tokens("abc defxxghix jkl", "x ").
 ["abc", "def", "ghi", "jkl"]        
+	
Note that, as shown in the example above, two or more
+	adjacent separator characters in String
+	will be treated as one. That is, there will not be any empty
+	strings in the resulting list of tokens.

       
     
     
-- 
cgit v1.2.3


From 69e8387629bdea141e196c515f4d9381f7ac3e18 Mon Sep 17 00:00:00 2001
From: Magnus Henoch 
Date: Fri, 27 Jun 2014 17:57:04 +0100
Subject: Optimise io requests for long message queues

Ensure that the monitor reference is present in all receive clauses, so
that the compiler optimisation kicks in and the run time won't depend on
the length of the message queue of the calling process.

Remove the 'EXIT' clause, as its presence breaks the optimisation, and
that case is handled by the 'DOWN' clause anyway.

The test io_SUITE:io_with_huge_message_queue is an adaptation of
gen_server_SUITE:call_with_huge_message_queue.
---
 lib/stdlib/doc/src/io_protocol.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index 9328704e11..d6da205f07 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -76,10 +76,11 @@ the server eventually sends a corresponding io_reply tuple.

 the I/O server sends the IO reply to.
 
 ReplyAs can be any datum and is returned in the corresponding
-io_reply. The io module simply uses the pid()
-of the I/O server as the ReplyAs datum, but a more complicated client
+io_reply. The io module monitors
+the I/O server, and uses the monitor reference as the ReplyAs datum.
+A more complicated client
 could have several outstanding I/O requests to the same I/O server and
-would then use i.e. a reference() or something else to differentiate among
+would then use different references (or something else) to differentiate among
 the incoming IO replies. The ReplyAs element should be considered
 opaque by the I/O server. Note that the pid() of the I/O server is not
 explicitly present in the io_reply tuple. The reply can be sent from any
-- 
cgit v1.2.3


From 8c3378d73e2ed23f9250aaf3dae95db44a664e75 Mon Sep 17 00:00:00 2001
From: Christopher Faulet 
Date: Thu, 23 Oct 2014 16:42:57 +0200
Subject: Add 'trim_all' option to binary:split/3

This option can be set to remove _ALL_ empty parts of the result of a call to
binary:split/3.
---
 lib/stdlib/doc/src/binary.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml
index 2410f1f9b8..cda4b974b2 100644
--- a/lib/stdlib/doc/src/binary.xml
+++ b/lib/stdlib/doc/src/binary.xml
@@ -578,6 +578,10 @@ store(Binary, GBSet) ->
 
       
Removes trailing empty parts of the result (as does trim in re:split/3)

 
+      trim_all
+
+      
Removes all empty parts of the result.

+
       global
 
       
Repeats the split until the Subject is
-- 
cgit v1.2.3


From d94783860fd4e41373746de059b78403c8bd1a59 Mon Sep 17 00:00:00 2001
From: dcy 
Date: Tue, 4 Nov 2014 17:20:51 +0800
Subject: fix doc for maps:with/2

---
 lib/stdlib/doc/src/maps.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index 64229fa8d3..f766c843be 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -330,7 +330,7 @@ false
 				
 > Map = #{42 => value_three,1337 => "value two","a" => 1},
   Ks = ["a",42,"other key"],
-  maps:without(Ks,Map).
+  maps:with(Ks,Map).
 #{42 => value_three,"a" => 1}
 			
 		
-- 
cgit v1.2.3


From de1d77d0b4e8ab9e507addf7878457202357ca32 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Mon, 20 Oct 2014 16:59:10 +0200
Subject: Add documentation of maps in supervisor flags and child specs

---
 lib/stdlib/doc/src/supervisor.xml | 255 ++++++++++++++++++++++++--------------
 1 file changed, 161 insertions(+), 94 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml
index 3a5027d595..ffac1c0bd7 100644
--- a/lib/stdlib/doc/src/supervisor.xml
+++ b/lib/stdlib/doc/src/supervisor.xml
@@ -37,12 +37,12 @@
       the gen_event, gen_fsm, or gen_server
       behaviours. A supervisor implemented using this module will have
       a standard set of interface functions and include functionality
-      for tracing and error reporting. Supervisors are used to build an
+      for tracing and error reporting. Supervisors are used to build a
       hierarchical process structure called a supervision tree, a
       nice way to structure a fault tolerant application. Refer to
       OTP Design Principles for more information.

-    
A supervisor assumes the definition of which child processes to
-      supervise to be located in a callback module exporting a
+    
A supervisor expects the definition of which child processes to
+      supervise to be specified in a callback module exporting a
       pre-defined set of functions.

     
Unless otherwise stated, all functions in this module will fail
       if the specified supervisor does not exist or if bad arguments
@@ -53,18 +53,30 @@
     Supervision Principles
     
The supervisor is responsible for starting, stopping and
       monitoring its child processes. The basic idea of a supervisor is
-      that it should keep its child processes alive by restarting them
+      that it shall keep its child processes alive by restarting them
       when necessary.

-    
The children of a supervisor is defined as a list of
+    
The children of a supervisor are defined as a list of
       child specifications. When the supervisor is started, the child
       processes are started in order from left to right according to
       this list. When the supervisor terminates, it first terminates
       its child processes in reversed start order, from right to left.

-    
A supervisor can have one of the following restart strategies:

+    
+    
The properties of a supervisor are defined by the supervisor
+      flags. This is the type definition for the supervisor flags:
+    

+    
sup_flags() = #{strategy => strategy(),         % optional
+                intensity => non_neg_integer(), % optional
+                period => pos_integer()}        % optional
+      

+    
A supervisor can have one of the following restart
+	strategies, specified with the strategy key in the
+      above map:
+    

     
       
         
one_for_one - if one child process terminates and
-          should be restarted, only that child process is affected.

+          should be restarted, only that child process is
+          affected. This is the default restart strategy.

       
       
         
one_for_all - if one child process terminates and
@@ -94,43 +106,53 @@
           instead the child specification identifier is used,
           terminate_child/2 will return
           {error,simple_one_for_one}.

-        
Because a simple_one_for_one supervisor could have many
-        children, it shuts them all down at same time. So, order in which they
-        are stopped is not defined. For the same reason, it could have an
-        overhead with regards to the Shutdown strategy.

+        
Because a simple_one_for_one supervisor could have
+          many children, it shuts them all down asynchronously. This
+          means that the children will do their cleanup in parallel,
+          and therefore the order in which they are stopped is not
+          defined.

       
     
     
To prevent a supervisor from getting into an infinite loop of
-      child process terminations and restarts, a maximum restart frequency
-      is defined using two integer values MaxR
-      and MaxT. If more than MaxR restarts occur within
-      MaxT seconds, the supervisor terminates all child
-      processes and then itself.
+      child process terminations and restarts, a maximum restart
+      intensity is defined using two integer values specified
+      with the intensity and period keys in the above
+      map. Assuming the values MaxR for intensity
+      and MaxT for period, then if more than MaxR
+      restarts occur within MaxT seconds, the supervisor will
+      terminate all child processes and then itself. The default value
+      for intensity is 1, and the default value
+      for period is 5.
     

     
     
This is the type definition of a child specification:

-    
-child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
- Id = term()
- StartFunc = {M,F,A}
-  M = F = atom()
-  A = [term()]
- Restart = permanent | transient | temporary
- Shutdown = brutal_kill | int()>0 | infinity
- Type = worker | supervisor
- Modules = [Module] | dynamic
-  Module = atom()

+    
child_spec() = #{id => child_id(),       % mandatory
+                 start => mfargs(),      % mandatory
+                 restart => restart(),   % optional
+                 shutdown => shutdown(), % optional
+                 type => worker(),       % optional
+                 modules => modules()}   % optional

+    
The old tuple format is kept for backwards compatibility,
+      see child_spec(),
+      but the map is preferred.
+    

     
       
-        
Id is a name that is used to identify the child
+        
id is used to identify the child
           specification internally by the supervisor.

+	
The id key is mandatory.

+	
Note that this identifier on occations has been called
+	  "name". As far as possible, the terms "identifier" or "id"
+	  are now used but in order to keep backwards compatibility,
+	  some occurences of "name" can still be found, for example
+	  in error messages.

       
       
-        
StartFunc defines the function call used to start
-          the child process. It should be a module-function-arguments
+        
start defines the function call used to start the
+          child process. It must be a module-function-arguments
           tuple {M,F,A} used as apply(M,F,A).

         
The start function must create and link to the child
-          process, and should return {ok,Child} or
+          process, and must return {ok,Child} or
           {ok,Child,Info} where Child is the pid of
           the child process and Info an arbitrary term which is
           ignored by the supervisor.

@@ -143,20 +165,23 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           error tuple {error,Error}.

         
Note that the start_link functions of the different
           behaviour modules fulfill the above requirements.

+	
The start key is mandatory.

       
       
-        
Restart defines when a terminated child process
-          should be restarted. A permanent child process should
-          always be restarted, a temporary child process should
+        
restart defines when a terminated child process
+          shall be restarted. A permanent child process will
+          always be restarted, a temporary child process will
           never be restarted (even when the supervisor's restart strategy
           is rest_for_one or one_for_all and a sibling's
           death causes the temporary process to be terminated) and a
-          transient child process should be restarted only if
+          transient child process will be restarted only if
           it terminates abnormally, i.e. with another exit reason
           than normal, shutdown or {shutdown,Term}.

+	
The restart key is optional. If it is not given, the
+	  default value permanent will be used.

       
       
-        
Shutdown defines how a child process should be
+        
shutdown defines how a child process shall be
           terminated. brutal_kill means the child process will
           be unconditionally terminated using exit(Child,kill).
           An integer timeout value means that the supervisor will tell
@@ -166,35 +191,45 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           no exit signal is received within the specified number of milliseconds,
           the child process is unconditionally terminated using
           exit(Child,kill).

-        
If the child process is another supervisor, Shutdown
+        
If the child process is another supervisor, the shutdown time
           should be set to infinity to give the subtree ample
-          time to shutdown. It is also allowed to set it to infinity,
+          time to shut down. It is also allowed to set it to infinity,
           if the child process is a worker.

         
-          
Be careful by setting the Shutdown strategy to
+          
Be careful when setting the shutdown time to
           infinity when the child process is a worker. Because, in this
           situation, the termination of the supervision tree depends on the
           child process, it must be implemented in a safe way and its cleanup
           procedure must always return.

         
         
Note that all child processes implemented using the standard
-          OTP behavior modules automatically adhere to the shutdown
+          OTP behaviour modules automatically adhere to the shutdown
           protocol.

+	
The shutdown key is optional. If it is not given,
+	  the default value 5000 will be used if the child is
+	  of type worker; and infinity will be used if
+	  the child is of type supervisor.

       
       
-        
Type specifies if the child process is a supervisor or
+        
type specifies if the child process is a supervisor or
           a worker.

+	
The type key is optional. If it is not given, the
+	  default value worker will be used.

       
       
-        
Modules is used by the release handler during code
+        
modules is used by the release handler during code
           replacement to determine which processes are using a certain
-          module. As a rule of thumb Modules should be a list
-          with one element [Module], where Module is
-          the callback module, if the child process is a supervisor,
-          gen_server or gen_fsm. If the child process is an event
-          manager (gen_event) with a dynamic set of callback modules,
-          Modules should be dynamic. See OTP Design Principles
-          for more information about release handling.

+          module. As a rule of thumb, if the child process is a
+          supervisor, gen_server, or gen_fsm,
+	  this should be a list with one element [Module],
+	  where Module is the callback module. If the child
+	  process is an event manager (gen_event) with a
+	  dynamic set of callback modules, the value dynamic
+	  shall be used. See OTP Design Principles for more
+	  information about release handling.

+	
The modules key is optional. If it is not given, it
+	  defaults to [M], where M comes from the
+	  child's start {M,F,A}

       
       
         
Internally, the supervisor also keeps track of the pid
@@ -213,11 +248,20 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
     
     
       
+      
The tuple format is kept for backwards compatibility
+	 only. A map is preferred; see more details
+	 above.

     
     
       
-      
A (the argument list) has the value
-         undefined if Restart is temporary.

+      
+	
The value undefined for A (the
+	  argument list) is only to be used internally
+	  in supervisor. If the restart type of the child
+	  is temporary, then the process is never to be
+	  restarted and therefore there is no need to store the real
+	  argument list. The value undefined will then be
+	  stored instead.

       
     
     
@@ -232,6 +276,12 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
     
       
     
+    
+      
+      
The tuple format is kept for backwards compatibility
+	 only. A map is preferred; see more details
+	 above.

+    
     
       
     
@@ -253,20 +303,20 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           the supervisor is linked to the calling process (its
           supervisor).

         
The created supervisor process calls Module:init/1 to
-          find out about restart strategy, maximum restart frequency
+          find out about restart strategy, maximum restart intensity
           and child processes. To ensure a synchronized start-up
           procedure, start_link/2,3 does not return until
           Module:init/1 has returned and all child processes
           have been started.

-        
If SupName={local,Name} the supervisor is registered
+        
If SupName={local,Name}, the supervisor is registered
           locally as Name using register/2. If
           SupName={global,Name} the supervisor is registered
           globally as Name using global:register_name/2. If
           SupName={via,Module,Name} the supervisor
 	  is registered as Name using the registry represented by
-	  Module. The Module callback should export the functions
+	  Module. The Module callback must export the functions
 	  register_name/2, unregister_name/1 and send/2,
-	  which should behave like the corresponding functions in global.
+	  which shall behave like the corresponding functions in global.
 	  Thus, {via,global,Name} is a valid reference.

           
If no name is provided, the supervisor is not registered.

         
Module is the name of the callback module.

@@ -274,14 +324,14 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           the argument to Module:init/1.

         
If the supervisor and its child processes are successfully
           created (i.e. if all child process start functions return
-          {ok,Child}, {ok,Child,Info}, or ignore)
+          {ok,Child}, {ok,Child,Info}, or ignore),
           the function returns {ok,Pid}, where Pid is
           the pid of the supervisor. If there already exists a process
-          with the specified SupName the function returns
+          with the specified SupName, the function returns
           {error,{already_started,Pid}}, where Pid is
           the pid of that process.

         
If Module:init/1 returns ignore, this function
-          returns ignore as well and the supervisor terminates
+          returns ignore as well, and the supervisor terminates
           with reason normal.
           If Module:init/1 fails or returns an incorrect value,
           this function returns {error,Term} where Term
@@ -297,7 +347,6 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
     
       
       Dynamically add a child process to a supervisor.
-      
       
       
       
@@ -314,35 +363,35 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           {via,Module,Name}, if the supervisor is registered
 	  through an alternative process registry.
         
-        
ChildSpec should be a valid child specification
+        
ChildSpec must be a valid child specification
           (unless the supervisor is a simple_one_for_one
-          supervisor, see below). The child process will be started by
+          supervisor; see below). The child process will be started by
           using the start function as defined in the child
           specification.

-        
If the case of a simple_one_for_one supervisor,
+        
In the case of a simple_one_for_one supervisor,
           the child specification defined in Module:init/1 will
-          be used and ChildSpec should instead be an arbitrary
+          be used, and ChildSpec shall instead be an arbitrary
           list of terms List. The child process will then be
           started by appending List to the existing start
           function arguments, i.e. by calling
           apply(M, F, A++List) where {M,F,A} is the start
           function defined in the child specification.

         
If there already exists a child specification with
-          the specified Id, ChildSpec is discarded and
+          the specified identifier, ChildSpec is discarded, and
           the function returns {error,already_present} or
           {error,{already_started,Child}}, depending on if
           the corresponding child process is running or not.

         
If the child process start function returns {ok,Child}
-          or {ok,Child,Info}, the child specification and pid is
+          or {ok,Child,Info}, the child specification and pid are
           added to the supervisor and the function returns the same
           value.

         
If the child process start function returns ignore,
           the child specification is added to the supervisor, the pid
-          is set to undefined and the function returns
+          is set to undefined, and the function returns
           {ok,undefined}.

         
If the child process start function returns an error tuple or
           an erroneous value, or if it fails, the child specification is
-          discarded and the function returns {error,Error} where
+          discarded, and the function returns {error,Error} where
           Error is a term containing information about the error
           and child specification.

       
@@ -366,7 +415,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
 
 	
If the child is temporary, the child specification is deleted as
 	  soon as the process terminates. This means
-	  that delete_child/2 has no meaning
+	  that delete_child/2 has no meaning,
 	  and restart_child/2 can not be used for these
 	  children.

 
@@ -375,13 +424,13 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           process is alive, but is not a child of the given
           supervisor, the function will return
           {error,not_found}. If the child specification
-          identifier is given instead instead of a pid(), the
+          identifier is given instead of a pid(), the
           function will return {error,simple_one_for_one}.

         
If successful, the function returns ok. If there is
           no child specification with the specified Id, the
           function returns {error,not_found}.

-        
See start_child/2 for a description of
-          SupRef.

+        
See start_child/2
+          for a description of SupRef.

       
     
     
@@ -390,15 +439,15 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       
         
Tells the supervisor SupRef to delete the child
           specification identified by Id. The corresponding child
-          process must not be running, use terminate_child/2 to
+          process must not be running. Use terminate_child/2 to
           terminate it.

-        
See start_child/2 for a description of
-          SupRef.

+        
See start_child/2
+          for a description of SupRef.

         
If successful, the function returns ok. If the child
           specification identified by Id exists but
           the corresponding child process is running or about to be restarted,
 	  the function returns {error,running} or
-	  {error,restarting} respectively. If the child specification
+	  {error,restarting}, respectively. If the child specification
           identified by Id does not exist, the function
 	  returns {error,not_found}.

       
@@ -410,10 +459,10 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
         
Tells the supervisor SupRef to restart
           a child process corresponding to the child specification
           identified by Id. The child
-          specification must exist and the corresponding child process
+          specification must exist, and the corresponding child process
           must not be running.

 	
Note that for temporary children, the child specification
-	  is automatically deleted when the child terminates, and thus
+	  is automatically deleted when the child terminates; thus
 	  it is not possible to restart such children.

         
See start_child/2
           for a description of SupRef.

@@ -429,7 +478,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           is added to the supervisor and the function returns the same
           value.

         
If the child process start function returns ignore,
-          the pid remains set to undefined and the function
+          the pid remains set to undefined, and the function
           returns {ok,undefined}.

         
If the child process start function returns an error tuple
           or an erroneous value, or if it fails, the function returns
@@ -462,7 +511,7 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           
             
Child - the pid of the corresponding child
               process, the atom restarting if the process is about to be
-	      restarted or undefined if there is no such process.

+	      restarted, or undefined if there is no such process.

           
           
             
Type - as defined in the child specification.

@@ -475,8 +524,8 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
     
     
       
-      Return counts for the number of childspecs, active children,
-        supervisors and workers.
+      Return counts for the number of child specifications,
+        active children, supervisors, and workers.
       
         
Returns a property list (see proplists) containing the
           counts for each of the following elements of the supervisor's
@@ -500,6 +549,8 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
               process is still alive.

           
         
+        
See start_child/2
+          for a description of SupRef.

       
     
     
@@ -511,11 +562,23 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
           correct, or {error,Error} otherwise.

       
     
+    
+      
+      Return the child specification map for the given
+	child.
+      
+        
Returns the child specification map for the child identified
+          by Id under supervisor SupRef. The returned
+          map contains all keys, both mandatory and optional.

+        
See start_child/2
+          for a description of SupRef.

+      
+    
   
 
   

     CALLBACK FUNCTIONS
-    
The following functions should be exported from a
+    
The following functions must be exported from a
       supervisor callback module.

   

   
@@ -524,33 +587,37 @@ child_spec() = {Id,StartFunc,Restart,Shutdown,Type,Modules}
       Return a supervisor specification.
       
         Args = term()
-        Result = {ok,{{RestartStrategy,MaxR,MaxT},[ChildSpec]}} | ignore
-         RestartStrategy = strategy()
-         MaxR = integer()>=0
-         MaxT = integer()>0
+        Result = {ok,{SupFlags,[ChildSpec]}} | ignore
+         SupFlags = sup_flags()
          ChildSpec = child_spec()
       
       
         
Whenever a supervisor is started using
           supervisor:start_link/2,3, this function is called by
           the new process to find out about restart strategy, maximum
-          restart frequency and child specifications.

+          restart intensity, and child specifications.

         
Args is the Args argument provided to the start
           function.

-        
RestartStrategy is the restart strategy and
-          MaxR and MaxT defines the maximum restart
-          frequency of the supervisor. [ChildSpec] is a list of
-          valid child specifications defining which child processes
-          the supervisor should start and monitor. See the discussion
-          about Supervision Principles above.

+        
SupFlags is the supervisor flags defining the
+          restart strategy and max restart intensity for the
+          supervisor. [ChildSpec] is a list of valid child
+          specifications defining which child processes the supervisor
+          shall start and monitor. See the discussion about
+          Supervision Principles above.

         
Note that when the restart strategy is
           simple_one_for_one, the list of child specifications
           must be a list with one child specification only.
-          (The Id is ignored). No child process is then started
+          (The child specification identifier is ignored.) No child process is then started
           during the initialization phase, but all children are assumed
           to be started dynamically using
           supervisor:start_child/2.

         
The function may also return ignore.

+	
Note that this function might also be called as a part of a
+	  code upgrade procedure. For this reason, the function should
+	  not have any side effects. See
+	  Design
+	  Principles for more information about code upgrade
+	  of supervisors.

       
     
   
-- 
cgit v1.2.3


From 08504087f66ab23e39c082782524e2d1e531e3e7 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Tue, 11 Nov 2014 15:16:03 +0100
Subject: Remove comments about unicode atoms in OTP 18

There was once a plan to implement support for unicode atoms in OTP
18. This plan has been stopped until further notice, and the
information about this is now removed from the documentation.
---
 lib/stdlib/doc/src/unicode_usage.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml
index bebfbd4514..29b8940c62 100644
--- a/lib/stdlib/doc/src/unicode_usage.xml
+++ b/lib/stdlib/doc/src/unicode_usage.xml
@@ -50,12 +50,8 @@
   encoded files in several circumstances. Most notable is the support
   for UTF-8 in files read by file:consult/1, release handler support
   for UTF-8 and more support for Unicode character sets in the
-  I/O-system.

-
-  
In Erlang/OTP 17.0, the encoding default for Erlang source files was
-  switched to UTF-8 and in Erlang/OTP 18.0 Erlang will support atoms in the full
-  Unicode range, meaning full Unicode function and module
-  names

+  I/O-system. In Erlang/OTP 17.0, the encoding default for Erlang source files was
+  switched to UTF-8.

 
   
This guide outlines the current Unicode support and gives a couple
   of recipes for working with Unicode data.

@@ -289,8 +285,8 @@
     The language
     Having the source code in UTF-8 also allows you to write
     string literals containing Unicode characters with code points >
-    255, although atoms, module names and function names will be
-    restricted to the ISO-Latin-1 range until the Erlang/OTP 18.0 release. Binary
+    255, although atoms, module names and function names are
+    restricted to the ISO-Latin-1 range. Binary
     literals where you use the /utf8 type, can also be
     expressed using Unicode characters > 255. Having module names
     using characters other than 7-bit ASCII can cause trouble on
@@ -385,8 +381,7 @@ external_charlist() = maybe_improper_list(char() |
   using characters from the ISO-latin-1 character set and atoms are
   restricted to the same ISO-latin-1 range. These restrictions in the
   language are of course independent of the encoding of the source
-  file. Erlang/OTP 18.0 is expected to handle functions named in
-  Unicode as well as Unicode atoms.

+  file.

   

     Bit-syntax
     
The bit-syntax contains types for coping with binary data in the
-- 
cgit v1.2.3


From b2171f6bf65c5897d37103afec102fa565bc134e Mon Sep 17 00:00:00 2001
From: Hans Nilsson 
Date: Mon, 10 Nov 2014 17:09:25 +0100
Subject: erl_tar: Extend api to define own storage media access functions.

The reason for this is a requirement on enabling ssh_sftp to write a tar file on the server.
This new api function is used by ssh_sftp:open_tar/3,4.
---
 lib/stdlib/doc/src/erl_tar.xml | 110 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 109 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml
index 7f25f5b7bc..95eefb8f9b 100644
--- a/lib/stdlib/doc/src/erl_tar.xml
+++ b/lib/stdlib/doc/src/erl_tar.xml
@@ -79,6 +79,12 @@
     done.

   

 
+  

+    OTHER STORAGE MEDIA
+    
The erl_ftp module normally accesses the tar-file on disk using the file module.  When other needs arise, there is a way to define your own low-level Erlang functions to perform the writing and reading on the storage media. See init/3 for usage.

+    
An example of this is the sftp support in ssh_sftp:open_tar/3. That function opens a tar file on a remote machine using an sftp channel.

+  

+
   

     LIMITATIONS
     
For maximum compatibility, it is safe to archive files with names
@@ -99,7 +105,8 @@
         TarDescriptor = term()
         Filename = filename()
         Options = [Option]
-        Option = dereference|verbose
+        Option = dereference|verbose|{chunks,ChunkSize}
+	ChunkSize = positive_integer()
         RetValue = ok|{error,{Filename,Reason}}
         Reason = term()
       
@@ -119,6 +126,12 @@
           
             
Print an informational message about the file being added.

           
+	  {chunks,ChunkSize}
+	  
+	    
Read data in parts from the file. This is intended for memory-limited
+	    machines that for example builds a tar file on a remote machine over
+	    sftp.

+	  
         
       
     
@@ -389,6 +402,101 @@
         
       
     
+
+    
+      init(UserPrivate, AccessMode, Fun) -> {ok,TarDescriptor} | {error,Reason}
+
+      Creates a TarDescriptor used in subsequent tar operations when
+      defining own low-level storage access functions
+      
+      
+	UserPrivate = term()
+	AccessMode = [write] | [read]
+	Fun when AccessMode is [write] = fun(write,   {UserPrivate,DataToWrite})->...;
+	                                       (position,{UserPrivate,Position})->...;
+	                                       (close,   UserPrivate)->...
+					    end
+        
+	Fun when AccessMode is [read] = fun(read2,   {UserPrivate,Size})->...;
+	                                      (position,{UserPrivate,Position})->...;
+	                                      (close,   UserPrivate)->...
+					    end
+        
+	TarDescriptor = term()
+	Reason = term()
+      
+      
+	
The Fun is the definition of what to do when the different
+	storage operations functions are to be called from the higher tar
+	handling functions (add/3, add/4, close/1...).
+	

+	
The Fun will be called when the tar function wants to do
+	a low-level operation, like writing a block to a file.  The Fun is called
+	as Fun(Op,{UserPrivate,Parameters...}) where Op is the operation name,
+	UserPrivate is the term passed as the first argument to init/1 and
+	Parameters... are the data added by the tar function to be passed down to
+	the storage handling function.
+	

+	
The parameter UserPrivate is typically the result of opening a low level
+	structure like a file descriptor, a sftp channel id or such.  The different Fun
+	clauses operates on that very term.
+	

+	
The fun clauses parameter lists are:
+	
+	  (write, {UserPrivate,DataToWrite})
+	  Write the term DataToWrite using UserPrivate
+	  (close, UserPrivate)
+	  Close the access.
+	  (read2, {UserPrivate,Size})
+	  Read using UserPrivate but only Size bytes. Note that there is
+	  only an arity-2 read function, not an arity-1
+	  
+	   (position,{UserPrivate,Position})
+	  Sets the position of UserPrivate as defined for files in file:position/2
+	  
+	  
+	
+	

+	
A complete Fun parameter for reading and writing on files using the
+	file module could be:
+	

+	
+	  ExampleFun = 
+	     fun(write, {Fd,Data}) ->  file:write(Fd, Data);
+	        (position, {Fd,Pos}) -> file:position(Fd, Pos);
+	        (read2, {Fd,Size}) -> file:read(Fd,Size);
+	        (close, Fd) -> file:close(Fd)
+	     end
+	
+	
where Fd was given to the init/3 function as:

+	
+	  {ok,Fd} = file:open(Name,...).
+	  {ok,TarDesc} = erl_tar:init(Fd, [write], ExampleFun),
+	
+	
The TarDesc is then used:

+	
+	  erl_tar:add(TarDesc, SomeValueIwantToAdd, FileNameInTarFile),
+	  ....,
+	  erl_tar:close(TarDesc)
+	
+	
When the erl_tar core wants to e.g. write a piece of Data, it would call
+	ExampleFun(write,{UserPrivate,Data}).
+	

+	
+	  
The example above with file module operations is not necessary to
+	  use directly since that is what the open function
+	  in principle does.
+	  

+	
+        
+          
The TarDescriptor term is not a file descriptor.
+            You should not rely on the specific contents of the TarDescriptor
+            term, as it may change in future versions as more features are added
+            to the erl_tar module.

+        
+      
+    
+
     
       table(Name) -> RetValue
       Retrieve the name of all files in a tar file
-- 
cgit v1.2.3


From 069fe15452aa33440aff5e770c169bd3612d7646 Mon Sep 17 00:00:00 2001
From: Derek Brown 
Date: Thu, 20 Nov 2014 13:46:42 -0500
Subject: Fix spelling and grammar

---
 lib/stdlib/doc/src/io_protocol.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml
index 9328704e11..0b76882da4 100644
--- a/lib/stdlib/doc/src/io_protocol.xml
+++ b/lib/stdlib/doc/src/io_protocol.xml
@@ -49,7 +49,7 @@ current I/O-protocol.

 
The original I/O-protocol was simple and flexible. Demands for spacial
 and execution time efficiency has triggered extensions to the protocol
 over the years, making the protocol larger and somewhat less easy to
-implement than the original. It can certainly be argumented that the
+implement than the original. It can certainly be argued that the
 current protocol is too complex, but this text describes how it looks
 today, not how it should have looked.

 
-- 
cgit v1.2.3


From 11ccbb255404a0d76cd4cb08786a73a20b6980ee Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz 
Date: Sun, 30 Nov 2014 18:56:58 +0100
Subject: dict(3): fix typo reported by Rabbe Fogelholm

---
 lib/stdlib/doc/src/dict.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml
index 942fd1f45e..0771682a25 100644
--- a/lib/stdlib/doc/src/dict.xml
+++ b/lib/stdlib/doc/src/dict.xml
@@ -121,7 +121,7 @@
           Dict together with an extra argument Acc
           (short for accumulator). Fun must return a new
           accumulator which is passed to the next call. Acc0 is
-          returned if the list is empty. The evaluation order is
+          returned if the dict is empty. The evaluation order is
           undefined.

       
     
-- 
cgit v1.2.3


From 7f3486a5ddc02a366f2945dfd009c4a2697a2b98 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Tue, 9 Dec 2014 15:21:47 +0100
Subject: Prepare release

---
 lib/stdlib/doc/src/notes.xml | 103 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index ebc750a399..8582bfc9f9 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,109 @@
   

   
This document describes the changes made to the STDLIB application.

 
+
STDLIB 2.3
+
+    
Fixed Bugs and Malfunctions
+      
+        
+          

+	    The documentation of string:tokens/2 now explicitly
+	    specifies that adjacent separator characters do not give
+	    any empty strings in the resulting list of tokens.

+          

+	    Own Id: OTP-12036

+        
+        
+          

+	    Fix broken deprecation warnings in ssh application

+          

+	    Own Id: OTP-12187

+        
+        
+          

+	    Maps: Properly align union typed assoc values in
+	    documentation

+          

+	    Own Id: OTP-12190

+        
+        
+          

+	    Fix filelib:wildcard/2 when 'Cwd' ends with a dot

+          

+	    Own Id: OTP-12212

+        
+        
+          

+	    Allow Name/Arity syntax in maps values inside
+	    attributes.

+          

+	    Own Id: OTP-12213

+        
+        
+          

+	    Fix edlin to correctly save text killed with ctrl-u.
+	    Prior to this fix, entering text into the Erlang shell
+	    and then killing it with ctrl-u followed by yanking it
+	    back with ctrl-y would result in the yanked text being
+	    the reverse of the original killed text.

+          

+	    Own Id: OTP-12224

+        
+        
+          

+	    If a callback function was terminated with exit/1, there
+	    would be no stack trace in the ERROR REPORT produced by
+	    gen_server. This has been corrected.

+          

+	    To keep the backwards compatibility, the actual exit
+	    reason for the process is not changed.

+          

+	    Own Id: OTP-12263 Aux Id: seq12733 

+        
+        
+          

+	    Warnings produced by ms_transform could point out
+	    the wrong line number.

+          

+	    Own Id: OTP-12264

+        
+      
+    

+
+
+    
Improvements and New Features
+      
+        
+          

+	    Supports tar file creation on other media than file
+	    systems mounted on the local machine.

+          

+	    The erl_tar api is extended with
+	    erl_tar:init/3 that enables usage of user provided
+	    media storage routines. A ssh-specific set of such
+	    routines is hidden in the new function
+	    ssh_sftp:open_tar/3 to simplify creating a tar
+	    archive on a remote ssh server.

+          

+	    A chunked file reading option is added to
+	    erl_tar:add/3,4 to save memory on e.g small
+	    embedded systems. The size of the slices read from a file
+	    in that case can be specified.

+          

+	    Own Id: OTP-12180 Aux Id: seq12715 

+        
+        
+          

+	    I/O requests are optimized for long message queues in the
+	    calling process.

+          

+	    Own Id: OTP-12315

+        
+      
+    

+
+

+
 
STDLIB 2.2
 
     
Fixed Bugs and Malfunctions
-- 
cgit v1.2.3


From 3aa7023f2e4f5454faddd663f00ee4c935f9b8f6 Mon Sep 17 00:00:00 2001
From: Lukas Larsson 
Date: Thu, 4 Dec 2014 11:09:28 +0100
Subject: ets: Increase data available in crash dumps and ets:info

OTP-12376
---
 lib/stdlib/doc/src/ets.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 3df24bf688..aa16e4e3db 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -456,6 +456,12 @@ Error: fun containing local Erlang function calls
           {type, type()}          


 
            The table type.
+          {read_concurrency, boolean()}          


+
+           Indicates whether the table uses read_concurrency or not.
+          {write_concurrency, boolean()}          


+
+           Indicates whether the table uses write_concurrency or not.
         
       
     
-- 
cgit v1.2.3


From fdf09e81de5e7f1ecfe71f98b56c411073badae8 Mon Sep 17 00:00:00 2001
From: Olivier Girondel 
Date: Sun, 4 Jan 2015 04:40:55 +0100
Subject: Add math:log2/1

---
 lib/stdlib/doc/src/math.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml
index 43cd20e726..7cfc8a1175 100644
--- a/lib/stdlib/doc/src/math.xml
+++ b/lib/stdlib/doc/src/math.xml
@@ -67,6 +67,7 @@
       
       
       
+      
       
       
       
-- 
cgit v1.2.3


From 7b37b460dfb4818941e749030bad33971411a22d Mon Sep 17 00:00:00 2001
From: Daniel White 
Date: Tue, 17 Feb 2015 14:12:23 +1100
Subject: Document the termination semantics of a zip handle

---
 lib/stdlib/doc/src/zip.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml
index 48b376743d..3845ccd09d 100644
--- a/lib/stdlib/doc/src/zip.xml
+++ b/lib/stdlib/doc/src/zip.xml
@@ -430,6 +430,8 @@
           means that subsequently reading files from the archive will be
           faster than unzipping files one at a time with unzip.

         
The archive must be closed with zip_close/1.

+        
The ZipHandle will be closed if the
+          process which originally opened the archive dies.

       
     
     
-- 
cgit v1.2.3


From 748f3a6f7414f4e92597b76d430b492c4503e7c5 Mon Sep 17 00:00:00 2001
From: Anthony Ramine 
Date: Thu, 18 Dec 2014 01:34:37 +0100
Subject: Fix documentation about character types in unicode mode

Behaviour of character types \d, \w and \s has always been to not match characters
with value above 255, not 128, i.e. they are limited to ISO-Latin-1 and not ASCII.
---
 lib/stdlib/doc/src/re.xml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml
index a1833f6a51..5af1468e9b 100644
--- a/lib/stdlib/doc/src/re.xml
+++ b/lib/stdlib/doc/src/re.xml
@@ -150,7 +150,11 @@ This option makes it possible to include comments inside complicated patterns. N
       no_start_optimize
       This option disables optimization that may malfunction if "Special start-of-pattern items" are present in the regular expression. A typical example would be when matching "DEFABC" against "(*COMMIT)ABC", where the start optimization of PCRE would skip the subject up to the "A" and would never realize that the (*COMMIT) instruction should have made the matching fail. This option is only relevant if you use "start-of-pattern items", as discussed in the section "PCRE regular expression details" below.
       ucp
-      Specifies that Unicode Character Properties should be used when resolving \B, \b, \D, \d, \S, \s, \Wand \w. Without this flag, only ISO-Latin-1 properties are used. Using Unicode properties hurts performance, but is semantically correct when working with Unicode characters beyond the ISO-Latin-1 range.
+      Specifies that Unicode Character Properties should be used when
+        resolving \B, \b, \D, \d, \S, \s, \W and \w. Without this flag, only
+        ISO-Latin-1 properties are used. Using Unicode properties hurts
+        performance, but is semantically correct when working with Unicode
+        characters beyond the ISO-Latin-1 range.
       never_utf
       Specifies that the (*UTF) and/or (*UTF8) "start-of-pattern items" are forbidden. This flag can not be combined with unicode. Useful if ISO-Latin-1 patterns from an external source are to be compiled.
       
@@ -966,7 +970,7 @@ appearance causes an error.
 
 
This has the same effect as setting the ucp option: it causes sequences
 such as \d and \w to use Unicode properties to determine character types,
-instead of recognizing only characters with codes less than 128 via a lookup
+instead of recognizing only characters with codes less than 256 via a lookup
 table.
 

 
@@ -1307,7 +1311,8 @@ By default, the definition of letters and digits is controlled by PCRE's
 low-valued character tables, in Erlang's case (and without the unicode option), 
 the ISO-Latin-1 character set.

 
-
By default, in unicode mode, characters with values greater than 128 never match
+
By default, in unicode mode, characters with values greater than 255,
+i.e. all characters outside the ISO-Latin-1 character set, never match
 \d, \s, or \w, and always match \D, \S, and \W. These sequences retain
 their original meanings from before UTF support was available, mainly for
 efficiency reasons. However, if the ucp option is set, the behaviour is changed so that Unicode
@@ -1954,10 +1959,10 @@ can be included in a class as a literal string of data units, or by using the
 upper case and lower case versions, so for example, a caseless [aeiou] matches
 "A" as well as "a", and a caseless [^aeiou] does not match "A", whereas a
 caseful version would. In a UTF mode, PCRE always understands the concept of
-case for characters whose values are less than 128, so caseless matching is
+case for characters whose values are less than 256, so caseless matching is
 always possible. For characters with higher values, the concept of case is
 supported if PCRE is compiled with Unicode property support, but not otherwise.
-If you want to use caseless matching in a UTF mode for characters 128 and
+If you want to use caseless matching in a UTF mode for characters 256 and
 above, you must ensure that PCRE is compiled with Unicode property support as
 well as with UTF support.

 
@@ -1989,7 +1994,7 @@ matches the letters in either case. For example, [W-c] is equivalent to
 [][\\^_`wxyzabc], matched caselessly, and in a non-UTF mode, if character
 tables for a French locale are in use, [\xc8-\xcb] matches accented E
 characters in both cases. In UTF modes, PCRE supports the concept of case for
-characters with values greater than 128 only when it is compiled with Unicode
+characters with values greater than 255 only when it is compiled with Unicode
 property support.

 
 
The character escape sequences \d, \D, \h, \H, \p, \P, \s, \S, \v,
@@ -2062,7 +2067,7 @@ by a ^ character after the colon. For example,

 syntax [.ch.] and [=ch=] where "ch" is a "collating element", but these are not
 supported, and an error is given if they are encountered.

 
-
By default, in UTF modes, characters with values greater than 128 do not match
+
By default, in UTF modes, characters with values greater than 255 do not match
 any of the POSIX character classes. However, if the PCRE_UCP option is passed
 to pcre_compile(), some of the classes are changed so that Unicode
 character properties are used. This is achieved by replacing the POSIX classes
@@ -2081,7 +2086,7 @@ by other sequences, as follows:

 
 
Negated versions, such as [:^alpha:] use \P instead of \p. The other POSIX
 classes are unchanged, and match only characters with code points less than
-128.

+256.

 
 

 
-- 
cgit v1.2.3


From f342f277ff0573d06be083d50e6e5fa2d57263a9 Mon Sep 17 00:00:00 2001
From: Wasif Malik 
Date: Sat, 21 Feb 2015 22:22:33 +0100
Subject: Fix proc_lib doc

---
 lib/stdlib/doc/src/proc_lib.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml
index 5bf5744622..b0bad9d27b 100644
--- a/lib/stdlib/doc/src/proc_lib.xml
+++ b/lib/stdlib/doc/src/proc_lib.xml
@@ -173,7 +173,7 @@
       
       Used by a process when it has started.
       
-        
This function must used by a process that has been started by
+        
This function must be used by a process that has been started by
           a start[_link]/3,4,5
           function. It tells Parent that the process has
           initialized itself, has started, or has failed to initialize
-- 
cgit v1.2.3


From 8e7441c27485bd416abdb0253c9c92620d671065 Mon Sep 17 00:00:00 2001
From: Richard Carlsson 
Date: Tue, 6 May 2014 10:34:07 +0200
Subject: Make the scanned form of the io_lib format strings available for
 processing

This adds three new functions to io_lib - scan_format/2, unscan_format/1,
and build_text/1 - which expose the parsed form of the format control
sequences to make it possible to easily modify or filter the input to
io_lib:format/2. This can e.g. be used in order to replace unbounded-size
control sequences like ~w or ~p with corresponding depth-limited ~W and ~P
before doing the actual formatting.
---
 lib/stdlib/doc/src/io.xml     |  3 +-
 lib/stdlib/doc/src/io_lib.xml | 70 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml
index a28180b42a..8ebfdb2e7f 100644
--- a/lib/stdlib/doc/src/io.xml
+++ b/lib/stdlib/doc/src/io.xml
@@ -505,7 +505,8 @@ ok
             
Writes the data with standard syntax in the same way as
               ~w, but breaks terms whose printed representation
               is longer than one line into many lines and indents each
-              line sensibly. It also tries to detect lists of
+              line sensibly. Left justification is not supported.
+              It also tries to detect lists of
               printable characters and to output these as strings. The
               Unicode translation modifier is used for determining
               what characters are printable. For example:

diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index 3312b08064..2117d66381 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -4,7 +4,7 @@
 
   

     
-      19962013
+      19962014
       Ericsson AB. All Rights Reserved.
     
     
@@ -59,6 +59,35 @@
     
       
     
+    
+      
+      
Description:

+      
+        
control_char is the type of control
+          sequence: $P, $w, and so on;

+        
+        
args is a list of the arguments used by the
+          control sequence, or an empty list if the control sequence
+          does not take any arguments;

+        
+        
width is the field width;

+        
+        
adjust is the adjustment;

+        
+        
precision is the precision of the printed
+          argument;

+        
+        
pad_char is the padding character;

+        
+        
encoding is set to true if the translation
+          modifier t is present;

+        
+        
strings is set to false if the modifier
+          l is present.

+        
+      
+      
+    
   
   
     
@@ -259,6 +288,45 @@
           constant in the ISO-latin-1 character set.

       
     
+    
+      
+      Parse all control sequences in the format string
+      
+        
Returns a list corresponding to the given format string,
+          where control sequences have been replaced with
+          corresponding tuples. This list can be passed to io_lib:build_text/1 to have
+          the same effect as io_lib:format(Format, Args), or to
+          io_lib:unscan_format/1
+          in order to get the corresponding pair of Format and
+          Args (with every * and corresponding argument
+          expanded to numeric values).

+        
A typical use of this function is to replace unbounded-size
+          control sequences like ~w and ~p with the
+          depth-limited variants ~W and ~P before
+          formatting to text, e.g. in a logger.

+      
+    
+    
+      
+      Revert a pre-parsed format list to a plain character list
+                and a list of arguments
+      
+        
See io_lib:scan_format/2 for
+          details.

+      
+    
+    
+      
+      Build the output text for a pre-parsed format list
+      
+        
See io_lib:scan_format/2 for
+          details.

+      
+    
     
       
       Indentation after printing string
-- 
cgit v1.2.3


From 0e464f7be1ae9b54d0fba748ab2dc7bd435ac118 Mon Sep 17 00:00:00 2001
From: Anthony Ramine 
Date: Fri, 9 May 2014 16:01:49 +0200
Subject: Create new BIF ets:update_counter/4

Conflicts:
	erts/emulator/beam/bif.tab
	lib/stdlib/src/ets.erl
---
 lib/stdlib/doc/src/ets.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml
index 902a921fbf..6b9524ef63 100644
--- a/lib/stdlib/doc/src/ets.xml
+++ b/lib/stdlib/doc/src/ets.xml
@@ -1618,14 +1618,18 @@ true
+ + + + Update a counter object in an ETS table.

This function provides an efficient way to update one or more @@ -1667,12 +1671,22 @@ true lookup/2 and new/2 for details on the difference).

+

If a default object Default is given, it is used + as the object to be updated if the key is missing from the table. The + value in place of the key is ignored and replaced by the proper key + value. The return value is as if the default object had not been used, + that is a single updated element or a list of them.

The function will fail with reason badarg if:

the table is not of type set or ordered_set, - no object with the right key exists, + no object with the right key exists and no default object were + supplied, the object has the wrong arity, + the default object arity is smaller than + ]]> + any field from the default object being updated is not an + integer the element to update is not an integer, the element to update is also the key, or, any of Pos, Incr, Threshold or -- cgit v1.2.3 From 0b16647dabe7f51d2aade34a9cada4ec83ace56d Mon Sep 17 00:00:00 2001 From: Zandra Hird Date: Thu, 12 Mar 2015 17:17:11 +0100 Subject: add handle data type in zip.xml to fix broken link --- lib/stdlib/doc/src/zip.xml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 48b376743d..f2fea44b9b 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -135,6 +135,12 @@

These options are described in create/3.

 + + + +

As returned by zip_open/2.

+ + -- cgit v1.2.3 From fbaa0becc787e73fa539e0d497b0d74be27c9534 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Wed, 17 Dec 2014 22:18:27 +0100 Subject: Replace usage of erlang:now() with usage of new API --- lib/stdlib/doc/src/calendar.xml | 6 ++++-- lib/stdlib/doc/src/file_sorter.xml | 6 +++--- lib/stdlib/doc/src/random.xml | 9 ++++----- lib/stdlib/doc/src/timer.xml | 10 ++++++---- 4 files changed, 17 insertions(+), 14 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index e32a639b81..d8193a9ec2 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -270,7 +270,8 @@ Convert now to local date and time

This function returns local date and time converted from - the return value from erlang:now().

+ the return value from + erlang:timestamp/0.

 @@ -279,7 +280,8 @@ Convert now to date and time

This function returns Universal Coordinated Time (UTC) - converted from the return value from erlang:now().

+ converted from the return value from + erlang:timestamp/0.

 diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index 16572df3c5..c069333c29 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -105,9 +105,9 @@ file:get_cwd() is used instead. The names of temporary files are derived from the Erlang nodename (node()), the process identifier of the current Erlang - emulator (os:getpid()), and a timestamp - (erlang:now()); a typical name would be - fs_mynode@myhost_1763_1043_337000_266005.17, where + emulator (os:getpid()), and a unique integer + (erlang:unique_integer([positive])); a typical name would be + fs_mynode@myhost_1763_4711.17, where 17 is a sequence number. Existing files will be overwritten. Temporary files are deleted unless some uncaught EXIT signal occurs. diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index e001058e19..2cc621ffc3 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -70,12 +70,11 @@

Seeds random number generation with integer values in the process dictionary, and returns the old state.

-

One way of obtaining a seed is to use the BIF now/0:

+

One easy way of obtaining a unique value to seed with is to:

- ... - {A1,A2,A3} = now(), - random:seed(A1, A2, A3), - ... + random:seed(erlang:phash2([node()]), + erlang:monotonic_time(), + erlang:unique_integer()) diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index eca9a72d36..791a29689e 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -217,12 +217,14 @@ - Calculate time difference between now/0timestamps + Calculate time difference between timestamps In microseconds

Calculates the time difference Tdiff = T2 - T1 in - microseconds, where T1 and T2 probably - are timestamp tuples returned from erlang:now/0.

+ microseconds, where T1 and T2 + are timestamp tuples on the same format as returned from + erlang:timestamp/0, + or os:timestamp/0.

 @@ -234,7 +236,7 @@ - Converts Minutesto Milliseconds. + Converts Minutes to Milliseconds.

Return the number of milliseconds in Minutes.

 -- cgit v1.2.3 From 62870c998955e1498e71bfc90607885e96ecaa27 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 31 Mar 2015 12:24:04 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 8582bfc9f9..301a5ee2e8 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -30,6 +30,41 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.4 + +
Fixed Bugs and Malfunctions + + +

+ Behaviour of character types \d, \w and \s has always + been to not match characters with value above 255, not + 128, i.e. they are limited to ISO-Latin-1 and not ASCII

+

+ Own Id: OTP-12521

+ + +
+ + +
Improvements and New Features + + +

+ c:m/1 now displays the module's MD5 sum.

+

+ Own Id: OTP-12500

+ + +

+ Make ets:i/1 handle binary input from IO server.

+

+ Own Id: OTP-12550

+ + +
+ +
+
STDLIB 2.3
Fixed Bugs and Malfunctions -- cgit v1.2.3 From ddb8dd58b6e08cdc375621c33d3712eee506100d Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Fri, 10 Apr 2015 11:59:44 +0200 Subject: stdlib: Correct orddict(3) fold() and map() handle elements in a well-defined order. Thanks to Rabbe Fogelholm for pointing out the bug. --- lib/stdlib/doc/src/orddict.xml | 8 +++----- lib/stdlib/doc/src/sets.xml | 22 ++++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index 6d1702bc59..ec1e43f29c 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -4,7 +4,7 @@
- 20002013 + 20002015 Ericsson AB. All Rights Reserved. @@ -125,8 +125,7 @@ Orddict together with an extra argument Acc (short for accumulator). Fun must return a new accumulator which is passed to the next call. Acc0 is - returned if the list is empty. The evaluation order is - undefined.

+ returned if the list is empty.

@@ -150,8 +149,7 @@ Map a function over a dictionary

map calls Fun on successive keys and values - of Orddict1 to return a new value for each key. - The evaluation order is undefined.

+ of Orddict1 to return a new value for each key.

 diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index c5b8dce4b7..4a31648f8f 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -4,7 +4,7 @@
- 20002014 + 20002015 Ericsson AB. All Rights Reserved. @@ -65,7 +65,7 @@ - Test for an Set + Test for a Set

Returns true if Set is a set of elements, otherwise false.

@@ -80,21 +80,22 @@ - Convert an Setinto a list + Convert a Setinto a list -

Returns the elements of Set as a list.

+

Returns the elements of Set as a list. + The order of the returned elements is undefined.

 - Convert a list into an Set + Convert a list into a Set -

Returns an set of the elements in List.

+

Returns a set of the elements in List.

 - Test for membership of an Set + Test for membership of a Set

Returns true if Element is an element of Set, otherwise false.

@@ -102,7 +103,7 @@ - Add an element to an Set + Add an element to a Set

Returns a new set formed from Set1 with Element inserted.

@@ -110,7 +111,7 @@ - Remove an element from an Set + Remove an element from a Set

Returns Set1, but with Element removed.

 @@ -175,7 +176,8 @@ Fold over set elements

Fold Function over every element in Set - returning the final value of the accumulator.

+ returning the final value of the accumulator. + The evaluation order is undefined.

 -- cgit v1.2.3 From f72c827d8d89295da99cd767a12c8610a45147bc Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Tue, 14 Apr 2015 16:20:53 -0400 Subject: Fix grammar in docs for multi_call/* --- lib/stdlib/doc/src/gen_server.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 62c0394479..223f9d245e 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -284,7 +284,7 @@ gen_server:abcast -----> Module:handle_cast/2 which may be infinity.

This problem does not exist if all nodes are Erlang nodes.

-

To avoid that late answers (after the timeout) pollutes +

To prevent late answers (after the timeout) from polluting the caller's message queue, a middleman process is used to do the actual calls. Late answers will then be discarded when they arrive to a terminated process.

-- cgit v1.2.3 From 5a19f97ebb036f7e9f6e2c735d9f52662b20a6a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Fri, 10 Apr 2015 12:18:59 +0200 Subject: Document the new {badmap,Term} and {badkey,Key} exceptions --- lib/stdlib/doc/src/maps.xml | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index f766c843be..59c26d9896 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -40,6 +40,9 @@ Returns a tuple {ok, Value} where Value is the value associated with Key, or error if no value is associated with Key in Map.

+

+ The call will fail with a {badmap,Map} exception if Map is not a map. +

Example:

> Map = #{"hi" => 42}, @@ -95,8 +98,10 @@

Returns the value Value associated with Key if Map contains Key. - If no value is associated with Key then the call will - fail with an exception. +

+

+ The call will fail with a {badmap,Map} exception if Map is not a map, + or with a {badkey,Key} exception if no value is associated with Key.

Example:

@@ -116,6 +121,10 @@ Map contains Key. If no value is associated with Key then returns Default.

+

+ The call will fail with a {badmap,Map} exception if Map is not a map. + +

Example:

> Map = #{ key1 => val1, key2 => val2 }. @@ -134,7 +143,9 @@ val1

Returns true if map Map contains Key and returns false if it does not contain the Key. - The function will fail with an exception if Map is not a Map. +

+

+ The call will fail with a {badmap,Map} exception if Map is not a map.

Example:

@@ -154,6 +165,9 @@ false

Returns a complete list of keys, in arbitrary order, which resides within Map.

+

+ The call will fail with a {badmap,Map} exception if Map is not a map. +

Example:

> Map = #{42 => value_three,1337 => "value two","a" => 1}, @@ -189,6 +203,10 @@ false Merges two maps into a single map Map3. If two keys exists in both maps the value in Map1 will be superseded by the value in Map2.

+

+ The call will fail with a {badmap,Map} exception if Map1 or + Map2 is not a map. +

Example:

> Map1 = #{a => "value_one", b => "value_two"}, @@ -222,6 +240,10 @@ false replaced by value Value. The function returns a new map Map2 containing the new association and the old associations in Map1.

+

+ The call will fail with a {badmap,Map} exception if Map1 is not a map. +

+

Example:

> Map = #{"a" => 1}. @@ -241,6 +263,9 @@ false The function removes the Key, if it exists, and its associated value from Map1 and returns a new map Map2 without key Key.

+

+ The call will fail with a {badmap,Map} exception if Map1 is not a map. +

Example:

> Map = #{"a" => 1}. @@ -276,6 +301,9 @@ false The fuction returns a list of pairs representing the key-value associations of Map, where the pairs, [{K1,V1}, ..., {Kn,Vn}], are returned in arbitrary order.

+

+ The call will fail with a {badmap,Map} exception if Map is not a map. +

Example:

> Map = #{42 => value_three,1337 => "value two","a" => 1}, @@ -291,8 +319,11 @@ false

If Key exists in Map1 the old associated value is replaced by value Value. The function returns a new map Map2 containing - the new associated value. If Key does not exist in Map1 an exception is - generated. + the new associated value. +

+

+ The call will fail with a {badmap,Map} exception if Map1 is not a map, + or with a {badkey,Key} exception if no value is associated with Key.

Example:

@@ -310,6 +341,9 @@ false

Returns a complete list of values, in arbitrary order, contained in map M.

+

+ The call will fail with a {badmap,Map} exception if Map is not a map. +

Example:

> Map = #{42 => value_three,1337 => "value two","a" => 1}, -- cgit v1.2.3 From 3c2be863bde4965a1ac61092b1348b96397940cb Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 9 Mar 2015 16:25:00 +0100 Subject: stdlib: Add module erl_anno Introduce erl_anno, an abstraction of the second element of tokens and tuples in the abstract format. The convention that negative line numbers can be used for silencing compiler warnings will no longer work in OTP 19; instead the annotation 'generated' is to be used. --- lib/stdlib/doc/src/Makefile | 3 +- lib/stdlib/doc/src/erl_anno.xml | 308 +++++++++++++++++++++++++++++++++++++++ lib/stdlib/doc/src/erl_parse.xml | 98 ++++++++++++- lib/stdlib/doc/src/ref_man.xml | 3 +- lib/stdlib/doc/src/specs.xml | 1 + 5 files changed, 408 insertions(+), 5 deletions(-) create mode 100644 lib/stdlib/doc/src/erl_anno.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index f5d8b2072a..ce1e19a2a4 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2012. All Rights Reserved. +# Copyright Ericsson AB 1997-2015. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -48,6 +48,7 @@ XML_REF3_FILES = \ digraph.xml \ digraph_utils.xml \ epp.xml \ + erl_anno.xml \ erl_eval.xml \ erl_expand_records.xml \ erl_id_trans.xml \ diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml new file mode 100644 index 0000000000..281feacdc4 --- /dev/null +++ b/lib/stdlib/doc/src/erl_anno.xml @@ -0,0 +1,308 @@ + + + + +
+ + 2015 + 2015 + Ericsson AB, All Rights Reserved + + + The contents of this file are subject to the Erlang Public License, + Version 1.1, (the "License"); you may not use this file except in + compliance with the License. You should have received a copy of the + Erlang Public License along with this software. If not, it can be + retrieved on line at http://www.erlang.org/. + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + + The Initial Developer of the Original Code is Ericsson AB. + + + erl_anno + Hans Bolinder + Kenneth Lundin + 1 + + + 2015-02-26 + A + erl_anno.xml +
+ erl_anno + + + Abstract Datatype for the Annotations of the Erlang Compiler + + + +

This module implements an abstract type that is used by the + Erlang Compiler and its helper modules for holding data such as + column, line number, and text. The data type is a collection of + annotations as + described in the following.

+

The Erlang Token Scanner returns tokens with a subset of + the following annotations, depending on the options:

+ + column +

The column where the token begins.

 + location +

The line and column where the token begins, or + just the line if the column unknown.

+ + text +

The token's text.

 + +

From the above the following annotation is derived:

+ + line +

The line where the token begins.

 + +

Furthermore, the following annotations are supported by + this module, and used by various modules:

+ + file +

A filename.

 + generated +

A Boolean indicating if the abstract code is + compiler generated. The Erlang Compiler does not emit warnings + for such code.

+ + record +

A Boolean indicating if the origin of the abstract + code is a record. Used by Dialyzer to assign types to tuple + elements.

+ + +

The functions + column(), + end_location(), + line(), + location(), and + text() + in the erl_scan module can be used for inspecting + annotations in tokens.

+

The functions + map_anno(), + fold_anno(), + mapfold_anno(), + new_anno(), + + anno_from_term(), and + + anno_to_term() in the erl_parse module can be + used for manipulating annotations in abstract code. +

+ + + + + anno() +

A collection of annotations.

+ + + + + +

The term representing a collection of annotations. It is + either a location() or a list of key-value pairs.

+ + + + + + + + +

To be changed to a non-negative integer in Erlang/OTP 19.0.

+ + + + + + + + + + + + + + + Return the column + +

Returns the column of the annotations Anno. +

+ + + + + + Return the end location of the text + +

Returns the end location of the text of the + annotations Anno. If there is no text, + undefined is returned. +

+ + + + + + Return the filename + +

Returns the filename of the annotations Anno. + If there is no filename, undefined is returned. +

+ + + + + Return annotations given a term + +

Returns annotations with the representation Term. +

+ +

See also to_term(). +

+ + + + + + Return the generated Boolean + +

Returns true if the annotations Anno + has been marked as generated. The default is to return + false. +

+ + + + + Test for a collection of annotations + +

Returns true if Term is a collection of + annotations, false otherwise.

+ + + + + + Return the line + +

Returns the line of the annotations Anno. +

+ + + + + + Return the location + +

Returns the location of the annotations Anno. +

+ + + + + + Create a new collection of annotations + +

Creates a new collection of annotations given a location.

+ + + + + + Modify the filename + +

Modifies the filename of the annotations Anno. +

+ + + + + + Modify the generated marker + +

Modifies the generated marker of the annotations + Anno. +

+ + + + + + Modify the line + +

Modifies the line of the annotations Anno. +

+ + + + + + Modify the location + +

Modifies the location of the annotations Anno. +

+ + + + + + Modify the record marker + +

Modifies the record marker of the annotations Anno. +

+ + + + + + Modify the text + +

Modifies the text of the annotations Anno. +

+ + + + + + Return the text + +

Returns the text of the annotations Anno. + If there is no text, undefined is returned. +

+ + + + + Return the term representing a collection of + annotations + +

Returns the term representing the annotations Anno. +

+

See also from_term(). +

+ + + +
+ See Also +

erl_scan(3), + erl_parse(3) +

+
+ diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index cf0bff48cd..b97d06e919 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -4,7 +4,7 @@
- 19962014 + 19962015 Ericsson AB. All Rights Reserved. @@ -192,6 +192,97 @@ considered a string.

+ + + + Map a function over the annotations of an abstract form + + +

Modifies the abstract form Abstr by applying + Fun on every collection of annotations of the + abstract form. The abstract form is traversed in a + depth-first, left-to-right, fashion. +

+ + + + + + Fold a function over the annotations of an abstract form + + +

Updates an accumulator by applying Fun on + every collection of annotations of the abstract form + Abstr. The first call to Fun has + AccIn as argument, and the returned accumulator + AccOut is passed to the next call, and so on. + The final value of the accumulator is returned. The abstract + form is traversed in a depth-first, left-to-right, fashion. +

+ + + + + + Map and fold a function over the annotations of an abstract form + + +

Modifies the abstract form Abstr by applying + Fun on every collection of annotations of the + abstract form, while at the same time updating an + accumulator. The first call to Fun has + AccIn as second argument, and the returned + accumulator AccOut is passed to the next call, + and so on. The modified abstract form as well as the the + final value of the accumulator is returned. The abstract + form is traversed in a depth-first, left-to-right, fashion. +

+ + + + + + Create new annotations + + +

Creates an abstract form from a term which has the same + structure as an abstract form, but locations where the + abstract form has annotations. For each location, erl_anno:new/1 is + called, and the annotations replace the location. +

+ + + + + + Return annotations as terms + + +

Assumes that Term is a term with the same + structure as an abstract form, but with terms, T say, on + those places where an abstract form has annotations. Returns + an abstract form where every term T has been replaced by the + value returned by calling erl_anno:from_term(T). The + term Term is traversed in a depth-first, + left-to-right, fashion. +

+ + + + + + Return the representation of annotations + + +

Returns a term where every collection of annotations Anno of + Abstr has been replaced by the term returned by + calling erl_anno:to_term(Anno). The abstract form is + traversed in a depth-first, left-to-right, fashion. +

+ +
@@ -211,8 +302,9 @@
See Also

io(3), - erl_scan(3), - ERTS User's Guide

+ erl_anno(3), + erl_scan(3), + ERTS User's Guide

diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index ea4009dc3e..94c1fb55c2 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -4,7 +4,7 @@
- 19962013 + 19962015 Ericsson AB. All Rights Reserved. @@ -45,6 +45,7 @@ + diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index fd77b52da6..6ae0154800 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -11,6 +11,7 @@ + -- cgit v1.2.3 From 87a0af476ef82ca2f33d0e15ce324afcfafe3aad Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 9 Mar 2015 16:26:09 +0100 Subject: stdlib: Use module erl_anno --- lib/stdlib/doc/src/erl_scan.xml | 79 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 74 insertions(+), 5 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index 855c8fc195..8f9c1db25b 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -4,7 +4,7 @@
- 19962013 + 19962015 Ericsson AB. All Rights Reserved. @@ -120,7 +120,7 @@ string(String, StartLocation, []).

StartLocation indicates the initial location - when scanning starts. If StartLocation is a line + when scanning starts. If StartLocation is a line, attributes() as well as EndLocation and ErrorLocation will be lines. If StartLocation is a pair of a line and a column @@ -132,8 +132,12 @@ line where the token begins, as well as the text of the token (if the text option is given), all of which can be accessed by calling token_info/1,2 or attributes_info/1,2.

+ marker="#token_info/1">token_info/1,2, attributes_info/1,2, + column/1, + line/1, + location/1, and + text/1.

A token is a tuple containing information about syntactic category, the token attributes, and the actual terminal symbol. For punctuation characters (e.g. ;, @@ -236,6 +240,70 @@ reserved word, otherwise false.

+ + + Return the category + +

Returns the category of Token. +

+ + + + + Return the symbol + +

Returns the symbol of Token. +

+ + + + + Return the column + +

Returns the column of Token's + collection of annotations. +

+ + + + + Return the end location of the text + +

Returns the end location of the text of + Token's collection of annotations. If + there is no text, + undefined is returned. +

+ + + + + Return the line + +

Returns the line of Token's collection + of annotations. +

+ + + + + Return the location + +

Returns the location of Token's + collection of annotations. +

+ + + + + Return the text + +

Returns the text of Token's collection + of annotations. If there is no text, undefined is + returned. +

+ + Return information about a token @@ -417,6 +485,7 @@ Module:format_error(ErrorDescriptor)
See Also

io(3), - erl_parse(3)

+ erl_anno(3), + erl_parse(3)

-- cgit v1.2.3 From 401bf07f5908137cde206f2f755af83c9a7ff71e Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Tue, 28 Apr 2015 14:37:33 +0200 Subject: stdlib: Document and add normal distributed random value function It is needed in various tests. It uses the Ziggurat algorithm, which is the fastest that I know. --- lib/stdlib/doc/src/Makefile | 1 + lib/stdlib/doc/src/rand.xml | 246 +++++++++++++++++++++++++++++++++++++++++ lib/stdlib/doc/src/random.xml | 3 + lib/stdlib/doc/src/ref_man.xml | 1 + lib/stdlib/doc/src/specs.xml | 1 + 5 files changed, 252 insertions(+) create mode 100644 lib/stdlib/doc/src/rand.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index f5d8b2072a..031e60f64e 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -81,6 +81,7 @@ XML_REF3_FILES = \ proplists.xml \ qlc.xml \ queue.xml \ + rand.xml \ random.xml \ re.xml \ sets.xml \ diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml new file mode 100644 index 0000000000..178afda5a0 --- /dev/null +++ b/lib/stdlib/doc/src/rand.xml @@ -0,0 +1,246 @@ + + + + +
+ + 2015 + Ericsson AB. All Rights Reserved. + + + The contents of this file are subject to the Erlang Public License, + Version 1.1, (the "License"); you may not use this file except in + compliance with the License. You should have received a copy of the + Erlang Public License along with this software. If not, it can be + retrieved online at http://www.erlang.org/. + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + + + + rand + + + 1 + + + + A + rand.xml +
+ rand + Pseudo random number generation + +

Random number generator.

+ +

The module contains several different algorithms and can be + extended with more in the future. The current uniform + distribution algorithms uses the + + scrambled Xorshift algorithms by Sebastiano Vigna and the + normal distribution algorithm uses the + + Ziggurat Method by Marsaglia and Tsang. +

+ +

The implemented algorithms are:

+ + exsplus Xorshift116+, 58 bits precision and period of 2^116-1. + exs64 Xorshift64*, 64 bits precision and a period of 2^64-1. + exs1024 Xorshift1024*, 64 bits precision and a period of 2^1024-1. + + +

The current default algorithm is exsplus. The default + may change in future. If a specific algorithm is required make + sure to always use seed/1 + to initialize the state. +

+ +

Every time a random number is requested, a state is used to + calculate it and a new state produced. The state can either be + implicit or it can be an explicit argument and return value. +

+ +

The functions with implicit state use the process dictionary + variable rand_seed to remember the current state.

+ +

If a process calls uniform/0 or + uniform/1 without + setting a seed first, seed/1 + is called automatically with the default algorithm and creates a + non-constant seed.

+ +

The functions with explicit state never use the process + dictionary.

+ +

Examples:

+ 
+      %% Simple usage. Creates and seeds the default algorithm
+      %% with a non-constant seed if not already done.
+      R0 = rand:uniform(),
+      R1 = rand:uniform(),
+
+      %% Use a given algorithm.
+      _ = rand:seed(exs1024),
+      R2 = rand:uniform(),
+
+      %% Use a given algorithm with a constant seed.
+      _ = rand:seed(exs1024, {123, 123534, 345345}),
+      R3 = rand:uniform(),
+
+      %% Use the functional api with non-constant seed.
+      S0 = rand:seed_s(exsplus),
+      {R4, S1} = rand:uniform_s(S0),
+
+      %% Create a standard normal deviate.
+      {SND0, S2} = rand:normal_s(S1),
+
+ +

This random number generator is not cryptographically + strong. If a strong cryptographic random number generator is + needed, use one of functions in the + crypto + module, for example crypto:rand_bytes/1.

 + + + + + + + + +

Algorithm dependent state.

 + + + + +

Algorithm dependent state which can be printed or saved to file.

 + + + + + + + Seed random number generator + + +

Seeds random number generation with the given algorithm and time dependent + data if AlgOrExpState is an algorithm.

+

Otherwise recreates the exported seed in the process + dictionary, and returns the state. + See also: export_seed/0.

+ + + + + Seed random number generator + +

Seeds random number generation with the given algorithm and time dependent + data if AlgOrExpState is an algorithm.

+

Otherwise recreates the exported seed and returns the state. + See also: export_seed/0.

+ + + + + Seed the random number generation + +

Seeds random number generation with the given algorithm and + integers in the process dictionary and returns + the state.

+ + + + + Seed the random number generation + +

Seeds random number generation with the given algorithm and + integers and returns the state.

+ + + + + + Export the random number generation state + +

Returns the random number state in an external format. + To be used with seed/1.

+ + + + + + Export the random number generation state + +

Returns the random number generator state in an external format. + To be used with seed/1.

+ + + + + + Return a random float + + +

Returns a random float uniformly distributed in the value + range 0.0 < X < 1.0 and + updates the state in the process dictionary.

+ + + + + Return a random float + +

Given a state, uniform_s/1 returns a random float + uniformly distributed in the value range 0.0 < + X < 1.0 and a new state.

+ + + + + + Return a random integer + + +

Given an integer N >= 1, + uniform/1 returns a random integer uniformly + distributed in the value range + 1 <= X <= N and + updates the state in the process dictionary.

+ + + + + Return a random integer + +

Given an integer N >= 1 and a state, + uniform_s/2 returns a random integer uniformly + distributed in the value range 1 <= X <= + N and a new state.

+ + + + + + Return a standard normal distributed random float + +

Returns a standard normal deviate float (that is, the mean + is 0 and the standard deviation is 1) and updates the state in + the process dictionary.

+ + + + + Return a standard normal distributed random float + +

Given a state, normal_s/1 returns a standard normal + deviate float (that is, the mean is 0 and the standard + deviation is 1) and a new state.

+ + + + + diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index 2cc621ffc3..e475cda23d 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -48,6 +48,9 @@

It should be noted that this random number generator is not cryptographically strong. If a strong cryptographic random number generator is needed for example crypto:rand_bytes/1 could be used instead.

+

The new and improved rand module should be used + instead of this module.

 diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index ea4009dc3e..459fc8c8ed 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -78,6 +78,7 @@ + diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index fd77b52da6..f12e00b263 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -44,6 +44,7 @@ + -- cgit v1.2.3 From 9b2988b5409dbd629ce57bf89fa1c3bad69b2a42 Mon Sep 17 00:00:00 2001 From: Andras Horvath Date: Tue, 7 Apr 2015 13:23:10 +0100 Subject: Delete superfluous comma from `filtermap' example The code explaining the behaviour of `filtermap/2` had a syntax error and wouldn't compile --- lib/stdlib/doc/src/lists.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index ee3c51c62c..dcc08d008b 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -176,7 +176,7 @@ filtermap(Fun, List1) -> false -> Acc; true -> [Elem|Acc]; {true,Value} -> [Value|Acc] - end, + end end, [], List1).

Example:

-- 
cgit v1.2.3


From 5c192ac2faf510c24a4f9c9936dd580d5d304183 Mon Sep 17 00:00:00 2001
From: Bruce Yinhe 
Date: Fri, 20 Mar 2015 15:25:00 +0100
Subject: Fixed a typo in Maps doc

---
 lib/stdlib/doc/src/maps.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index 59c26d9896..e46068230a 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -339,7 +339,7 @@ false
 			
 			
 				

-					Returns a complete list of values, in arbitrary order, contained in map M.
+					Returns a complete list of values, in arbitrary order, contained in map Map.
 				

 				

 					The call will fail with a {badmap,Map} exception if Map is not a map.
-- 
cgit v1.2.3


From 6e24ffab6c682383a1c284fc066e59c680c4c62e Mon Sep 17 00:00:00 2001
From: Richard Carlsson 
Date: Mon, 20 Apr 2015 09:51:49 +0200
Subject: Add uptime() shell command

---
 lib/stdlib/doc/src/c.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml
index b49fa6ad67..b43d4786ae 100644
--- a/lib/stdlib/doc/src/c.xml
+++ b/lib/stdlib/doc/src/c.xml
@@ -231,6 +231,14 @@ compile:file(File, Options ++ [report_errors, report_w
           in the network.

       
     
+    
+      
+      Print node uptime
+      
+        
Prints the node uptime (as given by
+           erlang:statistics(wall_clock)), in human-readable form.

+      
+    
     
       xm(ModSpec) -> void()
       Cross reference check a module
-- 
cgit v1.2.3


From e09dd66dc4d89c62ddfd8c19791f9678d5d787c6 Mon Sep 17 00:00:00 2001
From: Erlang/OTP 
Date: Tue, 12 May 2015 18:18:55 +0200
Subject: Prepare release

---
 lib/stdlib/doc/src/notes.xml | 218 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 218 insertions(+)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 301a5ee2e8..3914a9bc0e 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -30,6 +30,224 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.5 + +
Fixed Bugs and Malfunctions + + +

+ Fix handling of single dot in filename:join/2

+

+ The reference manual says that filename:join(A,B) is + equivalent to filename:join([A,B]). In some rare cases + this turns out not to be true. For example:

+

+ filename:join("/a/.","b") -> "/a/./b" vs + filename:join(["/a/.","b"]) -> "/a/b".

+

+ This has been corrected. A single dot is now only kept if + it occurs at the very beginning or the very end of the + resulting path.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12158

+ + +

+ The undocumented option generic_debug for + gen_server has been removed.

+

+ Own Id: OTP-12183

+ + +

+ erl_lint:icrt_export/4 has been rewritten to make the + code really follow the scoping rules of Erlang, and not + just in most situations by accident.

+

+ Own Id: OTP-12186

+ + +

+ Add 'trim_all' option to binary:split/3

+

+ This option can be set to remove _ALL_ empty parts of the + result of a call to binary:split/3.

+

+ Own Id: OTP-12301

+ + +

Correct orddict(3) regarding evaluation order of + fold() and map().

+

+ Own Id: OTP-12651 Aux Id: seq12832

+ + +

+ Correct maps module error exceptions

+

+ Bad input to maps module function will now yield the + following exceptions: {badmap,NotMap} + or, badarg

+

+ Own Id: OTP-12657

+ + +

+ It is now possible to paste text in JCL mode (using + Ctrl-Y) that has been copied in the previous shell + session. Also a bug that caused the JCL mode to crash + when pasting text has been fixed.

+

+ Own Id: OTP-12673

+ + +
+ + +
Improvements and New Features + + +

+ Allow maps for supervisor flags and child specs

+

+ Earlier, supervisor flags and child specs were given as + tuples. While this is kept for backwards compatibility, + it is now also allowed to give these parameters as maps, + see sup_flags + and child_spec.

+

+ Own Id: OTP-11043

+ + +

+ A new system message, terminate, is added. This + can be sent with sys:terminate/2,3. If the + receiving process handles system messages properly it + will terminate shortly after receiving this message.

+

+ The new function proc_lib:stop/1,3 utilizes this + new system message and monitors the receiving process in + order to facilitate a synchronous stop mechanism for + 'special processes'.

+

+ proc_lib:stop/1,3 is used by the following + functions:

+

+ gen_server:stop/1,3 (new) + gen_fsm:stop/1,3 (new) + gen_event:stop/1,3 (modified to be + synchronous) wx_object:stop/1,3 + (new)

+

+ Own Id: OTP-11173 Aux Id: seq12353

+ + +

+ Remove the pg module, which has been deprecated + through OTP-17, is now removed from the STDLIB + application. This module has been marked experimental for + more than 15 years, and has largely been superseded by + the pg2 module from the Kernel application.

+

+ Own Id: OTP-11907

+ + +

+ New BIF: erlang:get_keys/0, lists all keys + associated with the process dictionary. Note: + erlang:get_keys/0 is auto-imported.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12151 Aux Id: seq12521

+ + +

Add three new functions to io_lib-- + scan_format/2, unscan_format/1, and + build_text/1-- which expose the parsed form of the + format control sequences to make it possible to easily + modify or filter the input to io_lib:format/2. + This can e.g. be used in order to replace unbounded-size + control sequences like ~w or ~p with + corresponding depth-limited ~W and ~P + before doing the actual formatting.

+

+ Own Id: OTP-12167

+ + +

Introduce the erl_anno module, an abstraction + of the second element of tokens and tuples in the + abstract format.

+

+ Own Id: OTP-12195

+ + +

+ Support variables as Map keys in expressions and patterns

+

Erlang will accept any expression as keys in Map + expressions and it will accept literals or bound + variables as keys in Map patterns.

+

+ Own Id: OTP-12218

+ + +

The last traces of Mnemosyne Rules have been removed. +

+

+ Own Id: OTP-12257

+ + +

+ Properly support maps in match_specs

+

+ Own Id: OTP-12270

+ + +

+ New function ets:take/2. Works the same as + ets:delete/2 but also returns the deleted + object(s).

+

+ Own Id: OTP-12309

+ + +

string:tokens/2 is somewhat faster, especially + if the list of separators only contains one separator + character.

+

+ Own Id: OTP-12422 Aux Id: seq12774

+ + +

+ Prevent zip:zip_open/[12] from leaking file descriptors + if parent process dies.

+

+ Own Id: OTP-12566

+ + +

+ Add a new random number generator, see rand + module. It have better characteristics and an improved + interface.

+

+ Own Id: OTP-12586 Aux Id: OTP-12501, OTP-12502

+ + +

filename:split/1 when given an empty binary + will now return an empty list, to make it consistent with + return value when given an empty list.

+

+ Own Id: OTP-12716

+ + +
+ +
+
STDLIB 2.4
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 9a81b28598fadc44bf506354c9227e41aac786f6 Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Wed, 13 May 2015 09:40:16 +0200 Subject: Revert "Prepare release" This reverts commit e09dd66dc4d89c62ddfd8c19791f9678d5d787c6. --- lib/stdlib/doc/src/notes.xml | 218 ------------------------------------------- 1 file changed, 218 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 3914a9bc0e..301a5ee2e8 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -30,224 +30,6 @@

This document describes the changes made to the STDLIB application.

-
STDLIB 2.5 - -
Fixed Bugs and Malfunctions - - -

- Fix handling of single dot in filename:join/2

-

- The reference manual says that filename:join(A,B) is - equivalent to filename:join([A,B]). In some rare cases - this turns out not to be true. For example:

-

- filename:join("/a/.","b") -> "/a/./b" vs - filename:join(["/a/.","b"]) -> "/a/b".

-

- This has been corrected. A single dot is now only kept if - it occurs at the very beginning or the very end of the - resulting path.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-12158

- - -

- The undocumented option generic_debug for - gen_server has been removed.

-

- Own Id: OTP-12183

- - -

- erl_lint:icrt_export/4 has been rewritten to make the - code really follow the scoping rules of Erlang, and not - just in most situations by accident.

-

- Own Id: OTP-12186

- - -

- Add 'trim_all' option to binary:split/3

-

- This option can be set to remove _ALL_ empty parts of the - result of a call to binary:split/3.

-

- Own Id: OTP-12301

- - -

Correct orddict(3) regarding evaluation order of - fold() and map().

-

- Own Id: OTP-12651 Aux Id: seq12832

- - -

- Correct maps module error exceptions

-

- Bad input to maps module function will now yield the - following exceptions: {badmap,NotMap} - or, badarg

-

- Own Id: OTP-12657

- - -

- It is now possible to paste text in JCL mode (using - Ctrl-Y) that has been copied in the previous shell - session. Also a bug that caused the JCL mode to crash - when pasting text has been fixed.

-

- Own Id: OTP-12673

- - -
- - -
Improvements and New Features - - -

- Allow maps for supervisor flags and child specs

-

- Earlier, supervisor flags and child specs were given as - tuples. While this is kept for backwards compatibility, - it is now also allowed to give these parameters as maps, - see sup_flags - and child_spec.

-

- Own Id: OTP-11043

- - -

- A new system message, terminate, is added. This - can be sent with sys:terminate/2,3. If the - receiving process handles system messages properly it - will terminate shortly after receiving this message.

-

- The new function proc_lib:stop/1,3 utilizes this - new system message and monitors the receiving process in - order to facilitate a synchronous stop mechanism for - 'special processes'.

-

- proc_lib:stop/1,3 is used by the following - functions:

-

- gen_server:stop/1,3 (new) - gen_fsm:stop/1,3 (new) - gen_event:stop/1,3 (modified to be - synchronous) wx_object:stop/1,3 - (new)

-

- Own Id: OTP-11173 Aux Id: seq12353

- - -

- Remove the pg module, which has been deprecated - through OTP-17, is now removed from the STDLIB - application. This module has been marked experimental for - more than 15 years, and has largely been superseded by - the pg2 module from the Kernel application.

-

- Own Id: OTP-11907

- - -

- New BIF: erlang:get_keys/0, lists all keys - associated with the process dictionary. Note: - erlang:get_keys/0 is auto-imported.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-12151 Aux Id: seq12521

- - -

Add three new functions to io_lib-- - scan_format/2, unscan_format/1, and - build_text/1-- which expose the parsed form of the - format control sequences to make it possible to easily - modify or filter the input to io_lib:format/2. - This can e.g. be used in order to replace unbounded-size - control sequences like ~w or ~p with - corresponding depth-limited ~W and ~P - before doing the actual formatting.

-

- Own Id: OTP-12167

- - -

Introduce the erl_anno module, an abstraction - of the second element of tokens and tuples in the - abstract format.

-

- Own Id: OTP-12195

- - -

- Support variables as Map keys in expressions and patterns

-

Erlang will accept any expression as keys in Map - expressions and it will accept literals or bound - variables as keys in Map patterns.

-

- Own Id: OTP-12218

- - -

The last traces of Mnemosyne Rules have been removed. -

-

- Own Id: OTP-12257

- - -

- Properly support maps in match_specs

-

- Own Id: OTP-12270

- - -

- New function ets:take/2. Works the same as - ets:delete/2 but also returns the deleted - object(s).

-

- Own Id: OTP-12309

- - -

string:tokens/2 is somewhat faster, especially - if the list of separators only contains one separator - character.

-

- Own Id: OTP-12422 Aux Id: seq12774

- - -

- Prevent zip:zip_open/[12] from leaking file descriptors - if parent process dies.

-

- Own Id: OTP-12566

- - -

- Add a new random number generator, see rand - module. It have better characteristics and an improved - interface.

-

- Own Id: OTP-12586 Aux Id: OTP-12501, OTP-12502

- - -

filename:split/1 when given an empty binary - will now return an empty list, to make it consistent with - return value when given an empty list.

-

- Own Id: OTP-12716

- - -
- -
-
STDLIB 2.4
Fixed Bugs and Malfunctions -- cgit v1.2.3 From c6d38c93b80395ee9dbe65d6dd6751254402ea21 Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Wed, 13 May 2015 17:10:00 +0200 Subject: stdlib: Add 'sync' option to ets:tab2file/3 to improve the chance of some real disk persistence before tab2file returns. --- lib/stdlib/doc/src/ets.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 3df24bf688..256dd21b01 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -1429,7 +1429,9 @@ is_integer(X), is_integer(Y), X + Y < 4711]]>

Whenever the extended_info option is used, it results in a file not readable by versions of ets prior to that in stdlib-1.15.1

- +

The sync option, if set to true, ensures that + the content of the file is actually written to the disk before + tab2file returns. Default is {sync, false}.

-- cgit v1.2.3 From ddc4e717df1da722682b6ccdbf152a6b7e15f378 Mon Sep 17 00:00:00 2001 From: beaver Date: Wed, 25 Mar 2015 18:03:26 +0300 Subject: stdlib: Add gb_trees:iterator_from --- lib/stdlib/doc/src/gb_trees.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index b2f237e1d7..82167e1083 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -4,7 +4,7 @@
- 20012014 + 20012015 Ericsson AB. All Rights Reserved. @@ -182,6 +182,17 @@ memory at one time.

+ + + Return an iterator for a tree starting from specified key + +

Returns an iterator that can be used for traversing the + entries of Tree; see next/1. + The difference as compared to the iterator returned by + iterator/1 is that the first key greater than + or equal to Key is returned.

+ + Return a list of the keys in a tree -- cgit v1.2.3 From f584a60d0e5a6fa0a8002a13e8dda2a790031427 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 12 May 2015 14:15:40 +0200 Subject: stdlib: Add gb_sets:iterator_from --- lib/stdlib/doc/src/gb_sets.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index ea96c14472..405bae5698 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -4,7 +4,7 @@
- 20012014 + 20012015 Ericsson AB. All Rights Reserved. @@ -305,6 +305,17 @@ memory at one time.

+ + + Return an iterator for a set starting from a specified element + +

Returns an iterator that can be used for traversing the + entries of Set; see next/1. + The difference as compared to the iterator returned by + iterator/1 is that the first element greater than + or equal to Element is returned.

+ + Return largest element -- cgit v1.2.3 From fc1967b11a65690c9ea8274c7c7fda94f7a338fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Mon, 18 May 2015 10:19:24 +0200 Subject: stdlib: Document maps:filter/2 --- lib/stdlib/doc/src/maps.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index e46068230a..7345a9357a 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -32,6 +32,28 @@ + + + Choose pairs which satisfy a predicate + +

+ Returns a map Map2 for which predicate + Pred holds true in Map1. +

+

+ The call will fail with a {badmap,Map} exception if + Map1 is not a map or with badarg if + Pred is not a function of arity 2. +

+

Example:

+ +> M = #{a => 2, b => 3, c=> 4, "a" => 1, "b" => 2, "c" => 4}, + Pred = fun(K,V) -> is_atom(K) andalso (V rem 2) =:= 0 end, + maps:filter(Pred,M). +#{a => 2,c => 4} + + + -- cgit v1.2.3 From 68e5fd8efbcd23be3f9fa79658f3eb513a075f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20H=C3=A4ssler?= Date: Thu, 21 May 2015 19:57:44 +0200 Subject: stdlib: Document os:unsetenv Unicode support Document that os:unsetenv/1 handles Unicode in the same way as os:getenv and os:putenv. --- lib/stdlib/doc/src/unicode_usage.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index 29b8940c62..eb3a556e10 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -850,8 +850,9 @@ Eshell V5.10.1 (abort with ^G) expected to be in Unicode.

If Unicode file names are enabled, the calls to os:getenv/0, - os:getenv/1 and - os:putenv/2 + os:getenv/1, + os:putenv/2 and + os:unsetenv/1 will handle Unicode strings. On Unix-like platforms, the built-in functions will translate environment variables in UTF-8 to/from Unicode strings, possibly with code points > 255. On Windows the -- cgit v1.2.3 From 000c33662b8a98870a97a3499076895d4e832563 Mon Sep 17 00:00:00 2001 From: James Fish Date: Wed, 4 Mar 2015 23:10:25 +0000 Subject: Don't store child that returns ignore in simple supervisor If a child of a simple_one_for_one returns ignore from its start function no longer store the child for any restart type. It is not possible to restart or delete the child because the supervisor is a simple_one_for_one. Previously a simple_one_for_one would crash, potentially without shutting down all of its children, when it tried to shutdown a child with undefined pid. Previous only one undefined pid child was stored in a simple_one_for_one supervisor no matter how many times the child start function returned ignore. --- lib/stdlib/doc/src/supervisor.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index ffac1c0bd7..6ff477a42d 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -386,9 +386,15 @@ added to the supervisor and the function returns the same value.

If the child process start function returns ignore, - the child specification is added to the supervisor, the pid - is set to undefined, and the function returns - {ok,undefined}.

+ the child specification is added to the supervisor (unless the + supervisor is a simple_one_for_one supervisor, see below), + the pid is set to undefined and the function returns + {ok,undefined}. +

+

In the case of a simple_one_for_one supervisor, when a child + process start function returns ignore the functions returns + {ok,undefined} and no child is added to the supervisor. +

If the child process start function returns an error tuple or an erroneous value, or if it fails, the child specification is discarded, and the function returns {error,Error} where -- cgit v1.2.3 From 966e9e7ed0951db306c3c5dc4b1fd4c6eac25cf9 Mon Sep 17 00:00:00 2001 From: UENISHI Kota Date: Thu, 9 Apr 2015 18:40:01 +0900 Subject: Update orddict with parameterized types and specs With parametrized types and specs, modules using orddict can be statically checked with dialyzer. Although orddict have not been builtin types, it is good and more natural to have its exported types and specs aligned to builtin types. --- lib/stdlib/doc/src/orddict.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index ec1e43f29c..c853b402d4 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -48,8 +48,11 @@ - -

As returned by new/0.

+ +

Dictionary as returned by new/0.

 + + + -- cgit v1.2.3 From c574bd33c39d91c487c3fcd819226ecfc46c13c8 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Sat, 19 May 2012 22:07:31 +0200 Subject: Break out assert macros from eunit to stdlib assert.hrl Several people have requested that the assert macros in EUnit should be moved out to a separate header file. This patch puts them in stdlib/include/assert.hrl, which gets included by the eunit.hrl file. Thus, nothing changes for eunit users, but the asserts can now also be included separately. --- lib/stdlib/doc/src/Makefile | 2 +- lib/stdlib/doc/src/assert_hrl.xml | 160 ++++++++++++++++++++++++++++++++++++++ lib/stdlib/doc/src/ref_man.xml | 1 + 3 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 lib/stdlib/doc/src/assert_hrl.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index a4a2ed9931..d41f91250e 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -102,7 +102,7 @@ XML_REF3_FILES = \ XML_REF6_FILES = stdlib_app.xml XML_PART_FILES = part.xml part_notes.xml part_notes_history.xml -XML_CHAPTER_FILES = io_protocol.xml unicode_usage.xml notes.xml notes_history.xml +XML_CHAPTER_FILES = io_protocol.xml unicode_usage.xml notes.xml notes_history.xml assert_hrl.xml BOOK_FILES = book.xml diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml new file mode 100644 index 0000000000..d812ee16dc --- /dev/null +++ b/lib/stdlib/doc/src/assert_hrl.xml @@ -0,0 +1,160 @@ + + + + +
+ + 20122015 + Ericsson AB. All Rights Reserved. + + + The contents of this file are subject to the Erlang Public License, + Version 1.1, (the "License"); you may not use this file except in + compliance with the License. You should have received a copy of the + Erlang Public License along with this software. If not, it can be + retrieved online at http://www.erlang.org/. + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + + + + assert.hrl + + + + +
+ assert.hrl + Assert Macros + +

The include file assert.hrl provides macros for inserting + assertions in your program code.

+

These macros are defined in the Stdlib include file + assert.hrl. Include the following directive in the module + from which the function is called:

+ +-include_lib("stdlib/include/assert.hrl"). +

When an assertion succeeds, the assert macro yields the atom + ok. When an assertion fails, an exception of type error is + instead generated. The associated error term will have the form + {Macro, Info}, where Macro is the name of the macro, for + example assertEqual, and Info will be a list of tagged + values such as [{module, M}, {line, L}, ...] giving more + information about the location and cause of the exception. All entries + in the Info list are optional, and you should not rely + programatically on any of them being present.

+ +

If the macro NOASSERT is defined when the assert.hrl + include file is read by the compiler, the macros will be defined as + equivalent to the atom ok. The test will not be performed, and + there will be no cost at runtime.

+ +

For example, using erlc to compile your modules, the following + will disable all assertions:

+ +erlc -DNOASSERT=true *.erl +

(The value of NOASSERT does not matter, only the fact that it + is defined.)

+

A few other macros also have effect on the enabling or disabling of + assertions:

+ + If NODEBUG is defined, it implies NOASSERT, unless + DEBUG is also defined, which is assumed to take + precedence. + If ASSERT is defined, it overrides NOASSERT, that + is, the assertions will remain enabled. + +

If you prefer, you can thus use only DEBUG/NODEBUG as + the main flags to control the behaviour of the assertions (which is + useful if you have other compiler conditionals or debugging macros + controlled by those flags), or you can use ASSERT/NOASSERT + to control only the assert macros.

+ + + +
+
+ +
+ Macros + + assert(BoolExpr) +

Tests that BoolExpr completes normally returning + true.

+ + + assertNot(BoolExpr) +

Tests that BoolExpr completes normally returning + false.

+ + + assertMatch(GuardedPattern, Expr) +

Tests that Expr completes normally yielding a value + that matches GuardedPattern. For example: + + ?assertMatch({bork, _}, f())

+

Note that a guard when ... can be included: + + ?assertMatch({bork, X} when X > 0, f())

+ + + assertNotMatch(GuardedPattern, Expr) +

Tests that Expr completes normally yielding a value + that does not match GuardedPattern.

+

As in assertMatch, GuardedPattern can have a + when part.

+ + + assertEqual(ExpectedValue, Expr) +

Tests that Expr completes normally yielding a value + that is exactly equal to ExpectedValue.

+ + + assertNotEqual(ExpectedValue, Expr) +

Tests that Expr completes normally yielding a value + that is not exactly equal to ExpectedValue.

+ + + assertException(Class, Term, Expr) +

Tests that Expr completes abnormally with an exception + of type Class and with the associated Term. The + assertion fails if Expr raises a different exception or if it + completes normally returning any value.

+

Note that both Class and Term can be guarded + patterns, as in assertMatch.

+ + + assertNotException(Class, Term, Expr) +

Tests that Expr does not evaluate abnormally with an + exception of type Class and with the associated Term. + The assertion succeeds if Expr raises a different exception or + if it completes normally returning any value.

+

As in assertException, both Class and Term + can be guarded patterns.

+ + + assertError(Term, Expr) +

Equivalent to assertException(error, Term, + Expr)

+ + + assertExit(Term, Expr) +

Equivalent to assertException(exit, Term, Expr)

+ + + assertThrow(Term, Expr) +

Equivalent to assertException(throw, Term, Expr)

+ + + +
+ +
+ SEE ALSO +

compile(3)

+

erlc(3)

+
+ diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index eee4a68ca1..cae62612aa 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -35,6 +35,7 @@ + -- cgit v1.2.3 From dc844097e0828a32b1d53238e3527da1991ed711 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Fri, 24 Apr 2015 14:45:35 +0200 Subject: dialyzer: Modify the handling of parametrized opaque types In OTP 17 it is possible to mix types such as dict:dict() and dict:dict(_, _) outside of the dict module (and similarly for some other opaque types in STDLIB), but the results are unfortunately possibly invalid warnings in users' code. In OTP 18 parameterized opaque types with the same name but with different number of parameters are no longer compatible when seen from outside of the module where the types are declared. The types in STDLIB have been updated accordingly; for instance -opaque dict() :: dict(_, _). has been replaced by -type dict() :: dict(_, _). --- lib/stdlib/doc/src/array.xml | 3 --- lib/stdlib/doc/src/dict.xml | 3 --- lib/stdlib/doc/src/gb_sets.xml | 6 ------ lib/stdlib/doc/src/gb_trees.xml | 6 ------ lib/stdlib/doc/src/queue.xml | 3 --- lib/stdlib/doc/src/sets.xml | 3 --- 6 files changed, 24 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index b03a2fa0cc..af23cd95d9 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -93,9 +93,6 @@ the default value cannot be confused with the values of set entries.

- -

array() is equivalent to array(term()).

- diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index 0771682a25..b456b97578 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -46,9 +46,6 @@ - -

dict() is equivalent to dict(term(), term()).

- diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index 405bae5698..99e92d8680 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -120,9 +120,6 @@ - -

set() is equivalent to set(term()).

- @@ -130,9 +127,6 @@ - -

iter() is equivalent to iter(term()).

- diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index 82167e1083..99ca2d6a9a 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -64,9 +64,6 @@ - -

tree() is equivalent to tree(term(), term()).

- @@ -74,9 +71,6 @@ - -

iter() is equivalent to iter(term(), term()).

- diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index 9c994154d4..f689412988 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -95,9 +95,6 @@ - -

queue() is equivalent to queue(term()).

- diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index 4a31648f8f..eecddb7fd4 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -50,9 +50,6 @@ - -

set() is equivalent to set(term()).

- -- cgit v1.2.3 From 738c34d4bb8f1a3811acd00af8c6c12107f8315b Mon Sep 17 00:00:00 2001 From: Bruce Yinhe Date: Thu, 18 Jun 2015 11:31:02 +0200 Subject: Change license text to APLv2 --- lib/stdlib/doc/src/Makefile | 19 ++++++++++--------- lib/stdlib/doc/src/array.xml | 21 +++++++++++---------- lib/stdlib/doc/src/assert_hrl.xml | 21 +++++++++++---------- lib/stdlib/doc/src/base64.xml | 21 +++++++++++---------- lib/stdlib/doc/src/beam_lib.xml | 19 ++++++++++--------- lib/stdlib/doc/src/binary.xml | 21 +++++++++++---------- lib/stdlib/doc/src/book.xml | 21 +++++++++++---------- lib/stdlib/doc/src/c.xml | 21 +++++++++++---------- lib/stdlib/doc/src/calendar.xml | 21 +++++++++++---------- lib/stdlib/doc/src/dets.xml | 21 +++++++++++---------- lib/stdlib/doc/src/dict.xml | 21 +++++++++++---------- lib/stdlib/doc/src/digraph.xml | 21 +++++++++++---------- lib/stdlib/doc/src/digraph_utils.xml | 21 +++++++++++---------- lib/stdlib/doc/src/epp.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_anno.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_eval.xml | 21 +++++++++++---------- lib/stdlib/doc/src/erl_expand_records.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_id_trans.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_internal.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_lint.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_parse.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_pp.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_scan.xml | 19 ++++++++++--------- lib/stdlib/doc/src/erl_tar.xml | 21 +++++++++++---------- lib/stdlib/doc/src/ets.xml | 19 ++++++++++--------- lib/stdlib/doc/src/file_sorter.xml | 19 ++++++++++--------- lib/stdlib/doc/src/filelib.xml | 21 +++++++++++---------- lib/stdlib/doc/src/filename.xml | 21 +++++++++++---------- lib/stdlib/doc/src/gb_sets.xml | 19 ++++++++++--------- lib/stdlib/doc/src/gb_trees.xml | 19 ++++++++++--------- lib/stdlib/doc/src/gen_event.xml | 19 ++++++++++--------- lib/stdlib/doc/src/gen_fsm.xml | 19 ++++++++++--------- lib/stdlib/doc/src/gen_server.xml | 19 ++++++++++--------- lib/stdlib/doc/src/io.xml | 19 ++++++++++--------- lib/stdlib/doc/src/io_lib.xml | 21 +++++++++++---------- lib/stdlib/doc/src/io_protocol.xml | 21 +++++++++++---------- lib/stdlib/doc/src/lib.xml | 21 +++++++++++---------- lib/stdlib/doc/src/lists.xml | 19 ++++++++++--------- lib/stdlib/doc/src/log_mf_h.xml | 19 ++++++++++--------- lib/stdlib/doc/src/maps.xml | 19 ++++++++++--------- lib/stdlib/doc/src/math.xml | 19 ++++++++++--------- lib/stdlib/doc/src/ms_transform.xml | 19 ++++++++++--------- lib/stdlib/doc/src/notes.xml | 21 +++++++++++---------- lib/stdlib/doc/src/notes_history.xml | 21 +++++++++++---------- lib/stdlib/doc/src/orddict.xml | 21 +++++++++++---------- lib/stdlib/doc/src/ordsets.xml | 21 +++++++++++---------- lib/stdlib/doc/src/part.xml | 19 ++++++++++--------- lib/stdlib/doc/src/part_notes.xml | 21 +++++++++++---------- lib/stdlib/doc/src/part_notes_history.xml | 19 ++++++++++--------- lib/stdlib/doc/src/pool.xml | 21 +++++++++++---------- lib/stdlib/doc/src/proc_lib.xml | 21 +++++++++++---------- lib/stdlib/doc/src/proplists.xml | 19 ++++++++++--------- lib/stdlib/doc/src/qlc.xml | 21 +++++++++++---------- lib/stdlib/doc/src/queue.xml | 21 +++++++++++---------- lib/stdlib/doc/src/rand.xml | 21 +++++++++++---------- lib/stdlib/doc/src/random.xml | 21 +++++++++++---------- lib/stdlib/doc/src/re.xml | 21 +++++++++++---------- lib/stdlib/doc/src/ref_man.xml | 19 ++++++++++--------- lib/stdlib/doc/src/sets.xml | 21 +++++++++++---------- lib/stdlib/doc/src/shell.xml | 19 ++++++++++--------- lib/stdlib/doc/src/shell_default.xml | 19 ++++++++++--------- lib/stdlib/doc/src/slave.xml | 21 +++++++++++---------- lib/stdlib/doc/src/sofs.xml | 19 ++++++++++--------- lib/stdlib/doc/src/stdlib_app.xml | 19 ++++++++++--------- lib/stdlib/doc/src/string.xml | 21 +++++++++++---------- lib/stdlib/doc/src/supervisor.xml | 19 ++++++++++--------- lib/stdlib/doc/src/supervisor_bridge.xml | 19 ++++++++++--------- lib/stdlib/doc/src/sys.xml | 21 +++++++++++---------- lib/stdlib/doc/src/timer.xml | 21 +++++++++++---------- lib/stdlib/doc/src/unicode.xml | 19 ++++++++++--------- lib/stdlib/doc/src/unicode_usage.xml | 21 +++++++++++---------- lib/stdlib/doc/src/win32reg.xml | 21 +++++++++++---------- lib/stdlib/doc/src/zip.xml | 19 ++++++++++--------- 73 files changed, 767 insertions(+), 694 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index d41f91250e..196c86748f 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -3,16 +3,17 @@ # # Copyright Ericsson AB 1997-2015. All Rights Reserved. # -# The contents of this file are subject to the Erlang Public License, -# Version 1.1, (the "License"); you may not use this file except in -# compliance with the License. You should have received a copy of the -# Erlang Public License along with this software. If not, it can be -# retrieved online at http://www.erlang.org/. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at # -# Software distributed under the License is distributed on an "AS IS" -# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See -# the License for the specific language governing rights and limitations -# under the License. +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. # # %CopyrightEnd% # diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index af23cd95d9..28b4435938 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -7,16 +7,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml index d812ee16dc..b85be514d8 100644 --- a/lib/stdlib/doc/src/assert_hrl.xml +++ b/lib/stdlib/doc/src/assert_hrl.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml index c4982f4eaa..276d28e174 100644 --- a/lib/stdlib/doc/src/base64.xml +++ b/lib/stdlib/doc/src/base64.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index eb4974a79f..c556180b8b 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 6c0968d242..063f3048e0 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved on line at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/book.xml b/lib/stdlib/doc/src/book.xml index b1b67d661c..043f6cc19b 100644 --- a/lib/stdlib/doc/src/book.xml +++ b/lib/stdlib/doc/src/book.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml index b43d4786ae..a0f18bd899 100644 --- a/lib/stdlib/doc/src/c.xml +++ b/lib/stdlib/doc/src/c.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index d8193a9ec2..a8d933dc83 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 6bbedb0662..14237b6f90 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index b456b97578..e10531caac 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 9b9b48584b..49dc68e103 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index ef6f9d8611..6a4db2e963 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index 452341f7d2..fe2944bbf7 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml index 281feacdc4..be0ffe6f4d 100644 --- a/lib/stdlib/doc/src/erl_anno.xml +++ b/lib/stdlib/doc/src/erl_anno.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved on line at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml index b707dbcc02..ba988e7ca2 100644 --- a/lib/stdlib/doc/src/erl_eval.xml +++ b/lib/stdlib/doc/src/erl_eval.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml index 1b5ee5de36..497b371434 100644 --- a/lib/stdlib/doc/src/erl_expand_records.xml +++ b/lib/stdlib/doc/src/erl_expand_records.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml index 0f7042f0c6..30eb213493 100644 --- a/lib/stdlib/doc/src/erl_id_trans.xml +++ b/lib/stdlib/doc/src/erl_id_trans.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml index 54e560f8b9..e1ee50b424 100644 --- a/lib/stdlib/doc/src/erl_internal.xml +++ b/lib/stdlib/doc/src/erl_internal.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml index 1ca58baf9a..318cb5ac19 100644 --- a/lib/stdlib/doc/src/erl_lint.xml +++ b/lib/stdlib/doc/src/erl_lint.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index b97d06e919..fdd776b7f1 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml index 005c101973..c9d9e2723d 100644 --- a/lib/stdlib/doc/src/erl_pp.xml +++ b/lib/stdlib/doc/src/erl_pp.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index 8f9c1db25b..18e988e286 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 95eefb8f9b..0fa5a55c5b 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 2bfe074c3e..ab1a5900b9 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index c069333c29..30e09c17b0 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml index 6fa39f97f6..2cf9490f4b 100644 --- a/lib/stdlib/doc/src/filelib.xml +++ b/lib/stdlib/doc/src/filelib.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 49b652f969..77e262dbe6 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index 99e92d8680..84609a0f7c 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index 99ca2d6a9a..5d1f27c014 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index 5c96d6e576..1efac1535a 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index b1bba3eff0..5f7b5a3437 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 3c92de59b9..c31e869db8 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index 8ebfdb2e7f..edf3c51b4c 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml index 2117d66381..cd58090dcd 100644 --- a/lib/stdlib/doc/src/io_lib.xml +++ b/lib/stdlib/doc/src/io_lib.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml index 21da404c35..170dab17ca 100644 --- a/lib/stdlib/doc/src/io_protocol.xml +++ b/lib/stdlib/doc/src/io_protocol.xml @@ -9,16 +9,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml index 30f164826c..f4dddf646d 100644 --- a/lib/stdlib/doc/src/lib.xml +++ b/lib/stdlib/doc/src/lib.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index dcc08d008b..46edd9fe16 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml index 3ef659f579..eccda516ba 100644 --- a/lib/stdlib/doc/src/log_mf_h.xml +++ b/lib/stdlib/doc/src/log_mf_h.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index 7345a9357a..48c1abc2f8 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. maps Björn-Egil Dahlberg diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml index 7cfc8a1175..31e838d741 100644 --- a/lib/stdlib/doc/src/math.xml +++ b/lib/stdlib/doc/src/math.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml index e89dd41f26..22cb39c576 100644 --- a/lib/stdlib/doc/src/ms_transform.xml +++ b/lib/stdlib/doc/src/ms_transform.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 301a5ee2e8..39b01c9f1d 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/notes_history.xml b/lib/stdlib/doc/src/notes_history.xml index 328855f6dd..25641fdf3a 100644 --- a/lib/stdlib/doc/src/notes_history.xml +++ b/lib/stdlib/doc/src/notes_history.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index c853b402d4..950f688735 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml index 277c1c32ab..639e041d79 100644 --- a/lib/stdlib/doc/src/ordsets.xml +++ b/lib/stdlib/doc/src/ordsets.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/part.xml b/lib/stdlib/doc/src/part.xml index 5589d11e3e..f7074d3404 100644 --- a/lib/stdlib/doc/src/part.xml +++ b/lib/stdlib/doc/src/part.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/part_notes.xml b/lib/stdlib/doc/src/part_notes.xml index cdd35ac370..6ceead1af5 100644 --- a/lib/stdlib/doc/src/part_notes.xml +++ b/lib/stdlib/doc/src/part_notes.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/part_notes_history.xml b/lib/stdlib/doc/src/part_notes_history.xml index 15e0a0f1d3..36792b12e1 100644 --- a/lib/stdlib/doc/src/part_notes_history.xml +++ b/lib/stdlib/doc/src/part_notes_history.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml index 1b903984f9..e9c574038c 100644 --- a/lib/stdlib/doc/src/pool.xml +++ b/lib/stdlib/doc/src/pool.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 9a0ff85038..86ade8840f 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml index 1655133b2b..de4fbd3a7f 100644 --- a/lib/stdlib/doc/src/proplists.xml +++ b/lib/stdlib/doc/src/proplists.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml index 8682936c08..8101b6458c 100644 --- a/lib/stdlib/doc/src/qlc.xml +++ b/lib/stdlib/doc/src/qlc.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index f689412988..c1665a1ed4 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml index 178afda5a0..e7d4728ef7 100644 --- a/lib/stdlib/doc/src/rand.xml +++ b/lib/stdlib/doc/src/rand.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index e475cda23d..91a4012ce9 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 5af1468e9b..46b382a6be 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved on line at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index cae62612aa..82ad78e675 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index eecddb7fd4..531d18fbef 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml index 3ca80ed900..22a3321298 100644 --- a/lib/stdlib/doc/src/shell.xml +++ b/lib/stdlib/doc/src/shell.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/shell_default.xml b/lib/stdlib/doc/src/shell_default.xml index 2355ba92f9..51cd3b62d3 100644 --- a/lib/stdlib/doc/src/shell_default.xml +++ b/lib/stdlib/doc/src/shell_default.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml index f5d0436a20..8c16cbf5b1 100644 --- a/lib/stdlib/doc/src/slave.xml +++ b/lib/stdlib/doc/src/slave.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index 6c97fd0bc0..5d7648d9a1 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml index de4cc65396..43bcad9098 100644 --- a/lib/stdlib/doc/src/stdlib_app.xml +++ b/lib/stdlib/doc/src/stdlib_app.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml index b05d5cbc08..d64db6c7ee 100644 --- a/lib/stdlib/doc/src/string.xml +++ b/lib/stdlib/doc/src/string.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 6ff477a42d..f08b752998 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml index d16b258b6c..d356b4b57e 100644 --- a/lib/stdlib/doc/src/supervisor_bridge.xml +++ b/lib/stdlib/doc/src/supervisor_bridge.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index cf7df54d1d..6ec515849e 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 791a29689e..e002f519b9 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml index 6f8a289432..19ddf1cbd6 100644 --- a/lib/stdlib/doc/src/unicode.xml +++ b/lib/stdlib/doc/src/unicode.xml @@ -9,16 +9,17 @@ Ericsson AB, All Rights Reserved - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. The Initial Developer of the Original Code is Ericsson AB. diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index eb3a556e10..c4cb193b07 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -9,16 +9,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml index 8835f931b2..2a5a4a462d 100644 --- a/lib/stdlib/doc/src/win32reg.xml +++ b/lib/stdlib/doc/src/win32reg.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. - - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index d201e81a79..4500995c34 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -8,16 +8,17 @@ Ericsson AB. All Rights Reserved. - The contents of this file are subject to the Erlang Public License, - Version 1.1, (the "License"); you may not use this file except in - compliance with the License. You should have received a copy of the - Erlang Public License along with this software. If not, it can be - retrieved online at http://www.erlang.org/. + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 - Software distributed under the License is distributed on an "AS IS" - basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - the License for the specific language governing rights and limitations - under the License. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. -- cgit v1.2.3 From 2955ddebc32837b66d9bacb4e925ad0ed0033168 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 23 Jun 2015 10:24:26 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 323 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 323 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 39b01c9f1d..514ac37d90 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,329 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.5 + +
Fixed Bugs and Malfunctions + + +

+ Fix handling of single dot in filename:join/2

+

+ The reference manual says that filename:join(A,B) is + equivalent to filename:join([A,B]). In some rare cases + this turns out not to be true. For example:

+

+ filename:join("/a/.","b") -> "/a/./b" vs + filename:join(["/a/.","b"]) -> "/a/b".

+

+ This has been corrected. A single dot is now only kept if + it occurs at the very beginning or the very end of the + resulting path.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12158

+ + +

+ The undocumented option generic_debug for + gen_server has been removed.

+

+ Own Id: OTP-12183

+ + +

+ erl_lint:icrt_export/4 has been rewritten to make the + code really follow the scoping rules of Erlang, and not + just in most situations by accident.

+

+ Own Id: OTP-12186

+ + +

+ Add 'trim_all' option to binary:split/3

+

+ This option can be set to remove _ALL_ empty parts of the + result of a call to binary:split/3.

+

+ Own Id: OTP-12301

+ + +

Correct orddict(3) regarding evaluation order of + fold() and map().

+

+ Own Id: OTP-12651 Aux Id: seq12832

+ + +

+ Correct maps module error exceptions

+

+ Bad input to maps module function will now yield the + following exceptions: {badmap,NotMap} + or, badarg

+

+ Own Id: OTP-12657

+ + +

+ It is now possible to paste text in JCL mode (using + Ctrl-Y) that has been copied in the previous shell + session. Also a bug that caused the JCL mode to crash + when pasting text has been fixed.

+

+ Own Id: OTP-12673

+ + +

+ Add uptime() shell command.

+

+ Own Id: OTP-12752

+ + +

+ Cache nowarn_bif_clash functions in erl_lint.

+

+ This patch stores nowarn_bif_clash in the lint record. By + using erlc +'{eprof,lint_module}' when compiling the + erlang parser, we noticed the time spent on + nowarn_function/2 reduced from 30% to 0.01%.

+

+ Own Id: OTP-12754

+ + +

+ Optimize the Erlang Code Linter by using the cached + filename information.

+

+ Own Id: OTP-12772

+ + +

+ If a child of a simple_one_for_one returns ignore from + its start function no longer store the child for any + restart type. It is not possible to restart or delete the + child because the supervisor is a simple_one_for_one.

+

+ Own Id: OTP-12793

+ + +

+ Make ets:file2tab preserve enabled + read_concurrency and write_concurrency + options for tables.

+

+ Own Id: OTP-12814

+ + +

+ There are many cases where user code needs to be able to + distinguish between a socket that was closed normally and + one that was aborted. Setting the option + {show_econnreset, true} enables the user to receive + ECONNRESET errors on both active and passive sockets.

+

+ Own Id: OTP-12841

+ + +
+ + +
Improvements and New Features + + +

+ Allow maps for supervisor flags and child specs

+

+ Earlier, supervisor flags and child specs were given as + tuples. While this is kept for backwards compatibility, + it is now also allowed to give these parameters as maps, + see sup_flags + and child_spec.

+

+ Own Id: OTP-11043

+ + +

+ A new system message, terminate, is added. This + can be sent with sys:terminate/2,3. If the + receiving process handles system messages properly it + will terminate shortly after receiving this message.

+

+ The new function proc_lib:stop/1,3 utilizes this + new system message and monitors the receiving process in + order to facilitate a synchronous stop mechanism for + 'special processes'.

+

+ proc_lib:stop/1,3 is used by the following + functions:

+

+ gen_server:stop/1,3 (new) + gen_fsm:stop/1,3 (new) + gen_event:stop/1,3 (modified to be + synchronous) wx_object:stop/1,3 + (new)

+

+ Own Id: OTP-11173 Aux Id: seq12353

+ + +

+ Remove the pg module, which has been deprecated + through OTP-17, is now removed from the STDLIB + application. This module has been marked experimental for + more than 15 years, and has largely been superseded by + the pg2 module from the Kernel application.

+

+ Own Id: OTP-11907

+ + +

+ New BIF: erlang:get_keys/0, lists all keys + associated with the process dictionary. Note: + erlang:get_keys/0 is auto-imported.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12151 Aux Id: seq12521

+ + +

Add three new functions to io_lib-- + scan_format/2, unscan_format/1, and + build_text/1-- which expose the parsed form of the + format control sequences to make it possible to easily + modify or filter the input to io_lib:format/2. + This can e.g. be used in order to replace unbounded-size + control sequences like ~w or ~p with + corresponding depth-limited ~W and ~P + before doing the actual formatting.

+

+ Own Id: OTP-12167

+ + +

Introduce the erl_anno module, an abstraction + of the second element of tokens and tuples in the + abstract format.

+

+ Own Id: OTP-12195

+ + +

+ Support variables as Map keys in expressions and patterns

+

Erlang will accept any expression as keys in Map + expressions and it will accept literals or bound + variables as keys in Map patterns.

+

+ Own Id: OTP-12218

+ + +

The last traces of Mnemosyne Rules have been removed. +

+

+ Own Id: OTP-12257

+ + +

+ Properly support maps in match_specs

+

+ Own Id: OTP-12270

+ + +

+ New function ets:take/2. Works the same as + ets:delete/2 but also returns the deleted + object(s).

+

+ Own Id: OTP-12309

+ + +

string:tokens/2 is somewhat faster, especially + if the list of separators only contains one separator + character.

+

+ Own Id: OTP-12422 Aux Id: seq12774

+ + +

The documentation of the Abstract Format (in the ERTS + User's Guide) has been updated with types and + specification. (Thanks to Anthony Ramine.)

The + explicit representation of parentheses used in types of + the abstract format has been removed. Instead the new + functions erl_parse:type_inop_prec() and + erl_parse:type_preop_prec() can be used for + inserting parentheses where needed.

+

+ Own Id: OTP-12492

+ + +

+ Prevent zip:zip_open/[12] from leaking file descriptors + if parent process dies.

+

+ Own Id: OTP-12566

+ + +

+ Add a new random number generator, see rand + module. It have better characteristics and an improved + interface.

+

+ Own Id: OTP-12586 Aux Id: OTP-12501, OTP-12502

+ + +

filename:split/1 when given an empty binary + will now return an empty list, to make it consistent with + return value when given an empty list.

+

+ Own Id: OTP-12716

+ + +

+ Add sync option to ets:tab2file/3.

+

+ Own Id: OTP-12737 Aux Id: seq12805

+ + +

Add functions gb_sets:iterator_from() and + gb_trees:iterator_from(). (Thanks to Kirill + Kinduk.)

+

+ Own Id: OTP-12742

+ + +

+ Add maps:filter/2 to maps module.

+

+ Own Id: OTP-12745

+ + +

+ Change some internal data structures to Maps in order to + speed up compilation time. Measured speed up is around + 10%-15%.

+

+ Own Id: OTP-12774

+ + +

Update orddict to use parameterized types and + specs. (Thanks to UENISHI Kota.)

+

+ Own Id: OTP-12785

+ + +

The assert macros in eunit has been moved out + to stdlib/include/assert.hrl. This files get + included by eunit.hrl. Thus, nothing changes for + eunit users, but the asserts can now also be included + separately.

+

+ Own Id: OTP-12808

+ + +
+ +
+
STDLIB 2.4
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 97cf9d7e253f516417d5faa87a5de51118c8a272 Mon Sep 17 00:00:00 2001 From: Attila Gulyas Date: Tue, 14 Jul 2015 15:10:28 -0700 Subject: Fix function reference (no first/2 in ets) --- lib/stdlib/doc/src/ets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index ab1a5900b9..03b995e4de 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -610,7 +610,7 @@ ets:is_compiled_ms(Broken).

Returns the last key Key according to Erlang term order in the table Tab of the ordered_set type. If the table is of any other type, the function is synonymous - to first/2. If the table is empty, + to first/1. If the table is empty, '$end_of_table' is returned.

Use prev/2 to find preceding keys in the table.

-- cgit v1.2.3 From 7df173516a08455304abd0a783c9e8b64e88859e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Tue, 25 Aug 2015 15:07:43 +0200 Subject: proc_lib: Add format/3 We'll need a way to limit the size of the crash report produced by proc_lib:format(). Add format/3, where the third argument is a depth argument. --- lib/stdlib/doc/src/proc_lib.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 86ade8840f..85f0c0c908 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -226,6 +226,17 @@ init(Parent) -> Pid which sent the crash report.

+ + + Format a crash report. + +

This function can be used by a user defined event handler to + format a crash report. When Depth is given as an + positive integer, it will be used in the format string to + limit the output as follows: io_lib:format("~P", + [Term,Depth]).

+ + Extract the initial call of a proc_libspawned process. -- cgit v1.2.3 From 33b2cc1996883569b8afbc7cab8a535aa168ae1b Mon Sep 17 00:00:00 2001 From: Siri Hansen Date: Thu, 10 Sep 2015 10:56:30 +0200 Subject: Fix doc for return value of gen_fsm:reply/2 --- lib/stdlib/doc/src/gen_fsm.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 5f7b5a3437..a8d7fadeb4 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -339,11 +339,12 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 - reply(Caller, Reply) -> true + reply(Caller, Reply) -> Result Send a reply to a caller. Caller - see below Reply = term() + Result = term()

This function can be used by a gen_fsm to explicitly send a @@ -358,6 +359,8 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 which will be given back to the client as the return value of sync_send_event/2,3 or sync_send_all_state_event/2,3.

+

The return value Result is not further defined, and + should always be ignored.

 -- cgit v1.2.3 From d9daff6d87c217ba7d3cba00642710e473e9b226 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Fri, 26 Jun 2015 14:09:43 +0200 Subject: stdlib: Remove deprecated functions in erl_parse and erl_scan The recently added module erl_anno can no longer handle negative line numbers. --- lib/stdlib/doc/src/erl_scan.xml | 185 ++-------------------------------------- 1 file changed, 6 insertions(+), 179 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index 18e988e286..01b845a039 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -39,39 +39,15 @@ Erlang tokens.

- - - - - - - - - - - - - - - - - - - - - - - - @@ -87,9 +63,6 @@ - - - @@ -122,25 +95,23 @@ StartLocation, []).

StartLocation indicates the initial location when scanning starts. If StartLocation is a line, - attributes() as well as EndLocation and + Anno as well as EndLocation and ErrorLocation will be lines. If StartLocation is a pair of a line and a column - attributes() takes the form of an opaque compound + Anno takes the form of an opaque compound data type, and EndLocation and ErrorLocation will be pairs of a line and a column. The token - attributes contain information about the column and the + annotations contain information about the column and the line where the token begins, as well as the text of the token (if the text option is given), all of which can - be accessed by calling token_info/1,2, attributes_info/1,2, + be accessed by calling column/1, line/1, location/1, and text/1.

A token is a tuple containing information about - syntactic category, the token attributes, and the actual + syntactic category, the token annotations, and the actual terminal symbol. For punctuation characters (e.g. ;, |) and reserved words, the category and the symbol coincide, and the token is represented by a two-tuple. @@ -172,7 +143,7 @@

Short for [return_comments, return_white_spaces].

text -

Include the token's text in the token attributes. The +

Include the token's text in the token annotation. The text is the part of the input corresponding to the token.

 @@ -305,150 +276,6 @@

- - - Return information about a token - -

Returns a list containing information about the token - Token. The order of the - TokenInfoTuples is not - defined. See token_info/2 for - information about specific - TokenInfoTuples.

-

Note that if token_info(Token, TokenItem) returns - undefined for some TokenItem, the - item is not included in TokenInfo.

- - - - - - - - Return information about a token - -

Returns a list containing information about the token - Token. If one single - TokenItem is given the returned value is - the corresponding - TokenInfoTuple, or undefined if the - TokenItem has no value. If a list of - TokenItems is given the result is a list of - TokenInfoTuple. The - TokenInfoTuples will - appear with the corresponding TokenItems in - the same order as the TokenItems - appear in the list of TokenItems. - TokenItems with no value are not included - in the list of TokenInfoTuple.

-

The following TokenInfoTuples with corresponding - TokenItems are valid:

- - {category, - category()} -

The category of the token.

- - {column, - column()} -

The column where the token begins.

- - {length, integer() > 0} -

The length of the token's text.

- - {line, - line()} -

The line where the token begins.

- - {location, - location()} -

The line and column where the token begins, or - just the line if the column unknown.

- - {symbol, - symbol()} -

The token's symbol.

- - {text, string()} -

The token's text.

- - - - - - - Return information about token attributes - -

Returns a list containing information about the token - attributes Attributes. The order of the - AttributeInfoTuples is not defined. - See attributes_info/2 for - information about specific - AttributeInfoTuples.

-

Note that if attributes_info(Token, AttributeItem) - returns undefined for some AttributeItem in - the list above, the item is not included in - AttributesInfo.

- - - - - - Return information about a token attributes - - -

Returns a list containing information about the token - attributes Attributes. If one single - AttributeItem is given the returned value is the - corresponding AttributeInfoTuple, - or undefined if the AttributeItem - has no value. If a list of AttributeItem - is given the result is a list of - AttributeInfoTuple. - The AttributeInfoTuples - will appear with the corresponding AttributeItems - in the same order as the AttributeItems - appear in the list of AttributeItems. - AttributeItems with no - value are not included in the list of - AttributeInfoTuple.

-

The following AttributeInfoTuples with - corresponding AttributeItems are valid:

- - {column, - column()} -

The column where the token begins.

- - {length, integer() > 0} -

The length of the token's text.

- - {line, - line()} -

The line where the token begins.

- - {location, - location()} -

The line and column where the token begins, or - just the line if the column unknown.

- - {text, string()} -

The token's text.

- - - - - - - Set a token attribute value - -

Sets the value of the line attribute of the token - attributes Attributes.

-

The SetAttributeFun is called with the value of - the line attribute, and is to return the new value of - the line attribute.

- - Format an error descriptor -- cgit v1.2.3 From 6738d356a279835222b951fd213ed4cf9897eb7e Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 21 Sep 2015 17:09:23 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 514ac37d90..bdd0680038 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,71 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.6 + +
Fixed Bugs and Malfunctions + + +

In OTP 18.0, qlc does not handle syntax errors + well. This bug has been fixed.

+

+ Own Id: OTP-12946

+ + +

+ Optimize zip:unzip/2 when uncompressing to memory.

+

+ Own Id: OTP-12950

+ + +

+ The stdlib reference manual is updated to show + correct information about the return value of + gen_fsm:reply/2.

+

+ Own Id: OTP-12973

+ + +

re:split2,3 and re:replace/3,4 now correctly handles + pre-compiled patterns that have been compiled using the + 'unicode' option.

+

+ Own Id: OTP-12977

+ + +

+ Export shell:catch_exception/1 as documented.

+

+ Own Id: OTP-12990

+ + +
+ + +
Improvements and New Features + + +

A mechanism for limiting the amount of text that the + built-in error logger events will produce has been + introduced. It is useful for limiting both the size of + log files and the CPU time used to produce them.

+

This mechanism is experimental in the sense that it + may be changed if it turns out that it does not solve the + problem it is supposed to solve. In that case, there may + be backward incompatible improvements to this + mechanism.

+

See the documentation for the config parameter + error_logger_format_depth in the Kernel + application for information about how to turn on this + feature.

+

+ Own Id: OTP-12864

+ + +
+ +
+
STDLIB 2.5
Fixed Bugs and Malfunctions -- cgit v1.2.3 From ad264b2ac5724e3043b7dafa09eb4da0b971bf8e Mon Sep 17 00:00:00 2001 From: Riccardo Date: Sat, 10 Oct 2015 16:00:09 +0200 Subject: Fixed typo in ets documentation --- lib/stdlib/doc/src/ets.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 03b995e4de..ee2bf96cb7 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -916,7 +916,7 @@ ets:select(Table,MatchSpec),

{keypos,Pos} - Specfies which element in the stored tuples should be + Specifies which element in the stored tuples should be used as key. By default, it is the first element, i.e. Pos=1. However, this is not always appropriate. In particular, we do not want the first element to be the -- cgit v1.2.3 From 32ba359b05658960b86f7587b61b46d1fb2021be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Thu, 22 Oct 2015 13:15:25 +0200 Subject: beam_lib: Document all_chunks/1 and build_module/1 beam_lib:all_chunks/1 and beam_lib:build_module/1 can be useful for special-purpose stripping, for example to remove the "Line" chunk. --- lib/stdlib/doc/src/beam_lib.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index c556180b8b..faf668735e 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -223,6 +223,13 @@ + + + Read all chunks from a BEAM file or binary + +

Reads chunk data for all chunks.

+ + Read selected chunks from a BEAM file or binary @@ -250,6 +257,13 @@ tuple.

 + + + Creates a BEAM module from a list of chunks + +

Builds a BEAM module (as a binary) from a list of chunks.

+ + Read the BEAM file's module version -- cgit v1.2.3 From b9dde77481d2f6ae988118a79abd06b134129075 Mon Sep 17 00:00:00 2001 From: Gary Coulbourne Date: Thu, 15 Oct 2015 15:04:06 -0400 Subject: Fix spelling error in "characters_to_list" --- lib/stdlib/doc/src/unicode.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml index 19ddf1cbd6..966eec49f5 100644 --- a/lib/stdlib/doc/src/unicode.xml +++ b/lib/stdlib/doc/src/unicode.xml @@ -133,7 +133,7 @@ latin1, or have characters encoded as one of the UTF-encodings, which is given as the InEncoding parameter. Only when the InEncoding is one of the UTF - encodings, integers in the list are allowed to be grater than + encodings, integers in the list are allowed to be greater than 255.

If InEncoding is latin1, the Data parameter -- cgit v1.2.3 From de432f4ea9a8c29c931f30dd504662be1a01464d Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Mon, 12 Oct 2015 14:28:39 +0200 Subject: [stdlib] Correct documentation Fix mistakes found by 'xmllint'. --- lib/stdlib/doc/src/array.xml | 4 +-- lib/stdlib/doc/src/assert_hrl.xml | 11 +++---- lib/stdlib/doc/src/beam_lib.xml | 4 +-- lib/stdlib/doc/src/binary.xml | 4 +-- lib/stdlib/doc/src/c.xml | 2 +- lib/stdlib/doc/src/calendar.xml | 4 +-- lib/stdlib/doc/src/dets.xml | 56 ++++++++++++++++++------------------ lib/stdlib/doc/src/digraph.xml | 6 ++-- lib/stdlib/doc/src/digraph_utils.xml | 5 ++-- lib/stdlib/doc/src/epp.xml | 2 +- lib/stdlib/doc/src/erl_anno.xml | 34 +++++++++++----------- lib/stdlib/doc/src/erl_parse.xml | 2 +- lib/stdlib/doc/src/erl_pp.xml | 4 +-- lib/stdlib/doc/src/erl_scan.xml | 36 +++++++++++------------ lib/stdlib/doc/src/erl_tar.xml | 3 +- lib/stdlib/doc/src/ets.xml | 13 +++++---- lib/stdlib/doc/src/file_sorter.xml | 52 ++++++++++++++++----------------- lib/stdlib/doc/src/gen_event.xml | 4 +-- lib/stdlib/doc/src/gen_fsm.xml | 2 +- lib/stdlib/doc/src/gen_server.xml | 2 +- lib/stdlib/doc/src/io.xml | 18 ++++++------ lib/stdlib/doc/src/lists.xml | 6 ++-- lib/stdlib/doc/src/math.xml | 2 +- lib/stdlib/doc/src/notes.xml | 53 +++++++++++++++++++--------------- lib/stdlib/doc/src/random.xml | 12 ++++++-- lib/stdlib/doc/src/re.xml | 16 +++++------ lib/stdlib/doc/src/sofs.xml | 5 ++-- lib/stdlib/doc/src/supervisor.xml | 2 +- lib/stdlib/doc/src/sys.xml | 4 +-- lib/stdlib/doc/src/timer.xml | 8 ------ lib/stdlib/doc/src/zip.xml | 2 +- 31 files changed, 192 insertions(+), 186 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index 28b4435938..0f33e2621c 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -164,7 +164,7 @@ the default value cannot be confused with the values of set entries.

-

Equivalent to from_list(List, undefined).

+

Equivalent to from_list(List, undefined).

 @@ -184,7 +184,7 @@ the default value cannot be confused with the values of set entries.

-

Equivalent to from_orddict(Orddict, undefined).

+

Equivalent to from_orddict(Orddict, undefined).

 diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml index b85be514d8..ef4f928e57 100644 --- a/lib/stdlib/doc/src/assert_hrl.xml +++ b/lib/stdlib/doc/src/assert_hrl.xml @@ -76,9 +76,6 @@ erlc -DNOASSERT=true *.erl -
-
-
Macros @@ -94,12 +91,12 @@ erlc -DNOASSERT=true *.erl assertMatch(GuardedPattern, Expr)

Tests that Expr completes normally yielding a value - that matches GuardedPattern. For example: + that matches GuardedPattern. For example:

- ?assertMatch({bork, _}, f())

-

Note that a guard when ... can be included: + ?assertMatch({bork, _}, f()) +

Note that a guard when ... can be included:

- ?assertMatch({bork, X} when X > 0, f())

+ ?assertMatch({bork, X} when X > 0, f()) assertNotMatch(GuardedPattern, Expr) diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index faf668735e..7c89c8b43e 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -4,7 +4,7 @@
- 20002013 + 20002015 Ericsson AB. All Rights Reserved. @@ -71,6 +71,7 @@ using strip/1, strip_files/1 and/or strip_release/1.

+
Reconstructing source code

Here is an example of how to reconstruct source code from @@ -152,7 +153,6 @@ keys.

-
diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 063f3048e0..2682198fe5 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -299,8 +299,8 @@ - Searches for the first match of a pattern in a binary +

Searches for the first occurrence of Pattern in Subject and @@ -353,8 +353,8 @@ - Searches for all matches of a pattern in a binary +

Works like match/2, but the Subject is searched until diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml index a0f18bd899..e5238fa7db 100644 --- a/lib/stdlib/doc/src/c.xml +++ b/lib/stdlib/doc/src/c.xml @@ -121,12 +121,12 @@ compile:file(File, Options ++ [report_errors, report_w lc(Files) -> ok + Compile a list of files Files = [File] File = file:filename() - Compile a list of files

Compiles a list of files by calling compile:file(File, [report_errors, report_warnings]) for each File in Files.

diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index a8d933dc83..853184dc0f 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -130,11 +130,11 @@ + Compute the number of days from year 0 up to the given date - Compute the number of days from year 0 up to the given date

This function computes the number of gregorian days starting with year 0 and ending at the given date.

@@ -347,11 +347,11 @@ + Check if a date is valid - Check if a date is valid

This function checks if a date is a valid.

 diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 14237b6f90..a0d3f95b6a 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -316,20 +316,20 @@ bytes.

-

{filename, file:name()}, +

{filename, file:name()}, the name of the file where objects are stored.

 -

{keypos, keypos()} - , the position of the key.

+

{keypos, keypos() + }, the position of the key.

{size, integer() >= 0}, the number of objects stored in the table.

 -

{type, type()}, - the type of the table.

+

{type, type() + }, the type of the table.

 @@ -345,12 +345,12 @@ allowed:

-

{access, access()} - , the access mode.

+

{access, access() + }, the access mode.

 -

{auto_save, - auto_save()}, the auto save interval.

+

{auto_save, + auto_save()}, the auto save interval.

{bchunk_format, binary()}, an opaque binary @@ -730,16 +730,16 @@ ok tuples where the following values are allowed:

-

{access, - access()}. It is possible to open +

{access, + access()}. It is possible to open existing tables in read-only mode. A table which is opened in read-only mode is not subjected to the automatic file reparation algorithm if it is later opened after a crash. The default value is read_write.

 -

{auto_save, - auto_save()}, the auto save +

{auto_save, + auto_save()}, the auto save interval. If the interval is an integer Time, the table is flushed to disk whenever it is not accessed for Time milliseconds. A table that has been flushed @@ -749,18 +749,18 @@ ok is 180000 (3 minutes).

 -

{estimated_no_objects, - no_slots()}. Equivalent to the +

{estimated_no_objects, + no_slots()}. Equivalent to the min_no_slots option.

 -

{file, - file:name()}, the name of the file to be +

{file, + file:name()}, the name of the file to be opened. The default value is the name of the table.

 -

{max_no_slots, - no_slots()}, the maximum number +

{max_no_slots, + no_slots()}, the maximum number of slots that will be used. The default value as well as the maximal value is 32 M. Note that a higher value may increase the fragmentation of the table, and conversely, @@ -769,16 +769,16 @@ ok 9 tables.

 -

{min_no_slots, - no_slots()}. Application +

{min_no_slots, + no_slots()}. Application performance can be enhanced with this flag by specifying, when the table is created, the estimated number of different keys that will be stored in the table. The default value as well as the minimum value is 256.

 -

{keypos, - keypos()}, the position of the +

{keypos, + keypos()}, the position of the element of each object to be used as key. The default value is 1. The ability to explicitly state the key position is most convenient when we want to store Erlang @@ -815,12 +815,12 @@ ok already open.

 -

{type, type()}, +

{type, type()}, the type of the table. The default value is set.

 -

{version, - version()}, the version of the format +

{version, + version()}, the version of the format used for the table. The default value is 9. Tables on the format used before OTP R8 can be created by giving the value 8. A version 8 table can be converted to @@ -1036,8 +1036,8 @@ ok specification that matches all objects.

 -

{select, - match_spec()}. As for select +

{select, + match_spec()}. As for select the table is traversed by calling dets:select/3 and dets:select/1. The difference is that the match specification is explicitly given. This is how to diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 49dc68e103..291be6c08b 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -103,13 +103,15 @@

A digraph as returned by new/0,1.

 - edge() + edge() +

- vertex() + vertex() +

diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index 6a4db2e963..639069543c 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -122,8 +122,9 @@ - digraph() -

A digraph as returned by digraph:new/0,1.

 + digraph() +

+ A digraph as returned by digraph:new/0,1.

 diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index fe2944bbf7..8c901f57ec 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -39,7 +39,7 @@ by compile to preprocess macros and include files before the actual parsing takes place.

The Erlang source file encoding is selected by a + id="encoding"/>encoding is selected by a comment in one of the first two lines of the source file. The first string that matches the regular expression coding\s*[:=]\s*([-a-zA-Z0-9])+ selects the encoding. If diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml index be0ffe6f4d..ddc8b8c765 100644 --- a/lib/stdlib/doc/src/erl_anno.xml +++ b/lib/stdlib/doc/src/erl_anno.xml @@ -44,7 +44,7 @@

This module implements an abstract type that is used by the Erlang Compiler and its helper modules for holding data such as column, line number, and text. The data type is a collection of - annotations as + annotations as described in the following.

The Erlang Token Scanner returns tokens with a subset of the following annotations, depending on the options:

@@ -102,8 +102,8 @@ - anno() -

A collection of annotations.

+ anno() +

A collection of annotations.

 @@ -133,8 +133,8 @@ - Return the column +

Returns the column of the annotations Anno.

@@ -142,8 +142,8 @@ - Return the end location of the text +

Returns the end location of the text of the annotations Anno. If there is no text, @@ -153,8 +153,8 @@ - Return the filename +

Returns the filename of the annotations Anno. If there is no filename, undefined is returned. @@ -180,8 +180,8 @@ - Return the generated Boolean +

Returns true if the annotations Anno has been marked as generated. The default is to return @@ -199,8 +199,8 @@ - Return the line +

Returns the line of the annotations Anno.

@@ -208,8 +208,8 @@ - Return the location +

Returns the location of the annotations Anno.

@@ -217,16 +217,16 @@ - Create a new collection of annotations +

Creates a new collection of annotations given a location.

 - Modify the filename +

Modifies the filename of the annotations Anno.

@@ -234,8 +234,8 @@ - Modify the generated marker +

Modifies the generated marker of the annotations Anno. @@ -244,8 +244,8 @@ - Modify the line +

Modifies the line of the annotations Anno.

@@ -253,8 +253,8 @@ - Modify the location +

Modifies the location of the annotations Anno.

@@ -262,8 +262,8 @@ - Modify the record marker +

Modifies the record marker of the annotations Anno.

@@ -271,8 +271,8 @@ - Modify the text +

Modifies the text of the annotations Anno.

@@ -280,8 +280,8 @@ - Return the text +

Returns the text of the annotations Anno. If there is no text, undefined is returned. diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index fdd776b7f1..0938b5dec3 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -174,8 +174,8 @@ - Convert an Erlang term into an abstract form +

Converts the Erlang data structure Data into an abstract form of type AbsTerm.

diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml index c9d9e2723d..4b8a571c81 100644 --- a/lib/stdlib/doc/src/erl_pp.xml +++ b/lib/stdlib/doc/src/erl_pp.xml @@ -48,8 +48,8 @@ -

The optional argument - HookFunction, shown in the functions described below, +

The optional argument + HookFunction, shown in the functions described below, defines a function which is called when an unknown form occurs where there should be a valid expression.

diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index 18e988e286..342f491dd0 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -181,10 +181,10 @@ + Re-entrant scanner An opaque continuation - Re-entrant scanner

This is the re-entrant scanner which scans characters until a dot ('.' followed by a white space) or @@ -324,9 +324,9 @@ + Return information about a token - Return information about a token

Returns a list containing information about the token Token. If one single @@ -345,28 +345,28 @@

The following TokenInfoTuples with corresponding TokenItems are valid:

- {category, - category()} + {category, + category()}

The category of the token.

 - {column, - column()} + {column, + column()}

The column where the token begins.

 {length, integer() > 0}

The length of the token's text.

 - {line, - line()} + {line, + line()}

The line where the token begins.

 - {location, - location()} + {location, + location()}

The line and column where the token begins, or just the line if the column unknown.

 - {symbol, - symbol()} + {symbol, + symbol()}

The token's symbol.

 {text, string()} @@ -416,19 +416,19 @@

The following AttributeInfoTuples with corresponding AttributeItems are valid:

- {column, - column()} + {column, + column()}

The column where the token begins.

 {length, integer() > 0}

The length of the token's text.

 - {line, - line()} + {line, + line()}

The line where the token begins.

 - {location, - location()} + {location, + location()}

The line and column where the token begins, or just the line if the column unknown.

 diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 0fa5a55c5b..898b55df72 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -442,7 +442,7 @@ structure like a file descriptor, a sftp channel id or such. The different Fun clauses operates on that very term.

-

The fun clauses parameter lists are: +

The fun clauses parameter lists are:

(write, {UserPrivate,DataToWrite}) Write the term DataToWrite using UserPrivate @@ -457,7 +457,6 @@ -

A complete Fun parameter for reading and writing on files using the file module could be:

diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index ee2bf96cb7..7b01109ff8 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -132,9 +132,10 @@ - continuation() + continuation() -

Opaque continuation used by +

+ Opaque continuation used by select/1,3, select_reverse/1,3, @@ -448,13 +449,13 @@ Error: fun containing local Erlang function calls {owner, pid()}

The pid of the owner of the table. - {protection, access()}

+ {protection, access()}

The table access rights. {size, integer() >= 0

The number of objects inserted in the table. - {type, type()}

+ {type, type()}

The table type. {read_concurrency, boolean()}

@@ -1626,6 +1627,7 @@ true + Update a counter object in an ETS table. @@ -1633,7 +1635,6 @@ true - Update a counter object in an ETS table.

This function provides an efficient way to update one or more counters, without the hassle of having to look up an object, update @@ -1700,11 +1701,11 @@ true + Updates the Pos:th element of the object with a given key in an ETS table. - Updates the Pos:th element of the object with a given key in an ETS table.

This function provides an efficient way to update one or more elements within an object, without the hassle of having to look up, diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index 30e09c17b0..f033eebec7 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -223,82 +223,82 @@ output(L) -> -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index 1efac1535a..c4bab45781 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -716,7 +716,7 @@ gen_event:stop -----> Module:terminate/2 the purposes described below.

This function is called by a gen_event process when:

- + One of sys:get_status/1,2 is invoked to get the gen_event status. Opt is set @@ -740,7 +740,7 @@ gen_event:stop -----> Module:terminate/2 customises the details of the current state of the event handler. Any term is allowed for Status. The gen_event module uses Status as follows:

- + When sys:get_status/1,2 is called, gen_event ensures that its return value contains Status in place of the event handler's actual state term. diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index a8d7fadeb4..4d594b8eb2 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -805,7 +805,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 module state data.

This function is called by a gen_fsm process when:

- + One of sys:get_status/1,2 is invoked to get the gen_fsm status. Opt is set to diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index c31e869db8..6d04771cd4 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -673,7 +673,7 @@ gen_server:abcast -----> Module:handle_cast/2 module state.

This function is called by a gen_server process when:

- + One of sys:get_status/1,2 is invoked to get the gen_server status. Opt is set diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index edf3c51b4c..4655c8662f 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -132,8 +132,8 @@ - Read a specified number of characters +

Reads Count characters from standard input (IoDevice), prompting it with Prompt. It @@ -162,8 +162,8 @@ - Read a line +

Reads a line from the standard input (IoDevice), prompting it with Prompt. It returns:

@@ -300,8 +300,8 @@ - Read a term +

Reads a term Term from the standard input (IoDevice), prompting it with Prompt. It @@ -330,8 +330,8 @@ - Read a term +

Reads a term Term from IoDevice, prompting it with Prompt. Reading starts at location @@ -698,8 +698,8 @@ ok - Read formatted input +

Reads characters from the standard input (IoDevice), prompting it with Prompt. Interprets the characters in @@ -870,8 +870,8 @@ enter>: alan : joe - Read and tokenize Erlang expressions +

Reads data from the standard input (IoDevice), prompting it with Prompt. Reading starts at location @@ -919,8 +919,8 @@ enter>1.0er. - Read and tokenize an Erlang form +

Reads data from the standard input (IoDevice), prompting it with Prompt. Starts reading @@ -939,9 +939,9 @@ enter>1.0er. + Read, tokenize and parse Erlang expressions - Read, tokenize and parse Erlang expressions

Reads data from the standard input (IoDevice), prompting it with @@ -990,9 +990,9 @@ enter>abc("hey". + Read, tokenize and parse an Erlang form - Read, tokenize and parse an Erlang form

Reads data from the standard input (IoDevice), prompting it with Prompt. Starts reading at diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 46edd9fe16..89ba5238b5 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -283,8 +283,8 @@ flatmap(Fun, List1) -> - 1..tuple_size(Tuple) Search for an element in a list of tuples + 1..tuple_size(Tuple)

Searches the list of tuples TupleList for a tuple whose Nth element compares equal to Key. @@ -311,8 +311,8 @@ flatmap(Fun, List1) -> - 1..tuple_size(Tuple) Test for membership of a list of tuples + 1..tuple_size(Tuple)

Returns true if there is a tuple in TupleList whose Nth element compares equal to Key, otherwise @@ -346,8 +346,8 @@ flatmap(Fun, List1) -> - 1..tuple_size(Tuple) Search for an element in a list of tuples + 1..tuple_size(Tuple)

Searches the list of tuples TupleList for a tuple whose Nth element compares equal to Key. diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml index 31e838d741..aee6c3f238 100644 --- a/lib/stdlib/doc/src/math.xml +++ b/lib/stdlib/doc/src/math.xml @@ -72,9 +72,9 @@ + Diverse math functions - Diverse math functions

A collection of math functions which return floats. Arguments are numbers.

diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index bdd0680038..c84ca9c8ad 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -154,8 +154,9 @@ Correct maps module error exceptions

Bad input to maps module function will now yield the - following exceptions: {badmap,NotMap} - or, badarg

+ following exceptions:

+ {badmap, NotMap}, or badarg. +

Own Id: OTP-12657

 @@ -253,12 +254,11 @@

proc_lib:stop/1,3 is used by the following functions:

-

gen_server:stop/1,3 (new) gen_fsm:stop/1,3 (new) gen_event:stop/1,3 (modified to be synchronous) wx_object:stop/1,3 - (new)

+ (new)

Own Id: OTP-11173 Aux Id: seq12353

@@ -865,8 +865,7 @@ also implemented by the generic behaviours gen_server, gen_event and gen_fsm.

- The potential incompatibility refers to

-

+ The potential incompatibility refers to:

The previous behaviour of intercepting the system message and passing a tuple of size 2 as the last argument to sys:handle_system_msg/6 is no longer @@ -874,7 +873,7 @@ StateFun in sys:replace_state/2,3 fails is changed from being totally silent to possibly (if the callback module does not catch) throw an exception in the - client process.

+ client process.

(Thanks to James Fish and Steve Vinoski)

@@ -1036,22 +1035,28 @@

EEP43: New data type - Maps

- With Maps you may for instance: M0 = - #{ a => 1, b => 2}, % create - associations M1 = M0#{ a := 10 }, % - update values M2 = M1#{ "hi" => - "hello"}, % add new associations #{ - "hi" := V1, a := V2, b := V3} = M2. % match keys with - values

+ With Maps you may for instance:

+ + M0 = #{ a => 1, b => 2}, % create + associations + M1 = M0#{ a := 10 }, % update values + M2 = M1#{ "hi" => + "hello"}, % add new associations + #{ "hi" := V1, a := V2, b := V3} = M2. + % match keys with values +

For information on how to use Maps please see Map Expressions in the Reference Manual.

The current implementation is without the following - features: No variable keys - No single value access No map - comprehensions

+ features:

+ + No variable keys + No single value access + No map comprehensions +

Note that Maps is experimental during OTP 17.0.

@@ -1802,13 +1807,15 @@ supervisor or for the problematic child.

This introduces some incompatibilities in stdlib due to - new return values from supervisor: + new return values from supervisor:

+ restart_child/2 can now return {error,restarting} delete_child/2 can now return {error,restarting} which_children/1 returns a list of {Id,Child,Type,Mods}, where Child, in addition to the old pid() or 'undefined', now also can be - 'restarting'.

+ 'restarting'. +

*** POTENTIAL INCOMPATIBILITY ***

@@ -1824,10 +1831,10 @@ Own Id: OTP-9782 Aux Id: seq11964

-

Use universal time as base in error logger +

Use universal time as base in error logger

Previous conversion used the deprecated - calendar:local_time_to_universal_time/1

+ calendar:local_time_to_universal_time/1

Own Id: OTP-9854

 @@ -2584,10 +2591,10 @@ Own Id: OTP-8989 Aux Id: seq11741

-

Fix exception generation in the io module +

Fix exception generation in the io module

Some functions did not generate correct badarg exception - on a badarg exception.

+ on a badarg exception.

Own Id: OTP-9045

 diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index 91a4012ce9..a1bf67d332 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -76,9 +76,15 @@ dictionary, and returns the old state.

One easy way of obtaining a unique value to seed with is to:

- random:seed(erlang:phash2([node()]), - erlang:monotonic_time(), - erlang:unique_integer()) +random:seed(erlang:phash2([node()]), + erlang:monotonic_time(), + erlang:unique_integer()) +

See + erlang:phash2/1, + node/0, + erlang:monotonic_time/0, and + + erlang:unique_integer/0) for details.

 diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 46b382a6be..8c19926b10 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -205,8 +205,8 @@ This option makes it possible to include comments inside complicated patterns. N - See compile/2 above. Match a subject against regular expression and capture subpatterns + See compile/2 above.

Executes a regexp matching, returning match/{match, @@ -881,11 +881,11 @@ nomatch - - +

PERL LIKE REGULAR EXPRESSIONS SYNTAX -

The following sections contain reference material for the +

+ The following sections contain reference material for the regular expressions used by this module. The regular expression reference is based on the PCRE documentation, with changes in cases where the re module behaves differently to the PCRE library.

@@ -2070,7 +2070,7 @@ supported, and an error is given if they are encountered.

By default, in UTF modes, characters with values greater than 255 do not match any of the POSIX character classes. However, if the PCRE_UCP option is passed -to pcre_compile(), some of the classes are changed so that Unicode +to pcre_compile(), some of the classes are changed so that Unicode character properties are used. This is achieved by replacing the POSIX classes by other sequences, as follows:

@@ -2078,10 +2078,10 @@ by other sequences, as follows:

[:alnum:] becomes \p{Xan} [:alpha:] becomes \p{L} [:blank:] becomes \h - [:digit:] becomes \p{Nd} + [:digit:] becomes \p{Nd} [:lower:] becomes \p{Ll} [:space:] becomes \p{Xps} - [:upper:] becomes \p{Lu} + [:upper:] becomes \p{Lu} [:word:] becomes \p{Xwd} @@ -3059,7 +3059,7 @@ default newline convention is in force:

abc #comment \n still comment

 -

On encountering the # character, pcre_compile() skips along, looking for +

On encountering the # character, pcre_compile() skips along, looking for a newline in the pattern. The sequence \n is still literal at this stage, so it does not terminate the comment. Only an actual character with the code value 0x0a (the default newline) does so.

diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index 5d7648d9a1..53f6ca957a 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -398,8 +398,9 @@ fun(S) -> sofs:partition(1, S) end - tuple_of(T) -

A tuple where the elements are of type T.

 + tuple_of(T) +

+ A tuple where the elements are of type T.

 diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index f08b752998..24ff251ce3 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -353,7 +353,7 @@

Dynamically adds a child specification to the supervisor SupRef which starts the corresponding child process.

-

SupRef can be:

+

SupRef can be:

the pid, Name, if the supervisor is locally registered, diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index 6ec515849e..d400f72e1d 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -238,8 +238,8 @@

These functions are intended only to help with debugging. They are provided for convenience, allowing developers to avoid having to create their own state extraction functions and also avoid having to interactively extract state from the return values of - get_status/1 or - get_status/2 while debugging.

+ get_status/1 or + get_status/2 while debugging.

The value of State varies for different types of processes. For a gen_server process, the returned State diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index e002f519b9..7609487300 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -85,7 +85,6 @@ Send Messageto Pidafter a specified Time. -

send_after/3 @@ -99,7 +98,6 @@

Same as send_after(Time, self(), Message).

-

@@ -109,7 +107,6 @@ Send an exit signal with Reasonafter a specified Time. -

exit_after/3 @@ -130,7 +127,6 @@

Same as exit_after(Time, self(), kill).

-

@@ -147,7 +143,6 @@ Send Messagerepeatedly at intervals of Time. -

send_interval/3 @@ -161,7 +156,6 @@

Same as send_interval(Time, self(), Message).

-

@@ -192,7 +186,6 @@ Function, Arguments) or apply(Fun, Arguments) In microseconds -

tc/3 @@ -213,7 +206,6 @@ -

diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 4500995c34..186c8ac724 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -126,7 +126,7 @@ -

The name of a zip file.

+

The name of a zip file.

 -- cgit v1.2.3 From dc6d89bc1c08e15f8d4cd32f2e0886713cdc2dc2 Mon Sep 17 00:00:00 2001 From: Derek Brown Date: Wed, 4 Nov 2015 16:05:33 +0100 Subject: Fix typos and grammar --- lib/stdlib/doc/src/random.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index a1bf67d332..d3d7c90c31 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -148,7 +148,7 @@ random:seed(erlang:phash2([node()]),

The implementation changed in R15. Upgrading to R15 will break applications that expect a specific output for a given seed. The output is still deterministic number series, but different compared to releases - older than R15. The seed {0,0,0} will for example no longer + older than R15. The seed {0,0,0} will, for example, no longer produce a flawed series of only zeros.

-- cgit v1.2.3 From cdbe44920678d68a9936e1ab504bc1c8aad65847 Mon Sep 17 00:00:00 2001 From: David Whitlock Date: Thu, 5 Nov 2015 12:47:08 +0700 Subject: Recommend against using crypto:rand_bytes --- lib/stdlib/doc/src/rand.xml | 2 +- lib/stdlib/doc/src/random.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml index e7d4728ef7..50057259c6 100644 --- a/lib/stdlib/doc/src/rand.xml +++ b/lib/stdlib/doc/src/rand.xml @@ -104,7 +104,7 @@ strong. If a strong cryptographic random number generator is needed, use one of functions in the crypto - module, for example crypto:rand_bytes/1.

+ module, for example crypto:strong_rand_bytes/1.

diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index 91a4012ce9..f6f9e56966 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -48,7 +48,7 @@ tuple of three integers.

It should be noted that this random number generator is not cryptographically strong. If a strong cryptographic random number generator is needed for - example crypto:rand_bytes/1 could be used instead.

+ example crypto:strong_rand_bytes/1 could be used instead.

The new and improved rand module should be used instead of this module.

 -- cgit v1.2.3 From f4a0ae1736216feac5ae053610644bba2e12ed34 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 15 Dec 2015 09:45:27 +0100 Subject: Update release notes --- lib/stdlib/doc/src/notes.xml | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index c84ca9c8ad..267a993a1b 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,67 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.7 + +
Fixed Bugs and Malfunctions + + +

The Erlang Pretty Printer uses :: for function + type constraints.

A bug concerning pretty printing + of annotated type union elements in map pair types has + been fixed.

Some minor issues regarding the + documentation of types and specs have been corrected.

+

+ Own Id: OTP-13084

+ + +

The shell command rp prints strings as lists + of integers if pretty printing of lists is set to + false.

+

+ Own Id: OTP-13145

+ + +

+ The shell would crash if a bit syntax expression with + conflicting types were given (e.g. if a field type was + given as 'integer-binary'). (Thanks to Aleksei + Magusev for reporting this bug.)

+

+ Own Id: OTP-13157

+ + +

The rand:export_seed/0 would never return + 'undefined' even if no seed has previously been + created. Fixed to return 'undefined' if there is + no seed in the process dictionary.

+

+ Own Id: OTP-13162

+ + +
+ + +
Improvements and New Features + + +

+ Add support for the Delete, Home and End keys in the + Erlang shell.

+

+ Own Id: OTP-13032

+ + +

beam_lib:all_chunks/1 and + beam_lib:build_module/1 have been documented.

+

+ Own Id: OTP-13063

+ + +
+ +
+
STDLIB 2.6
Fixed Bugs and Malfunctions -- cgit v1.2.3 From b21f71c1bb79d3979505ad6ad1e496472b38c6b9 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 17 Dec 2015 12:41:44 +0100 Subject: stdlib: Update erl_parse(3) Calls to map_anno(), fold_anno(), and mapfold_anno() with lists of erl_parse trees have been replaced. Those functions accept lists of erl_parse trees, but it was not the intention when the functions were introduced, and it is not documented. --- lib/stdlib/doc/src/erl_parse.xml | 120 ++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 47 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 0938b5dec3..13be488c33 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -4,7 +4,7 @@
- 19962015 + 19962016 Ericsson AB. All Rights Reserved. @@ -44,20 +44,32 @@ - -

Parse tree for Erlang clause.

+ abstract_clause() +

+ Abstract form of an Erlang clause.

 - -

Parse tree for Erlang expression.

+ abstract_expr() +

+ Abstract form of an Erlang expression.

 - -

Parse tree for Erlang form.

+ abstract_form() +

+ Abstract form of an Erlang form.

 + + abstract_type() +

+ Abstract form of an Erlang type.

+ + + + + @@ -180,7 +192,7 @@

Converts the Erlang data structure Data into an abstract form of type AbsTerm.

The Line option is the line that will - be assigned to each node of the abstract form.

+ be assigned to each node of AbsTerm.

The Encoding option is used for selecting which integer lists will be considered as strings. The default is to use the encoding returned by @@ -196,47 +208,53 @@ - Map a function over the annotations of an abstract form + Map a function over the annotations of a erl_parse tree -

Modifies the abstract form Abstr by applying - Fun on every collection of annotations of the - abstract form. The abstract form is traversed in a - depth-first, left-to-right, fashion. +

Modifies the erl_parse tree Abstr + by applying Fun on each collection of + annotations of the nodes of the erl_parse tree. The + erl_parse tree is traversed in a depth-first, + left-to-right, fashion.

- Fold a function over the annotations of an abstract form + Fold a function over the annotations of a erl_parse tree -

Updates an accumulator by applying Fun on - every collection of annotations of the abstract form - Abstr. The first call to Fun has - AccIn as argument, and the returned accumulator - AccOut is passed to the next call, and so on. - The final value of the accumulator is returned. The abstract - form is traversed in a depth-first, left-to-right, fashion. +

Updates an accumulator by applying Fun on + each collection of annotations of the erl_parse tree + Abstr. The first call to + Fun has AccIn as + argument, and the returned accumulator + AccOut is passed to the next call, and + so on. The final value of the accumulator is returned. The + erl_parse tree is traversed in a depth-first, left-to-right, + fashion.

- Map and fold a function over the annotations of an abstract form + Map and fold a function over the annotations of a + erl_parse tree -

Modifies the abstract form Abstr by applying - Fun on every collection of annotations of the - abstract form, while at the same time updating an - accumulator. The first call to Fun has - AccIn as second argument, and the returned - accumulator AccOut is passed to the next call, - and so on. The modified abstract form as well as the the - final value of the accumulator is returned. The abstract - form is traversed in a depth-first, left-to-right, fashion. +

Modifies the erl_parse tree Abstr + by applying Fun on each collection of + annotations of the nodes of the erl_parse tree, while + at the same time updating an accumulator. The first call to + Fun has AccIn as + second argument, and the returned accumulator + AccOut is passed to the next call, and + so on. The modified erl_parse tree as well as the the + final value of the accumulator are returned. The + erl_parse tree is traversed in a depth-first, + left-to-right, fashion.

@@ -246,12 +264,15 @@ Create new annotations -

Creates an abstract form from a term which has the same - structure as an abstract form, but locations where the - abstract form has annotations. For each location, erl_anno:new/1 is - called, and the annotations replace the location. +

Assumes that Term is a term with the same + structure as a erl_parse tree, but with locations where a + erl_parse tree has collections of annotations. + Returns a erl_parse tree where each location L + has been replaced by the value returned by erl_anno:new(L). + The term Term is traversed in a + depth-first, left-to-right, fashion.

@@ -261,12 +282,14 @@ Return annotations as terms -

Assumes that Term is a term with the same - structure as an abstract form, but with terms, T say, on - those places where an abstract form has annotations. Returns - an abstract form where every term T has been replaced by the - value returned by calling erl_anno:from_term(T). The - term Term is traversed in a depth-first, +

Assumes that Term is a term with the same + structure as a erl_parse tree, but with terms, + T say, where a erl_parse tree has collections + of annotations. Returns a erl_parse tree where each + term T has been replaced by the value returned by + + erl_anno:from_term(T). The term + Term is traversed in a depth-first, left-to-right, fashion.

@@ -277,10 +300,13 @@ Return the representation of annotations -

Returns a term where every collection of annotations Anno of - Abstr has been replaced by the term returned by - calling erl_anno:to_term(Anno). The abstract form is - traversed in a depth-first, left-to-right, fashion. +

Returns a term where each collection of annotations + Anno of the nodes of the erl_parse tree + Abstr has been replaced by the term + returned by + erl_anno:to_term(Anno). The + erl_parse tree is traversed in a depth-first, + left-to-right, fashion.

-- cgit v1.2.3 From dc8e62f33ad0ca7a772ec74d67b6d3e157f639b4 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Wed, 13 Jan 2016 18:33:42 +0100 Subject: Introduce time warp safe replacement for safe_fixed option The new time warp safe option is safe_fixed_monotonic_time which gives erlang:monotonic_time(). The safe_fixed option was also slightly changed. It now gives erlang:timestamp() instead of erlang:now(). This has however not been documented, so it is considered a compatible change. The above effects both ets, and dets. This commit also include the bugfix OTP-13239 for dets:info(Tab, safe_fixed). The timestamp in the result returned by dets:info(Tab, safe_fixed) was unintentionally broken as a result of the time API rewrites in OTP 18.0. --- lib/stdlib/doc/src/dets.xml | 31 ++++++++++++++++++++++++++++--- lib/stdlib/doc/src/ets.xml | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 62 insertions(+), 10 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index a0d3f95b6a..48400733d1 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -399,15 +399,40 @@ kept in RAM.

-

{safe_fixed, SafeFixed}. If the table - is fixed, SafeFixed is a tuple {FixedAtTime, [{Pid,RefCount}]}. FixedAtTime is the time when +

{safe_fixed_monotonic_time, SafeFixed}. If the table + is fixed, SafeFixed is a tuple {FixedAtTime, [{Pid,RefCount}]}. + FixedAtTime is the time when the table was first fixed, and Pid is the pid of the process that fixes the table RefCount times. There may be any number of processes in the list. If the table is not fixed, SafeFixed is the atom false.

+

FixedAtTime will correspond to the result + returned by + erlang:monotonic_time/0 + at the time of fixation. The usage of safe_fixed_monotonic_time is + time warp + safe.

 -

{version, integer(), the version of the format of +

+ {safe_fixed, SafeFixed}. The same as + {safe_fixed_monotonic_time, SafeFixed} with the exception + of the format and value of FixedAtTime. +

+

+ FixedAtTime will correspond to the result returned by + erlang:timestamp/0 + at the time of fixation. Note that when the system is using + single or multi + time warp + modes this might produce strange results. This + since the usage of safe_fixed is not + time warp + safe. Time warp safe code need to use + safe_fixed_monotonic_time instead.

+ + +

{version, integer()}, the version of the format of the table.

 diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 7b01109ff8..447fe51130 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -488,14 +488,39 @@ Error: fun containing local Erlang function calls Item=fixed, Value=boolean()

Indicates if the table is fixed by any process or not. - -

Item=safe_fixed, Value={FirstFixed,Info}|false

+ +

Item=safe_fixed|safe_fixed_monotonic_time, Value={FixationTime,Info}|false

-

If the table has been fixed using safe_fixtable/2, - the call returns a tuple where FirstFixed is the +

If the table has been fixed using + safe_fixtable/2, + the call returns a tuple where FixationTime is the time when the table was first fixed by a process, which may or may not be one of the processes it is fixed by right now.

+

The format and value of FixationTime depends on + Item:

+ + safe_fixed +

FixationTime will correspond to the result + returned by + erlang:timestamp/0 + at the time of fixation. Note that when the system is using + single or multi + time warp + modes this might produce strange results. This + since the usage of safe_fixed is not + time warp + safe. Time warp safe code need to use + safe_fixed_monotonic_time instead.

 + + safe_fixed_monotonic_time +

FixationTime will correspond to the result + returned by + erlang:monotonic_time/0 + at the time of fixation. The usage of safe_fixed_monotonic_time is + time warp + safe.

 +

Info is a possibly empty lists of tuples {Pid,RefCount}, one tuple for every process the table is fixed by right now. RefCount is the value @@ -1135,9 +1160,11 @@ clean_all_with_value(Tab,X,Key) -> table but never releases it, the memory used by the deleted objects will never be freed. The performance of operations on the table will also degrade significantly.

-

Use info/2 to retrieve information about which - processes have fixed which tables. A system with a lot of - processes fixing tables may need a monitor which sends alarms +

Use + info(Tab, + safe_fixed_monotonic_time) to retrieve information + about which processes have fixed which tables. A system with a lot + of processes fixing tables may need a monitor which sends alarms when tables have been fixed for too long.

Note that for tables of the ordered_set type, safe_fixtable/2 is not necessary as calls to -- cgit v1.2.3 From 264a5e804d6e23bf6c6916887669760cbf243caa Mon Sep 17 00:00:00 2001 From: Rory Byrne Date: Thu, 28 May 2015 19:41:25 +0100 Subject: Speed up supervisor:count_children/1; simple_one_for_one Speed up supervisor:count_children/1 for simple_one_for_one supervisors. This is achieved by avoiding looping through all the child process and verifying that each one is alive. For a supervisor with 100,000 'temporary' children the count-time will drop from approx 25ms to about 0.005ms. For a supervisor with 100,000 'permanent' or 'transient' children the count-time will drop from approx 30ms to about 0.005ms. This avoids having the supervisor block for an extended period while the count takes place. Under normal circumstances the accuracy of the result should also improve since the duration is too short for many processes to die during the count. --- lib/stdlib/doc/src/supervisor.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 24ff251ce3..815bf4a489 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -543,7 +543,10 @@

active - the count of all actively running child processes - managed by this supervisor.

+ managed by this supervisor. In the case of simple_one_for_one + supervisors, no check is carried out to ensure that each child process + is still alive, though the result provided here is likely to be very + accurate unless the supervisor is heavily overloaded.

supervisors - the count of all children marked as -- cgit v1.2.3 From 6ace96d3e5c9ac8ace3d8967bcafb3e6a081d9be Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Mon, 26 Oct 2015 11:52:17 +0100 Subject: New state machine --- lib/stdlib/doc/src/Makefile | 3 +- lib/stdlib/doc/src/gen_statem.xml | 1131 +++++++++++++++++++++++++++++++++++++ lib/stdlib/doc/src/ref_man.xml | 3 +- lib/stdlib/doc/src/specs.xml | 1 + 4 files changed, 1136 insertions(+), 2 deletions(-) create mode 100644 lib/stdlib/doc/src/gen_statem.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/Makefile b/lib/stdlib/doc/src/Makefile index 196c86748f..26602764a6 100644 --- a/lib/stdlib/doc/src/Makefile +++ b/lib/stdlib/doc/src/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2015. All Rights Reserved. +# Copyright Ericsson AB 1997-2016. All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -68,6 +68,7 @@ XML_REF3_FILES = \ gen_event.xml \ gen_fsm.xml \ gen_server.xml \ + gen_statem.xml \ io.xml \ io_lib.xml \ lib.xml \ diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml new file mode 100644 index 0000000000..885021f61c --- /dev/null +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -0,0 +1,1131 @@ + + + + +

+ + 2016 + Ericsson AB. All Rights Reserved. + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + gen_statem + + + + +
+ gen_statem + Generic State Machine Behaviour + +

A behaviour module for implementing a state machine, primarily + a finite state machine, but an infinite state space is possible. + A generic state machine process (gen_statem) implemented using + this module will have a standard set of interface functions + and include functionality for tracing and error reporting. + It will also fit into an OTP supervision tree. Refer to + + OTP Design Principles for more information. +

+

A gen_statem assumes all specific parts to be located in a + callback module exporting a pre-defined set of functions. + The relationship between the behaviour functions and the callback + functions can be illustrated as follows:

+ 
+gen_statem module            Callback module
+-----------------            ---------------
+gen_statem:start
+gen_statem:start_link -----> Module:init/1
+
+gen_statem:stop       -----> Module:terminate/2
+
+gen_statem:call
+gen_statem:cast
+erlang:send
+erlang:'!'            -----> Module:State/5
+                             Module:handle_event/5
+
+-                     -----> Module:terminate/3
+
+-                     -----> Module:code_change/3
+

Events are of different + types + so the callback functions can know the origin of an event + and how to respond. +

+

If a callback function fails or returns a bad value, + the gen_statem will terminate. An exception of class + throw, + however, is not regarded as an error but as a valid return. +

+ +

The "state function" for a specific + state + in a gen_statem is the callback function that is called + for all events in this state. + An event can can be postponed causing it to be retried + after the state has changed, or more precisely; + after a state change all postponed events are retried + in the new state. +

+

The state machine + State + is normally an atom in which case the + state function + that will be called is + Module:State/5. + For a + State + that is not an atom the + state function + + Module:handle_event/5 + will be called. + If you use handle_event as a + state and later + decides to use non-atom states you will then have to + rewrite your code to stop using that state. +

+

When the using an atom-only + State + it becomes fairly obvious in the implementation code + which events are handled in which state + since there are different callback functions for different states. +

+

+ When using a non-atom State + all events are handled in the callback function + + Module:handle_event/5 + + so it may require more coding discipline to ensure what events + are handled in which state. Therefore it might be a wee bit + easier to accidentally postpone an event in two or more states + and not handling it in any of them causing a tight infinite + loop when the event bounces to be retried between the states. +

+

A gen_statem handles system messages as documented in + sys. + The sys module + can be used for debugging a gen_statem. +

+

Note that a gen_statem does not trap exit signals automatically, + this must be explicitly initiated by the callback module. +

+

Unless otherwise stated, all functions in this module fail if + the specified gen_statem does not exist or if bad arguments are given. +

+

The gen_statem process can go into hibernation (see + + erlang:hibernate/3 + ) if a + state function or + Module:init/1 + specifies 'hibernate' in the returned + StateOps list. + This might be useful if the server is expected to be idle + for a long time. However use this feature with care + since hibernation implies at least two garbage collections + (when hibernating and shortly after waking up) and that is not + something you'd want to do between each event on a busy server. +

+ + + + + + +

Name specification to use when starting a gen_statem server. + See + start_link/3 + and + + server_ref() + below. +

+ + + + + +

Server specification to use when addressing a gen_statem server. + See call/2 and + + server_name() + above. +

+

It can be:

+ + the pid(), + Name, + if the gen_statem is locally registered, + + {Name,Node}, + if the gen_statem is locally registered at another node, or + + {global,GlobalName}, + if the gen_statem is globally registered. + + {via,RegMod,ViaName}, + if the gen_statem is registered through + an alternative process registry. + The registry callback module RegMod + should export the functions + register_name/2, unregister_name/1, + whereis_name/1 and send/2, + which should behave like the corresponding functions + in global. + Thus, {via,global,GlobalName} is the same as + {global,GlobalName}. + + + + + + + +

Debug option that can be used when starting + a gen_statem server through for example + enter_loop/4. +

+

For every entry in Dbgs + the corresponding function in + sys will be called. +

+ + + + + +

Options that can be used when starting + a gen_statem server through for example + start_link/3. +

+ + + + + +

Return value from the start functions for_example + start_link/3. +

+ + + + + + +

Client address to use when replying through for example the + state_op() + {reply,Client,Reply} to a client + that has called the gen_statem server using + call/2. +

+ + + + + +

If the gen_statem State is an atom(), the + state function is + Module:State/5. + If it is any other term() the + state function is + + Module:handle_event/5 + . After a state change (NewState =/= State) + all postponed events are retried. +

+ + + + + +

A term() in which the state machine implementation + should store any state data it needs. The difference between + this data and the + state() + itself is that a change in this data does not cause + postponed events to be retried. +

+ + + + + +

External events are of 3 different type: + {call,Client}, cast or info. + Calls (synchronous) and casts (asynchronous) + originate from the corresponding API functions. + For calls the event contain whom to reply to. + Type info originates from normal messages sent + to the gen_statem process. + It is also possible for the state machine + implementation to insert events to itself, + in particular of types + timeout and internal. +

+ + + + + +

A fun() of arity 2 that takes an event + and returns a boolean. + When used in {remove_event,RemoveEventPredicate} + from state_op(). + The event for which the predicate returns true will + be removed. +

+

+ The predicate may not use a throw exception + to return its result. +

+ + + + + +

Either a + + state_option() + of which the first occurence + in the containing list takes precedence, or a + + state_operation() + that are performed in order of + the containing list. +

+

These may be returned from the + state function + or from Module:init/1. +

+

The gen_statem enqueues postponed events and + not yet processed events in order of arrival, except for + an event that a callback function inserts with + {insert_event,EventType,EventContent} that is inserted + as the next event to process. +

+

When the state machine changes states all enqueued events + becomes not yet processed to be processed before the old + not yet processed events. In other words; the order of arrival + is retained. +

+

The processing order is:

+ + If the option retry is true + the current event is enqueued as postponed to be retried. + + If the state changes all postponed events + are transferred to not yet processed to be processed + before other not yet processed events. + + All operations are processed in order of appearance. + + The timeout option is processed if present. + So a state timer may be started or a timeout zero event + may be inserted as if just received. + + The (possibly new) + state function + is called with the next not yet processed event + if there is any, otherwise the gen_statem goes into receive + or hibernation (if the option hibernate is true) + to wait for the next message. In hibernation the next + non-system event awakens the gen_statem. + + + + + + + + + retry + {retry,Retry} + If Retry =:= true + or plain retry postpone the current event + to be retried after a state change. + + hibernate + {hibernate,Hibernate} + If Hibernate =:= true + or plain hibernate hibernate the gen_statem by calling + + proc_lib:hibernate/3 + before receive to wait for a new event. + If there are not yet processed events the + hibernate operation is ignored as if an event + just arrived and awakened the gen_statem. + + + {timeout,Time,Msg} + + Generate an event of + type timeout + after Time milliseconds unless some other + event is received before that time. Note that a retried + event counts just like a new in this respect. + If Time =:= infinity or Time =:= 0 + no timer is started but for zero time the timeout + event is enqued as just received after all + other already received events. + Also note that it is not possible + to cancel this timeout using the + + state_operation() + cancel_timer. + This timeout is cancelled automatically by any event. + + + + + + + + + + {reply,Client,Reply} + + Reply to a client that called + call/2. + Client must be the term from the + + {call,Client} + argument to the + state function. + + {stop,Reason} + The gen_statem will call + + Module:terminate/3 + with Reason and terminate. + + + + {insert_event,EventType,EventContent} + + + Insert the given event as the next to process + before any other not yet processed events. + An event of type + + internal + should be used when you want to reliably distinguish + an event inserted this way from any external event. + + + + {remove_event,EventType,EventContent} + + + Remove the oldest queued event + that matches equal to the given event. + + + + {remove_event,EventPredicate} + + + Remove the oldest queued event for which + the EventPredicate returns true. + + {cancel_timer,TimerRef} + Uses TimerRef when calling + + erlang:cancel_timer/2 + to cancel a timer, cleans the gen_statem's + message queue from any late timeout message from + the timer, and removes any late timeout message + from the queued events using + {remove_event,EventPredicate} above. + This is a convenience function that saves quite some + lines of code and testing time over doing it from + the primitives mentioned above. + + {demonitor,MonitorRef} + Like {cancel_timer,_} above but for + + demonitor/2 + . + + {unlink,Id} + Like {cancel_timer,_} above but for + + unlink/1 + . + + + + + + + + + + + + Create a linked gen_statem process + +

Creates a gen_statem process according to OTP design principles + (using + proc_lib + primitives) + that is linked to the calling process. + This is essential when the gen_statem shall be part of + a supervision tree so it gets linked to its supervisor. +

+

The gen_statem process calls + Module:init/1 + to initialize the server. To ensure a synchronized start-up + procedure, start_link/3,4 does not return until + Module:init/1 + has returned. +

+

ServerName specifies the + + server_name() + to register for the gen_statem. + If the gen_statem is started with start_link/3 + no ServerName is provided and + the gen_statem is not registered. +

+

Module is the name of the callback module.

+

Args is an arbitrary term which is passed as + the argument to + Module:init/1 + . +

+

If the option {timeout,Time} is present in + Options, the gen_statem is allowed to spend + Time milliseconds initializing or it will be + terminated and the start function will return + + {error,timeout} + . +

+

If the option + {debug,Dbgs} + is present in Options, debugging through + sys is activated. +

+

If the option {spawn_opt,SOpts} is present in + Options, SOpts will be passed + as option list to the spawn_opt BIF + which is used to + spawn + the gen_statem. +

+ +

Using the spawn option monitor is currently not + allowed, but will cause this function to fail with reason + badarg.

+ +

If the gen_statem is successfully created and initialized + this function returns + + {ok,Pid}, + where Pid is the pid() of the gen_statem. + If there already exists a process with the specified + ServerName this function returns + + {error,{already_started,Pid}} + , where Pid is the pid() of that process. +

+

If Module:init/1 fails with Reason, + this function returns + + {error,Reason} + . If Module:init/1 returns + + {stop,Reason} + + or + + ignore + , the process is terminated and this function + returns + + {error,Reason} + or + + ignore + , respectively. +

+ + + + + + + + Create a stand-alone gen_statem process + +

Creates a stand-alone gen_statem process according to + OTP design principles (using + proc_lib + primitives). + Since it does not get linked to the calling process + this start function can not be used by a supervisor + to start a child. +

+

See start_link/3,4 + for a description of arguments and return values. +

+ + + + + + Synchronously stop a generic server + +

The same as + + stop(ServerRef, normal, infinity) + . +

+ + + + + Synchronously stop a generic server + +

Orders the gen_statem + + ServerRef + to exit with the given Reason + and waits for it to terminate. + The gen_statem will call + + Module:terminate/3 + before exiting. +

+

This function returns ok if the server terminates + with the expected reason. Any other reason than normal, + shutdown, or {shutdown,Term} will cause an + error report to be issued through + + error_logger:format/2 + . + The default Reason is normal. +

+

Timeout is an integer greater than zero + which specifies how many milliseconds to wait for the server to + terminate, or the atom infinity to wait indefinitely. + The default value is infinity. + If the server has not terminated within the specified time, + a timeout exception is raised. +

+

If the process does not exist, a noproc exception + is raised. +

+ + + + + + + Make a synchronous call to a gen_statem + +

Makes a synchronous call to the gen_statem + + ServerRef + by sending a request + and waiting until its reply arrives. + The gen_statem will call the + state function with + event_type() + {call,Client} and event content + Request. +

+

A Reply is generated when a + state function + returns with + {reply,Client,Reply} as one + state_op(), + and that Reply becomes the return value + of this function. +

+

Timeout is an integer greater than zero + which specifies how many milliseconds to wait for a reply, + or the atom infinity to wait indefinitely, + which is the default. If no reply is received within + the specified time, the function call fails. + +

To avoid getting a late reply in the caller's + inbox this function spawns a proxy process that + does the call. A late reply gets delivered to the + dead proxy process hence gets discarded. This is + less efficient than using + Timeout =:= infinity. +

+ +

+

The call may fail for example if the gen_statem dies + before or during this function call. +

+ + + + + + Send an asynchronous event to a gen_statem + +

Sends an asynchronous event to the gen_statem + + ServerRef + and returns ok immediately, + ignoring if the destination node or gen_statem does not exist. + The gen_statem will call the + state function with + event_type() + cast and event content + Msg. +

+ + + + + + Send a reply to a client + +

This function can be used by a gen_statem to explicitly send + a reply to a client that called + call/2 + when the reply cannot be defined in + the return value of the + state function. +

+

Client must be the term from the + + {call,Client} + argument to the + state function. +

+ +

A reply sent with this function will not be visible + in sys debug output. +

+ + + + + + + Enter the gen_statem receive loop + +

The same as + enter_loop/6 + except that no + + server_name() + must have been registered. +

+ + + + + Enter the gen_statem receive loop + +

If Server_or_StateOps is a list() + the same as + enter_loop/6 + except that no + + server_name() + must have been registered and + StateOps = Server_or_StateOps. +

+

Otherwise the same as + enter_loop/6 + with + Server = Server_or_StateOps and + StateOps = []. +

+ + + + + Enter the gen_statem receive loop + +

Makes an the calling process become a gen_statem. Does not return, + instead the calling process will enter the gen_statem receive + loop and become a gen_statem server. The process + must have been started using one of the start + functions in + proc_lib. + The user is responsible for any initialization of the process, + including registering a name for it. +

+

This function is useful when a more complex initialization + procedure is needed than the gen_statem behaviour provides. +

+

Module, Options and + Server have the same meanings + as when calling + gen_statem:start[_link]/3,4. + However, the + + server_name() + name must have been registered accordingly + before this function is called.

+

State and StateData + have the same meanings as in the return value of + Module:init/1. + Also, the callback module Module + does not need to export an init/1 function. +

+

Failure: If the calling process was not started by a + proc_lib + start function, or if it is not registered + according to + + server_name() + . +

+ + + + + + + +
+ CALLBACK FUNCTIONS +

The following functions should be exported from a + gen_statem callback module. +

+
+ + + + Module:init(Args) -> Result + Initialize process and internal state + + Args = term() + Result = {ok,State,StateData} +  | {ok,State,StateData,StateOps} +  | {stop,Reason} | ignore + State = state() + StateData = state_data() + StateOps = [state_op()] + Reason = term() + + + +

Whenever a gen_statem is started using + gen_statem:start_link/3,4 + or + gen_statem:start/3,4, + this function is called by the new process to initialize + the implementation loop data. +

+

Args is the Args argument provided to the start + function.

+

If the initialization is successful, the function should + return {ok,State,StateData} or + {ok,State,StateData,StateOps}. + State is the state + of the gen_statem. +

+

The StateOps + are executed before entering the first + state just as for a + state function. +

+

If something goes wrong during the initialization + the function should return {stop,Reason} + or ignore. See + gen_statem:start_link/3,4. +

+ + + + + Module:handle_event(EventType, EventContent, + PrevState, State, StateData) -> Result + + Module:State(EventType, EventContent, + PrevState, State, StateData) -> Result + + Handle an event + + EventType = + event_type() + + EventContent = term() + Result = {NewState,NewStateData,StateOps} +   | {NewState,NewStateData} +   The same as {NewState,NewStateData,[]} +   | {NewStateData} +   The same as {State,NewStateData,[retry]} +   | {} +   The same as {State,StateData,[]} +   | StateOps +   The same as {State,StateData,StateOps} + + PrevState = State = NewState = + state() + + StateData = NewStateData = + state_data() + + StateOps = + [state_op()] + + + +

Whenever a gen_statem receives an event from + gen_statem:call/2, + gen_statem:cast/2 or + as a normal process message this function is called. + If the EventType is + {call,Client} + the client is waiting for a reply. The reply can be sent + from this or from any other + state function + by returning with {reply,Client,Reply} in + StateOps + or by calling + + gen_statem:reply(Client, Reply) + . +

+

State + is the internal state of the gen_statem which + when State is an atom() + is the same as this function's name, so it is seldom useful, + except for example when comparing with PrevState + that is the gen_statem's previous state, or in + + Module:handle_event/5 + since that function is common for all states + that are not an atom(). +

+

If this function returns with + NewState =/= State + all postponed events will be retried in the new state. +

+

See state_op() + for the operations that can be done by gen_statem + after returning from this function. +

+ + + + + Module:terminate(Reason, State, StateData) + Clean up before termination + + Reason = normal | shutdown | {shutdown,term()} | term() + State = state() + StateData = + + state_data() + + + + +

This function is called by a gen_statem when it is about to + terminate. It should be the opposite of + Module:init/1 + and do any necessary cleaning up. When it returns, + the gen_statem terminates with Reason. The return + value is ignored.

+

Reason is a term denoting the stop reason and + State + is the internal state of the gen_statem. +

+

Reason depends on why the gen_statem is terminating. + If it is because another callback function has returned a + stop tuple {stop,Reason} in + StateOps, + Reason will have the value specified in that tuple. + If it is due to a failure, Reason is the error reason. +

+

If the gen_statem is part of a supervision tree and is + ordered by its supervisor to terminate, this function will be + called with Reason = shutdown if the following + conditions apply:

+ + the gen_statem has been set to trap exit signals, and + the shutdown strategy as defined in the supervisor's + child specification is an integer timeout value, not + brutal_kill. + + +

Even if the gen_statem is not part of a supervision tree, + this function will be called if it receives an 'EXIT' + message from its parent. Reason will be the same as in + the 'EXIT' message. +

+

Otherwise, the gen_statem will be immediately terminated. +

+

Note that for any other reason than normal, + shutdown, or {shutdown,Term} the gen_statem is + assumed to terminate due to an error and + an error report is issued using + + error_logger:format/2 + . +

+ + + + + Module:code_change(OldVsn, OldState, OldStateData, Extra) -> + Result + + Update the internal state during upgrade/downgrade + + OldVsn = Vsn | {down,Vsn} +   Vsn = term() + OldState = NewState = term() + Extra = term() + Result = {ok,{NewState,NewStateData}} | Reason + OldState = NewState = + state() + + OldStateData = NewStateData = + state_data() + + Reason = term() + + +

This function is called by a gen_statem when it should + update its internal state during a release upgrade/downgrade, + i.e. when the instruction {update,Module,Change,...} + where Change={advanced,Extra} is given in + the appup file. See + + OTP Design Principles + + for more information. +

+

In the case of an upgrade, OldVsn is Vsn, and + in the case of a downgrade, OldVsn is + {down,Vsn}. Vsn is defined by the vsn + attribute(s) of the old version of the callback module + Module. If no such attribute is defined, the version + is the checksum of the BEAM file. +

+

OldState and OldStateData is the internal state + of the gen_statem. +

+

Extra is passed as-is from the {advanced,Extra} + part of the update instruction. +

+

If successful, the function shall return the updated + internal state in an + {ok,{NewState,NewStateData}} tuple. +

+

If the function returns Reason, the ongoing + upgrade will fail and roll back to the old release.

+ + + + + Module:format_status(Opt, [PDict,State,StateData]) -> + Status + + Optional function for providing a term describing the + current gen_statem status + + Opt = normal | terminate + PDict = [{Key, Value}] + State = + state() + + StateData = + state_data() + + Key = term() + Value = term() + Status = term() + + + +

This callback is optional, so callback modules need not + export it. The gen_statem module provides a default + implementation of this function that returns the callback + module state. +

+ +

This function is called by a gen_statem process when:

+ + One of + + sys:get_status/1,2 + + is invoked to get the gen_statem status. Opt is set + to the atom normal for this case. + + The gen_statem terminates abnormally and logs an error. + Opt is set to the atom terminate for this case. + + +

This function is useful for customising the form and + appearance of the gen_statem status for these cases. A + callback module wishing to customise the + + sys:get_status/1,2 + return value as well as how + its status appears in termination error logs exports an + instance of format_status/2 that returns a term + describing the current status of the gen_statem. +

+

PDict is the current value of the gen_statem's + process dictionary. +

+

State + is the internal state of the gen_statem. +

+

The function should return Status, a term that + customises the details of the current state and status of + the gen_statem. There are no restrictions on the + form Status can take, but for the + + sys:get_status/1,2 + case (when Opt + is normal), the recommended form for + the Status value is [{data, [{"State", + Term}]}] where Term provides relevant details of + the gen_statem state. Following this recommendation isn't + required, but doing so will make the callback module status + consistent with the rest of the + + sys:get_status/1,2 + return value. +

+

One use for this function is to return compact alternative + state representations to avoid having large state terms + printed in logfiles. +

+ + + + + +
+ SEE ALSO +

gen_event, + gen_fsm, + gen_server, + supervisor, + proc_lib, + sys

+
+ diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index 82ad78e675..404873ea32 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -4,7 +4,7 @@
- 19962015 + 19962016 Ericsson AB. All Rights Reserved. @@ -66,6 +66,7 @@ + diff --git a/lib/stdlib/doc/src/specs.xml b/lib/stdlib/doc/src/specs.xml index 0418bf7b22..45b207b13d 100644 --- a/lib/stdlib/doc/src/specs.xml +++ b/lib/stdlib/doc/src/specs.xml @@ -30,6 +30,7 @@ + -- cgit v1.2.3 From a07f6e35c3adb6e1536a63cc8137f48f64e2f6f7 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 9 Feb 2016 11:45:55 +0100 Subject: Correct grammar errors found by Magnus Henoch --- lib/stdlib/doc/src/gen_statem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 885021f61c..83d1f1e9e6 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -96,10 +96,10 @@ erlang:'!' -----> Module:State/5 will be called. If you use handle_event as a state and later - decides to use non-atom states you will then have to + decide to use non-atom states you will then have to rewrite your code to stop using that state.

-

When the using an atom-only +

When using an atom-only State it becomes fairly obvious in the implementation code which events are handled in which state -- cgit v1.2.3 From 3815de0c7337058991066454c246587c0dbaa664 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 16 Feb 2016 10:51:39 +0100 Subject: Change to {next_state,...} and {stop,...} return format --- lib/stdlib/doc/src/gen_statem.xml | 75 ++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 28 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 83d1f1e9e6..f7ce0f61ae 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -397,23 +397,6 @@ erlang:'!' -----> Module:State/5 - - {reply,Client,Reply} - - Reply to a client that called - call/2. - Client must be the term from the - - {call,Client} - argument to the - state function. - - {stop,Reason} - The gen_statem will call - - Module:terminate/3 - with Reason and terminate. - {insert_event,EventType,EventContent} @@ -471,6 +454,24 @@ erlang:'!' -----> Module:State/5 + + + + + + {reply,Client,Reply} + + Reply to a client that called + call/2. + Client must be the term from the + + {call,Client} + argument to the + state function. + + + + @@ -867,22 +868,39 @@ erlang:'!' -----> Module:State/5 event_type() EventContent = term() - Result = {NewState,NewStateData,StateOps} -   | {NewState,NewStateData} -   The same as {NewState,NewStateData,[]} -   | {NewStateData} -   The same as {State,NewStateData,[retry]} -   | {} -   The same as {State,StateData,[]} -   | StateOps -   The same as {State,StateData,StateOps} - + Result = {stop,Reason,NewStateData} +   The same as {stop,Reason,[],NewStateData} +   | {stop,Reason,Reply,NewStateData} +   The same as + {stop,Reason,[Reply],NewStateData} + +   | {stop,Reason,Replies,NewStateData} +   The gen_statem will first send all + Replies and then call + + Module:terminate/3 + with Reason and terminate. + +   | {next_state,NewState,NewStateData} +   The same as + {next_state,NewState,NewStateData,NewStateData,[]} + +   | {next_state,NewState,NewStateData,StateOps} +   The gen_statem will do a state transition to + NewState (which may be the same as State) + and execute all StateOps + + Reason = term() PrevState = State = NewState = state() StateData = NewStateData = state_data() + Reply = + reply_operation() + + Replies = [Reply] StateOps = [state_op()] @@ -898,7 +916,8 @@ erlang:'!' -----> Module:State/5 from this or from any other state function by returning with {reply,Client,Reply} in - StateOps + StateOps, in + Replies or by calling gen_statem:reply(Client, Reply) -- cgit v1.2.3 From 99d48f5921f95073c8e46280494746b0e1a2c375 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 16 Feb 2016 17:54:15 +0100 Subject: Implement option callback_mode --- lib/stdlib/doc/src/gen_statem.xml | 272 ++++++++++++++++++++++++-------------- 1 file changed, 172 insertions(+), 100 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index f7ce0f61ae..f608e10469 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -31,8 +31,15 @@ gen_statem Generic State Machine Behaviour -

A behaviour module for implementing a state machine, primarily - a finite state machine, but an infinite state space is possible. +

A behaviour module for implementing a state machine. + Two callback modes are supported. One for a finite state + machine like gen_fsm + that require the state to be an atom and use that state as + the name of the callback function for a particular state, + and one without restriction on the state that use the same + callback function for all states. +

+

A generic state machine process (gen_statem) implemented using this module will have a standard set of interface functions and include functionality for tracing and error reporting. @@ -55,7 +62,7 @@ gen_statem:stop -----> Module:terminate/2 gen_statem:call gen_statem:cast erlang:send -erlang:'!' -----> Module:State/5 +erlang:'!' -----> Module:StateName/5 Module:handle_event/5 - -----> Module:terminate/3 @@ -75,47 +82,39 @@ erlang:'!' -----> Module:State/5

The "state function" for a specific state in a gen_statem is the callback function that is called - for all events in this state. - An event can can be postponed causing it to be retried - after the state has changed, or more precisely; - after a state change all postponed events are retried - in the new state. + for all events in this state, and is selected depending on + callback_mode + that the implementation selects during gen_statem init.

-

The state machine - State - is normally an atom in which case the - state function - that will be called is - Module:State/5. - For a - State - that is not an atom the - state function - - Module:handle_event/5 - will be called. - If you use handle_event as a - state and later - decide to use non-atom states you will then have to - rewrite your code to stop using that state. +

When + callback_mode + is state_functions the state has to be an atom and + is used as the state function name. + See + + Module:StateName/5 + . + This naturally collects all code for a specific state + in one function and hence dispatches on state first.

-

When using an atom-only - State - it becomes fairly obvious in the implementation code - which events are handled in which state - since there are different callback functions for different states. +

When + callback_mode + is handle_event_function the state can be any term + and the state function name is + + Module:handle_event/5 + . + This makes it easy to dispatch on state or on event as + you like but you will have to implement it. + Also be careful about which events you handle in which + states so you do not accidentally postpone one event + forever creating an infinite busy loop.

- When using a non-atom State - all events are handled in the callback function - - Module:handle_event/5 - - so it may require more coding discipline to ensure what events - are handled in which state. Therefore it might be a wee bit - easier to accidentally postpone an event in two or more states - and not handling it in any of them causing a tight infinite - loop when the event bounces to be retried between the states. + An event can can be postponed causing it to be retried + after the state has changed, or more precisely; + after a state change all postponed events are retried + in the new state.

A gen_statem handles system messages as documented in sys. @@ -239,18 +238,22 @@ erlang:'!' -----> Module:State/5 -

If the gen_statem State is an atom(), the - state function is - Module:State/5. - If it is any other term() the - state function is - - Module:handle_event/5 - . After a state change (NewState =/= State) +

After a state change (NewState =/= State) all postponed events are retried.

+ + + +

If + + callback_mode + is state_functions, which is the default, + the state has to be of this type i.e an atom(). +

+ + @@ -296,6 +299,33 @@ erlang:'!' -----> Module:State/5

+ + + +

Option that only is valid when initializing the gen_statem

+ + + + + + + state_functions + The state has to be of type + state_name() + and one callback function per state that is + + Module:StateName/5 + is used. This is the default. + + handle_event_function + The state can be any term and the callback function + + Module:handle_event/5 + is used for all states. + + + + @@ -472,6 +502,53 @@ erlang:'!' -----> Module:State/5 + + + + + + {stop,Reason,NewStateData} + + The same as + {stop,Reason,[],NewStateData} + + {stop, + Reason, + Replies, + NewStateData} + + The gen_statem will first send all + Replies and then terminate by calling + + Module:terminate/3 + with Reason. + + + + {next_state,NewState,NewStateData} + + + The same as + + {next_state,NewState,NewStateData,[]} + + + + + {next_state, + NewState, + NewStateData, + StateOps} + + + The gen_statem will do a state transition to + NewState + (which may be the same as State) + and execute all StateOps + + + + @@ -777,13 +854,16 @@ erlang:'!' -----> Module:State/5

Module, Options and Server have the same meanings as when calling - gen_statem:start[_link]/3,4. + + gen_statem:start[_link]/3,4 + . However, the server_name() name must have been registered accordingly before this function is called.

-

State and StateData +

State, StateData + and StateOps have the same meanings as in the return value of Module:init/1. Also, the callback module Module @@ -821,8 +901,13 @@ erlang:'!' -----> Module:State/5  | {ok,State,StateData,StateOps}  | {stop,Reason} | ignore State = state() - StateData = state_data() - StateOps = [state_op()] + StateData = + state_data() + + StateOps = + [state_op() + | init_option()] + Reason = term() @@ -843,10 +928,15 @@ erlang:'!' -----> Module:State/5 of the gen_statem.

The StateOps - are executed before entering the first + are executed when entering the first state just as for a state function.

+

This function allows an option to select the callback mode + of the gen_statem. See + init_option. + This option is not allowed from the state function(s). +

If something goes wrong during the initialization the function should return {stop,Reason} or ignore. See @@ -856,10 +946,10 @@ erlang:'!' -----> Module:State/5 - Module:handle_event(EventType, EventContent, - PrevState, State, StateData) -> Result + Module:StateName(EventType, EventContent, + PrevStateName, StateName, StateData) -> Result - Module:State(EventType, EventContent, + Module:handle_event(EventType, EventContent, PrevState, State, StateData) -> Result Handle an event @@ -868,41 +958,23 @@ erlang:'!' -----> Module:State/5 event_type() EventContent = term() - Result = {stop,Reason,NewStateData} -   The same as {stop,Reason,[],NewStateData} -   | {stop,Reason,Reply,NewStateData} -   The same as - {stop,Reason,[Reply],NewStateData} - -   | {stop,Reason,Replies,NewStateData} -   The gen_statem will first send all - Replies and then call - - Module:terminate/3 - with Reason and terminate. - -   | {next_state,NewState,NewStateData} -   The same as - {next_state,NewState,NewStateData,NewStateData,[]} - -   | {next_state,NewState,NewStateData,StateOps} -   The gen_statem will do a state transition to - NewState (which may be the same as State) - and execute all StateOps - - Reason = term() - PrevState = State = NewState = + PrevStateName = + state_name() + | reference() + + StateName = + state_name() + + PrevState = State = state() StateData = NewStateData = state_data() - Reply = - reply_operation() - - Replies = [Reply] - StateOps = - [state_op()] + Result = + + state_callback_result() + @@ -923,19 +995,18 @@ erlang:'!' -----> Module:State/5 gen_statem:reply(Client, Reply) .

-

State - is the internal state of the gen_statem which - when State is an atom() - is the same as this function's name, so it is seldom useful, - except for example when comparing with PrevState - that is the gen_statem's previous state, or in - - Module:handle_event/5 - since that function is common for all states - that are not an atom(). -

-

If this function returns with - NewState =/= State +

StateName is rarely useful. One exception is if + you call a common event handling function from your state + function then you might want to pass StateName. +

+

PrevStateName and PrevState are rarely useful. + They can be used when you want to do something only at the + first event in a state. Note that when gen_statem enters + its first state this is set to a reference() since + that can not match the state. +

+

If this function returns with a new state that + does not match equal (=/=) to the current state all postponed events will be retried in the new state.

See state_op() @@ -946,7 +1017,7 @@ erlang:'!' -----> Module:State/5 - Module:terminate(Reason, State, StateData) + Module:terminate(Reason, State, StateData) -> Ignored Clean up before termination Reason = normal | shutdown | {shutdown,term()} | term() @@ -956,6 +1027,7 @@ erlang:'!' -----> Module:State/5 state_data() + Ignored = term()

This function is called by a gen_statem when it is about to -- cgit v1.2.3 From 972a8fcb57a64c9a0dc7587e9072c15758e36da2 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 18 Feb 2016 10:22:50 +0100 Subject: Rename insert_event -> next_event --- lib/stdlib/doc/src/gen_statem.xml | 130 ++++++++++++++++++++++++-------------- 1 file changed, 83 insertions(+), 47 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index f608e10469..5de1812b41 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -110,11 +110,28 @@ erlang:'!' -----> Module:StateName/5 states so you do not accidentally postpone one event forever creating an infinite busy loop.

-

- An event can can be postponed causing it to be retried - after the state has changed, or more precisely; - after a state change all postponed events are retried - in the new state. +

The gen_statem enqueues incoming events in order of arrival + and presents these to the + state function + in that order. The state function can postpone an event + so it is not retried in the current state. + After a state change all enqueued events (including postponed) + are again presented to the state function. +

+

The + state function + can insert events using the + + state_operation() next_event + + and such an event is inserted as the next to present + to the state function. That is: as if it is + the oldest incoming event. There is a dedicated + + event_type() internal + + that can be used for such events making it impossible + to mistake for an external event.

A gen_statem handles system messages as documented in sys. @@ -302,7 +319,12 @@ erlang:'!' -----> Module:StateName/5 -

Option that only is valid when initializing the gen_statem

+

Option that only is valid when initializing the gen_statem + that is it can be returned from + Module:init/1 + or given to + enter_loop/5,6. +

@@ -332,7 +354,7 @@ erlang:'!' -----> Module:StateName/5

Either a state_option() - of which the first occurence + of which the last occurence in the containing list takes precedence, or a state_operation() @@ -340,42 +362,34 @@ erlang:'!' -----> Module:StateName/5 the containing list.

These may be returned from the - state function - or from Module:init/1. -

-

The gen_statem enqueues postponed events and - not yet processed events in order of arrival, except for - an event that a callback function inserts with - {insert_event,EventType,EventContent} that is inserted - as the next event to process. + state function, + from Module:init/1 + or given to + enter_loop/5,6.

-

When the state machine changes states all enqueued events - becomes not yet processed to be processed before the old - not yet processed events. In other words; the order of arrival - is retained. -

-

The processing order is:

+

The processing order for a state change is:

If the option retry is true - the current event is enqueued as postponed to be retried. + the current event is postponed. - If the state changes all postponed events - are transferred to not yet processed to be processed - before other not yet processed events. + If the state changes the queue of incoming events + is reset to start with the oldest postponed. All operations are processed in order of appearance. - The timeout option is processed if present. - So a state timer may be started or a timeout zero event - may be inserted as if just received. + The timeout option is processed if present, + so a state timer may be started or a timeout zero event + may be enqueued as the newest incoming. The (possibly new) state function - is called with the next not yet processed event - if there is any, otherwise the gen_statem goes into receive + is called with the oldest enqueued event if there is any, + otherwise the gen_statem goes into receive or hibernation (if the option hibernate is true) to wait for the next message. In hibernation the next - non-system event awakens the gen_statem. + non-system event awakens the gen_statem, or rather + the next incoming message awakens the gen_statem but if it + is a system event it goes back into hibernation. @@ -383,12 +397,21 @@ erlang:'!' -----> Module:StateName/5 +

If multiple state options of the same type are present + in the containing list these are set in the list order + and the last value is kept. +

retry {retry,Retry} If Retry =:= true or plain retry postpone the current event to be retried after a state change. + This option is ignored when returned from + Module:init/1 + or given to + enter_loop/5,6 + since there is no event to postpone in those cases. hibernate {hibernate,Hibernate} @@ -397,9 +420,9 @@ erlang:'!' -----> Module:StateName/5 proc_lib:hibernate/3 before receive to wait for a new event. - If there are not yet processed events the - hibernate operation is ignored as if an event - just arrived and awakened the gen_statem. + If there are enqueued events the hibernate operation + is ignored as if an event just arrived and awakened + the gen_statem. {timeout,Time,Msg} @@ -426,14 +449,20 @@ erlang:'!' -----> Module:StateName/5 +

The state operations are executed in the containing + list order. This matters for next_event where + the last one in the list will become the next event to present + to the state functions. Regarding the other operations + it is only for {remove_event,EventPredicate} + that the order may matter. +

- {insert_event,EventType,EventContent} + {next_event,EventType,EventContent} - Insert the given event as the next to process - before any other not yet processed events. + Insert the given event as the next to process. An event of type internal @@ -982,7 +1011,13 @@ erlang:'!' -----> Module:StateName/5 gen_statem:call/2, gen_statem:cast/2 or as a normal process message this function is called. - If the EventType is + If + callback_mode + is state_functions then Module:StateName/5 is called, + and if it is handle_event_function + then Module:handle_event/5 is called. +

+

If EventType is {call,Client} the client is waiting for a reply. The reply can be sent from this or from any other @@ -995,23 +1030,24 @@ erlang:'!' -----> Module:StateName/5 gen_statem:reply(Client, Reply) .

-

StateName is rarely useful. One exception is if - you call a common event handling function from your state +

StateName is useful in some odd cases for example + if you call a common event handling function from your state function then you might want to pass StateName.

-

PrevStateName and PrevState are rarely useful. - They can be used when you want to do something only at the - first event in a state. Note that when gen_statem enters - its first state this is set to a reference() since - that can not match the state. +

PrevStateName and PrevState are useful + in some odd cases for example when you want to do something + only at the first event in a state. + Note that when gen_statem enters its first state + this is set to a reference() + since that can not match equal to any state.

If this function returns with a new state that does not match equal (=/=) to the current state all postponed events will be retried in the new state.

See state_op() - for the operations that can be done by gen_statem - after returning from this function. + for options that can be set and operations that can be done + by gen_statem after returning from this function.

-- cgit v1.2.3 From fdd72bc94149c7e279b5c4fd5a040af1886a4c72 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 18 Feb 2016 11:17:42 +0100 Subject: Rename retry -> postpone --- lib/stdlib/doc/src/gen_statem.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 5de1812b41..aeab09615c 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -369,7 +369,7 @@ erlang:'!' -----> Module:StateName/5

The processing order for a state change is:

- If the option retry is true + If the option postpone is true the current event is postponed. If the state changes the queue of incoming events @@ -402,10 +402,10 @@ erlang:'!' -----> Module:StateName/5 and the last value is kept.

- retry - {retry,Retry} - If Retry =:= true - or plain retry postpone the current event + postpone + {postpone,Postpone} + If Postpone =:= true + or plain postpone postpone the current event to be retried after a state change. This option is ignored when returned from Module:init/1 @@ -434,9 +434,8 @@ erlang:'!' -----> Module:StateName/5 event counts just like a new in this respect. If Time =:= infinity or Time =:= 0 no timer is started but for zero time the timeout - event is enqued as just received after all - other already received events. - Also note that it is not possible + event is immediately enqueued as the newest received. + Also note that it is not possible nor needed to cancel this timeout using the state_operation() -- cgit v1.2.3 From 82f34a7a9de85b4afc0dac4c9c426939264c5039 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 18 Feb 2016 16:06:57 +0100 Subject: Write some convenience helpers --- lib/stdlib/doc/src/gen_statem.xml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index aeab09615c..5fbedb12f8 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -534,6 +534,13 @@ erlang:'!' -----> Module:StateName/5 + + {stop,Reason} + + The same as + {stop,Reason,[],StateData} + but keeps the old StateData. + {stop,Reason,NewStateData} @@ -551,6 +558,19 @@ erlang:'!' -----> Module:StateName/5 Module:terminate/3 with Reason. + + + {next_state,StateOps} + + + The same as + + {next_state,State,StateData,StateOps} + but keeps the old State and StateData. + Believe it or not, but this one has actually + been proven useful to throw/1 from deep down + in the state logic. + {next_state,NewState,NewStateData} @@ -805,6 +825,7 @@ erlang:'!' -----> Module:StateName/5 + Send a reply to a client @@ -820,6 +841,8 @@ erlang:'!' -----> Module:StateName/5 {call,Client} argument to the state function. + Client and Reply + an also be specified using ReplyOperation.

A reply sent with this function will not be visible -- cgit v1.2.3 From 26a7af61fbffae90c0968d945ae8b146582ba068 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 18 Feb 2016 16:38:57 +0100 Subject: Change initial PrevState to 'undefined' --- lib/stdlib/doc/src/gen_statem.xml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 5fbedb12f8..9d98763973 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -110,6 +110,14 @@ erlang:'!' -----> Module:StateName/5 states so you do not accidentally postpone one event forever creating an infinite busy loop.

+

Any state name or any state value (depending on + callback_mode) + is permitted with a small gotcha regarding the state + undefined that is used as the previous state when + the first gen_statem state function is called. + You might need to know about this faked state if you + inspect the previous state argument in your state functions. +

The gen_statem enqueues incoming events in order of arrival and presents these to the state function @@ -118,6 +126,12 @@ erlang:'!' -----> Module:StateName/5 After a state change all enqueued events (including postponed) are again presented to the state function.

+

The gen_statem event queue model is sufficient to emulate + the normal process message queue and selective receive + with postponing an event corresponding to not matching + it in a receive statement and changing states corresponding + to entering a new receive statement. +

The state function can insert events using the @@ -133,6 +147,15 @@ erlang:'!' -----> Module:StateName/5 that can be used for such events making it impossible to mistake for an external event.

+

Inserting an event replaces the trick of calling your own + state handling functions that you often would have to + resort to in e.g gen_fsm + to force processing a faked event before others. + If you for example in gen_statem postpone an event + in one state and then call some other state function of yours, + you have not changed states and hence the postponed event + will not be retried, which is logical but might be confusing. +

A gen_statem handles system messages as documented in sys. The sys module @@ -1011,7 +1034,6 @@ erlang:'!' -----> Module:StateName/5 EventContent = term() PrevStateName = state_name() - | reference() StateName = state_name() @@ -1060,8 +1082,7 @@ erlang:'!' -----> Module:StateName/5 in some odd cases for example when you want to do something only at the first event in a state. Note that when gen_statem enters its first state - this is set to a reference() - since that can not match equal to any state. + this is set to undefined.

If this function returns with a new state that does not match equal (=/=) to the current state -- cgit v1.2.3 From 65767cfc36cf8658b45d68b3c17d4bd612198165 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 09:22:52 +0100 Subject: Add {keep_state,...} and {keep_state_and_data,...} --- lib/stdlib/doc/src/gen_statem.xml | 61 ++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 17 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 9d98763973..f66f399137 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -475,8 +475,9 @@ erlang:'!' -----> Module:StateName/5 list order. This matters for next_event where the last one in the list will become the next event to present to the state functions. Regarding the other operations - it is only for {remove_event,EventPredicate} - that the order may matter. + it is only for remove_event with + EventPredicate + and for reply_operation() that the order may matter.

@@ -581,19 +582,6 @@ erlang:'!' -----> Module:StateName/5 Module:terminate/3 with Reason. - - - {next_state,StateOps} - - - The same as - - {next_state,State,StateData,StateOps} - but keeps the old State and StateData. - Believe it or not, but this one has actually - been proven useful to throw/1 from deep down - in the state logic. - {next_state,NewState,NewStateData} @@ -614,8 +602,47 @@ erlang:'!' -----> Module:StateName/5 The gen_statem will do a state transition to NewState - (which may be the same as State) - and execute all StateOps + (which may be the same as the current state) + and execute all StateOps + + + + {keep_state,NewStateData}} + + + The same as + + {keep_state,NewStateData,[]} + + + + + {keep_state,NewStateData,StateOps} + + + The gen_statem will keep the current state, or + do a state transition to the current state if you like, + and execute all StateOps + + + + {keep_state_and_data} + + + The same as + + {keep_state_and_data,[]} + + + + + {keep_state_and_data,StateOps} + + + The gen_statem will keep the current state, or + do a state transition to the current state if you like, + also keep the current state data, + and execute all StateOps -- cgit v1.2.3 From fc1e649e3613f18dec8514921d0439ddcca73bdb Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 09:39:46 +0100 Subject: Add reply([Reply]) --- lib/stdlib/doc/src/gen_statem.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index f66f399137..5f9ec6736e 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -892,7 +892,10 @@ erlang:'!' -----> Module:StateName/5 argument to the state function. Client and Reply - an also be specified using ReplyOperation. + can also be specified using a + + reply_operation() + and multiple replies with a list of them.

A reply sent with this function will not be visible -- cgit v1.2.3 From 8cc0a419f847103199524e3d922a1087d23d8d8a Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 10:31:03 +0100 Subject: Shorten taglists in the documentation --- lib/stdlib/doc/src/gen_statem.xml | 193 +++++++++++--------------------------- 1 file changed, 57 insertions(+), 136 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 5f9ec6736e..9cddce98da 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -207,19 +207,19 @@ erlang:'!' -----> Module:StateName/5 above.

It can be:

- - the pid(), - Name, - if the gen_statem is locally registered, - - {Name,Node}, - if the gen_statem is locally registered at another node, or + + pid() + LocalName + The gen_statem is locally registered. + Name, Node + The gen_statem is locally registered on another node. - {global,GlobalName}, - if the gen_statem is globally registered. + GlobalName + The gen_statem is globally registered + in global. - {via,RegMod,ViaName}, - if the gen_statem is registered through + RegMod, ViaName + The gen_statem is registered through an alternative process registry. The registry callback module RegMod should export the functions @@ -230,7 +230,7 @@ erlang:'!' -----> Module:StateName/5 Thus, {via,global,GlobalName} is the same as {global,GlobalName}. - + @@ -268,9 +268,10 @@ erlang:'!' -----> Module:StateName/5

Client address to use when replying through for example the - state_op() - {reply,Client,Reply} to a client - that has called the gen_statem server using + + state_op() {reply,Client,Reply} + + to a client that has called the gen_statem server using call/2.

@@ -426,7 +427,6 @@ erlang:'!' -----> Module:StateName/5

postpone - {postpone,Postpone} If Postpone =:= true or plain postpone postpone the current event to be retried after a state change. @@ -437,7 +437,6 @@ erlang:'!' -----> Module:StateName/5 since there is no event to postpone in those cases. hibernate - {hibernate,Hibernate} If Hibernate =:= true or plain hibernate hibernate the gen_statem by calling @@ -447,17 +446,16 @@ erlang:'!' -----> Module:StateName/5 is ignored as if an event just arrived and awakened the gen_statem. - - {timeout,Time,Msg} + timeout Generate an event of type timeout after Time milliseconds unless some other event is received before that time. Note that a retried event counts just like a new in this respect. - If Time =:= infinity or Time =:= 0 - no timer is started but for zero time the timeout - event is immediately enqueued as the newest received. + If Time =:= infinity no timer is started. + If Time =:= 0 the timeout event + is immediately enqueued as the newest received. Also note that it is not possible nor needed to cancel this timeout using the @@ -480,58 +478,45 @@ erlang:'!' -----> Module:StateName/5 and for reply_operation() that the order may matter.

- - - {next_event,EventType,EventContent} - - - Insert the given event as the next to process. + next_event + Insert the given EventType + and EventContent the next to process. An event of type internal should be used when you want to reliably distinguish an event inserted this way from any external event. - - - {remove_event,EventType,EventContent} - - + remove_event Remove the oldest queued event - that matches equal to the given event. - - - - {remove_event,EventPredicate} - - - Remove the oldest queued event for which - the EventPredicate returns true. + that matches equal to EventType + and EventContent or for which + EventPredicate returns true. - {cancel_timer,TimerRef} - Uses TimerRef when calling + cancel_timer + Cancel the timer by calling erlang:cancel_timer/2 - to cancel a timer, cleans the gen_statem's - message queue from any late timeout message from - the timer, and removes any late timeout message - from the queued events using + with TimerRef, + clean the process message queue from any late timeout message, + and removes any late timeout message + from the gen_statem event queue using {remove_event,EventPredicate} above. This is a convenience function that saves quite some lines of code and testing time over doing it from the primitives mentioned above. - {demonitor,MonitorRef} - Like {cancel_timer,_} above but for + demonitor + Like cancel_timer above but for demonitor/2 - . + with MonitorRef. {unlink,Id} Like {cancel_timer,_} above but for unlink/1 - . + with Id. @@ -539,109 +524,45 @@ erlang:'!' -----> Module:StateName/5 - - - {reply,Client,Reply} - - Reply to a client that called - call/2. - Client must be the term from the - - {call,Client} - argument to the - state function. - - +

Reply to a client that called + call/2. + Client must be the term from the + + {call,Client} + argument to the + state function. +

- - {stop,Reason} - - The same as - {stop,Reason,[],StateData} - but keeps the old StateData. - - - {stop,Reason,NewStateData} - - The same as - {stop,Reason,[],NewStateData} - - {stop, - Reason, - Replies, - NewStateData} - - The gen_statem will first send all - Replies and then terminate by calling + stop + Send all Replies if given, + then terminate the gen_statem by calling Module:terminate/3 - with Reason. + with Reason and + NewStateData, if given. - - - {next_state,NewState,NewStateData} - - - The same as - - {next_state,NewState,NewStateData,[]} - - - - - {next_state, - NewState, - NewStateData, - StateOps} - - + next_state The gen_statem will do a state transition to NewState - (which may be the same as the current state) + (which may be the same as the current state), + set NewStateData and execute all StateOps - - - {keep_state,NewStateData}} - - - The same as - - {keep_state,NewStateData,[]} - - - - - {keep_state,NewStateData,StateOps} - - + keep_state The gen_statem will keep the current state, or do a state transition to the current state if you like, + set NewStateData and execute all StateOps - - - {keep_state_and_data} - - - The same as - - {keep_state_and_data,[]} - - - - - {keep_state_and_data,StateOps} - - + keep_state_and_data The gen_statem will keep the current state, or do a state transition to the current state if you like, - also keep the current state data, + keep the current state data, and execute all StateOps -- cgit v1.2.3 From 4d903e7e0f12d40461efda84ee169e8e65cf4c71 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 10:47:01 +0100 Subject: Write gen_statem with code font in the docs --- lib/stdlib/doc/src/gen_statem.xml | 253 ++++++++++++++++++++------------------ 1 file changed, 134 insertions(+), 119 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 9cddce98da..c685d24b78 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -40,14 +40,14 @@ callback function for all states.

- A generic state machine process (gen_statem) implemented using - this module will have a standard set of interface functions + A generic state machine process (gen_statem) implemented + using this module will have a standard set of interface functions and include functionality for tracing and error reporting. It will also fit into an OTP supervision tree. Refer to OTP Design Principles for more information.

-

A gen_statem assumes all specific parts to be located in a +

A gen_statem assumes all specific parts to be located in a callback module exporting a pre-defined set of functions. The relationship between the behaviour functions and the callback functions can be illustrated as follows:

@@ -74,17 +74,17 @@ erlang:'!' -----> Module:StateName/5 and how to respond.

If a callback function fails or returns a bad value, - the gen_statem will terminate. An exception of class + the gen_statem will terminate. An exception of class throw, however, is not regarded as an error but as a valid return.

The "state function" for a specific state - in a gen_statem is the callback function that is called + in a gen_statem is the callback function that is called for all events in this state, and is selected depending on callback_mode - that the implementation selects during gen_statem init. + that the implementation selects during gen_statem init.

When callback_mode @@ -114,11 +114,11 @@ erlang:'!' -----> Module:StateName/5 callback_mode) is permitted with a small gotcha regarding the state undefined that is used as the previous state when - the first gen_statem state function is called. + the first gen_statem state function is called. You might need to know about this faked state if you inspect the previous state argument in your state functions.

-

The gen_statem enqueues incoming events in order of arrival +

The gen_statem enqueues incoming events in order of arrival and presents these to the state function in that order. The state function can postpone an event @@ -126,8 +126,8 @@ erlang:'!' -----> Module:StateName/5 After a state change all enqueued events (including postponed) are again presented to the state function.

-

The gen_statem event queue model is sufficient to emulate - the normal process message queue and selective receive +

The gen_statem event queue model is sufficient + to emulate the normal process message queue and selective receive with postponing an event corresponding to not matching it in a receive statement and changing states corresponding to entering a new receive statement. @@ -151,23 +151,25 @@ erlang:'!' -----> Module:StateName/5 state handling functions that you often would have to resort to in e.g gen_fsm to force processing a faked event before others. - If you for example in gen_statem postpone an event + If you for example in gen_statem postpone an event in one state and then call some other state function of yours, you have not changed states and hence the postponed event will not be retried, which is logical but might be confusing.

-

A gen_statem handles system messages as documented in +

A gen_statem handles system messages as documented in sys. The sys module - can be used for debugging a gen_statem. + can be used for debugging a gen_statem.

-

Note that a gen_statem does not trap exit signals automatically, - this must be explicitly initiated by the callback module. +

Note that a gen_statem does not trap exit signals + automatically, this must be explicitly initiated by + the callback module.

Unless otherwise stated, all functions in this module fail if - the specified gen_statem does not exist or if bad arguments are given. + the specified gen_statem does not exist or + if bad arguments are given.

-

The gen_statem process can go into hibernation (see +

The gen_statem process can go into hibernation (see erlang:hibernate/3 ) if a @@ -187,7 +189,8 @@ erlang:'!' -----> Module:StateName/5 -

Name specification to use when starting a gen_statem server. +

Name specification to use when starting + agen_statem server. See start_link/3 and @@ -200,7 +203,8 @@ erlang:'!' -----> Module:StateName/5 -

Server specification to use when addressing a gen_statem server. +

Server specification to use when addressing + a gen_statem server. See call/2 and server_name() @@ -210,16 +214,17 @@ erlang:'!' -----> Module:StateName/5 pid() LocalName - The gen_statem is locally registered. + The gen_statem is locally registered. Name, Node - The gen_statem is locally registered on another node. + The gen_statem is locally registered + on another node. GlobalName - The gen_statem is globally registered + The gen_statem is globally registered in global. RegMod, ViaName - The gen_statem is registered through + The gen_statem is registered through an alternative process registry. The registry callback module RegMod should export the functions @@ -237,7 +242,7 @@ erlang:'!' -----> Module:StateName/5

Debug option that can be used when starting - a gen_statem server through for example + a gen_statem server through for example enter_loop/4.

For every entry in Dbgs @@ -250,7 +255,7 @@ erlang:'!' -----> Module:StateName/5

Options that can be used when starting - a gen_statem server through for example + a gen_statem server through for example start_link/3.

@@ -271,7 +276,7 @@ erlang:'!' -----> Module:StateName/5 state_op() {reply,Client,Reply} - to a client that has called the gen_statem server using + to a client that has called the gen_statem server using call/2.

@@ -316,7 +321,7 @@ erlang:'!' -----> Module:StateName/5 originate from the corresponding API functions. For calls the event contain whom to reply to. Type info originates from normal messages sent - to the gen_statem process. + to the gen_statem process. It is also possible for the state machine implementation to insert events to itself, in particular of types @@ -343,8 +348,8 @@ erlang:'!' -----> Module:StateName/5 -

Option that only is valid when initializing the gen_statem - that is it can be returned from +

Option that only is valid when initializing + the gen_statem that is it can be returned from Module:init/1 or given to enter_loop/5,6. @@ -408,12 +413,12 @@ erlang:'!' -----> Module:StateName/5 The (possibly new) state function is called with the oldest enqueued event if there is any, - otherwise the gen_statem goes into receive + otherwise the gen_statem goes into receive or hibernation (if the option hibernate is true) to wait for the next message. In hibernation the next - non-system event awakens the gen_statem, or rather - the next incoming message awakens the gen_statem but if it - is a system event it goes back into hibernation. + non-system event awakens the gen_statem, or rather + the next incoming message awakens the gen_statem + but if it is a system event it goes back into hibernation. @@ -438,13 +443,14 @@ erlang:'!' -----> Module:StateName/5 hibernate If Hibernate =:= true - or plain hibernate hibernate the gen_statem by calling + or plain hibernate hibernate the gen_statem + by calling proc_lib:hibernate/3 before receive to wait for a new event. If there are enqueued events the hibernate operation is ignored as if an event just arrived and awakened - the gen_statem. + the gen_statem. timeout @@ -500,7 +506,7 @@ erlang:'!' -----> Module:StateName/5 with TimerRef, clean the process message queue from any late timeout message, and removes any late timeout message - from the gen_statem event queue using + from the gen_statem event queue using {remove_event,EventPredicate} above. This is a convenience function that saves quite some lines of code and testing time over doing it from @@ -540,27 +546,27 @@ erlang:'!' -----> Module:StateName/5 stop Send all Replies if given, - then terminate the gen_statem by calling + then terminate the gen_statem by calling Module:terminate/3 with Reason and NewStateData, if given. next_state - The gen_statem will do a state transition to + The gen_statem will do a state transition to NewState (which may be the same as the current state), set NewStateData and execute all StateOps keep_state - The gen_statem will keep the current state, or + The gen_statem will keep the current state, or do a state transition to the current state if you like, set NewStateData and execute all StateOps keep_state_and_data - The gen_statem will keep the current state, or + The gen_statem will keep the current state, or do a state transition to the current state if you like, keep the current state data, and execute all StateOps @@ -575,17 +581,18 @@ erlang:'!' -----> Module:StateName/5 - Create a linked gen_statem process + Create a linked gen_statem process -

Creates a gen_statem process according to OTP design principles +

Creates a gen_statem process according + to OTP design principles (using proc_lib primitives) that is linked to the calling process. - This is essential when the gen_statem shall be part of + This is essential when the gen_statem shall be part of a supervision tree so it gets linked to its supervisor.

-

The gen_statem process calls +

The gen_statem process calls Module:init/1 to initialize the server. To ensure a synchronized start-up procedure, start_link/3,4 does not return until @@ -595,10 +602,10 @@ erlang:'!' -----> Module:StateName/5

ServerName specifies the server_name() - to register for the gen_statem. - If the gen_statem is started with start_link/3 + to register for the gen_statem. + If the gen_statem is started with start_link/3 no ServerName is provided and - the gen_statem is not registered. + the gen_statem is not registered.

Module is the name of the callback module.

Args is an arbitrary term which is passed as @@ -607,9 +614,9 @@ erlang:'!' -----> Module:StateName/5 .

If the option {timeout,Time} is present in - Options, the gen_statem is allowed to spend - Time milliseconds initializing or it will be - terminated and the start function will return + Options, the gen_statem + is allowed to spend Time milliseconds initializing + or it will be terminated and the start function will return {error,timeout} . @@ -624,18 +631,19 @@ erlang:'!' -----> Module:StateName/5 as option list to the spawn_opt BIF which is used to spawn - the gen_statem. + the gen_statem.

Using the spawn option monitor is currently not allowed, but will cause this function to fail with reason badarg.

 -

If the gen_statem is successfully created and initialized - this function returns +

If the gen_statem is successfully created + and initialized this function returns {ok,Pid}, - where Pid is the pid() of the gen_statem. + where Pid is the pid() + of the gen_statem. If there already exists a process with the specified ServerName this function returns @@ -669,9 +677,9 @@ erlang:'!' -----> Module:StateName/5 - Create a stand-alone gen_statem process + Create a stand-alone gen_statem process -

Creates a stand-alone gen_statem process according to +

Creates a stand-alone gen_statem process according to OTP design principles (using proc_lib primitives). @@ -700,12 +708,12 @@ erlang:'!' -----> Module:StateName/5 Synchronously stop a generic server -

Orders the gen_statem +

Orders the gen_statem ServerRef to exit with the given Reason and waits for it to terminate. - The gen_statem will call + The gen_statem will call Module:terminate/3 before exiting. @@ -735,14 +743,14 @@ erlang:'!' -----> Module:StateName/5 - Make a synchronous call to a gen_statem + Make a synchronous call to a gen_statem -

Makes a synchronous call to the gen_statem +

Makes a synchronous call to the gen_statem ServerRef by sending a request and waiting until its reply arrives. - The gen_statem will call the + The gen_statem will call the state function with event_type() {call,Client} and event content @@ -771,7 +779,7 @@ erlang:'!' -----> Module:StateName/5

-

The call may fail for example if the gen_statem dies +

The call may fail for example if the gen_statem dies before or during this function call.

@@ -779,14 +787,15 @@ erlang:'!' -----> Module:StateName/5 - Send an asynchronous event to a gen_statem + Send an asynchronous event to a gen_statem -

Sends an asynchronous event to the gen_statem +

Sends an asynchronous event to the gen_statem ServerRef and returns ok immediately, - ignoring if the destination node or gen_statem does not exist. - The gen_statem will call the + ignoring if the destination node or gen_statem + does not exist. + The gen_statem will call the state function with event_type() cast and event content @@ -800,8 +809,8 @@ erlang:'!' -----> Module:StateName/5 Send a reply to a client -

This function can be used by a gen_statem to explicitly send - a reply to a client that called +

This function can be used by a gen_statem + to explicitly send a reply to a client that called call/2 when the reply cannot be defined in the return value of the @@ -828,7 +837,7 @@ erlang:'!' -----> Module:StateName/5 - Enter the gen_statem receive loop + Enter the gen_statem receive loop

The same as enter_loop/6 @@ -841,7 +850,7 @@ erlang:'!' -----> Module:StateName/5 - Enter the gen_statem receive loop + Enter the gen_statem receive loop

If Server_or_StateOps is a list() the same as @@ -862,25 +871,27 @@ erlang:'!' -----> Module:StateName/5 - Enter the gen_statem receive loop + Enter the gen_statem receive loop -

Makes an the calling process become a gen_statem. Does not return, - instead the calling process will enter the gen_statem receive - loop and become a gen_statem server. The process - must have been started using one of the start - functions in +

Makes an the calling process become a gen_statem. + Does not return, instead the calling process will enter + the gen_statem receive loop and become + a gen_statem server. + The process must have been started + using one of the start functions in proc_lib. The user is responsible for any initialization of the process, including registering a name for it.

This function is useful when a more complex initialization - procedure is needed than the gen_statem behaviour provides. + procedure is needed than + the gen_statem behaviour provides.

Module, Options and Server have the same meanings as when calling - gen_statem:start[_link]/3,4 + gen_statem:start[_link]/3,4 . However, the @@ -912,7 +923,7 @@ erlang:'!' -----> Module:StateName/5

CALLBACK FUNCTIONS

The following functions should be exported from a - gen_statem callback module. + gen_statem callback module.

@@ -937,10 +948,10 @@ erlang:'!' -----> Module:StateName/5 -

Whenever a gen_statem is started using - gen_statem:start_link/3,4 +

Whenever a gen_statem is started using + start_link/3,4 or - gen_statem:start/3,4, + start/3,4, this function is called by the new process to initialize the implementation loop data.

@@ -950,7 +961,7 @@ erlang:'!' -----> Module:StateName/5 return {ok,State,StateData} or {ok,State,StateData,StateOps}. State is the state - of the gen_statem. + of the gen_statem.

The StateOps are executed when entering the first @@ -958,14 +969,14 @@ erlang:'!' -----> Module:StateName/5 state function.

This function allows an option to select the callback mode - of the gen_statem. See + of the gen_statem. See init_option. This option is not allowed from the state function(s).

If something goes wrong during the initialization the function should return {stop,Reason} or ignore. See - gen_statem:start_link/3,4. + start_link/3,4.

@@ -1002,9 +1013,9 @@ erlang:'!' -----> Module:StateName/5 -

Whenever a gen_statem receives an event from - gen_statem:call/2, - gen_statem:cast/2 or +

Whenever a gen_statem receives an event from + call/2, + cast/2 or as a normal process message this function is called. If callback_mode @@ -1022,7 +1033,7 @@ erlang:'!' -----> Module:StateName/5 Replies or by calling - gen_statem:reply(Client, Reply) + reply(Client, Reply) .

StateName is useful in some odd cases for example @@ -1032,7 +1043,7 @@ erlang:'!' -----> Module:StateName/5

PrevStateName and PrevState are useful in some odd cases for example when you want to do something only at the first event in a state. - Note that when gen_statem enters its first state + Note that when gen_statem enters its first state this is set to undefined.

If this function returns with a new state that @@ -1041,7 +1052,7 @@ erlang:'!' -----> Module:StateName/5

See state_op() for options that can be set and operations that can be done - by gen_statem after returning from this function. + by gen_statem after returning from this function.

@@ -1060,45 +1071,49 @@ erlang:'!' -----> Module:StateName/5 Ignored = term() -

This function is called by a gen_statem when it is about to - terminate. It should be the opposite of +

This function is called by a gen_statem + when it is about to terminate. It should be the opposite of Module:init/1 and do any necessary cleaning up. When it returns, - the gen_statem terminates with Reason. The return + the gen_statem terminates with Reason. The return value is ignored.

Reason is a term denoting the stop reason and State - is the internal state of the gen_statem. + is the internal state of the gen_statem.

-

Reason depends on why the gen_statem is terminating. +

Reason depends on why the gen_statem + is terminating. If it is because another callback function has returned a stop tuple {stop,Reason} in StateOps, Reason will have the value specified in that tuple. If it is due to a failure, Reason is the error reason.

-

If the gen_statem is part of a supervision tree and is +

If the gen_statem is part of a supervision tree and is ordered by its supervisor to terminate, this function will be called with Reason = shutdown if the following conditions apply:

- the gen_statem has been set to trap exit signals, and + the gen_statem has been set + to trap exit signals, and + the shutdown strategy as defined in the supervisor's child specification is an integer timeout value, not brutal_kill. -

Even if the gen_statem is not part of a supervision tree, - this function will be called if it receives an 'EXIT' - message from its parent. Reason will be the same as in - the 'EXIT' message. +

Even if the gen_statem is not + part of a supervision tree, this function will be called + if it receives an 'EXIT' message from its parent. + Reason will be the same as + in the 'EXIT' message.

-

Otherwise, the gen_statem will be immediately terminated. +

Otherwise, the gen_statem will be immediately terminated.

Note that for any other reason than normal, - shutdown, or {shutdown,Term} the gen_statem is - assumed to terminate due to an error and - an error report is issued using + shutdown, or {shutdown,Term} + the gen_statem is assumed to terminate due to an error + and an error report is issued using error_logger:format/2 . @@ -1126,7 +1141,7 @@ erlang:'!' -----> Module:StateName/5 Reason = term() -

This function is called by a gen_statem when it should +

This function is called by a gen_statem when it should update its internal state during a release upgrade/downgrade, i.e. when the instruction {update,Module,Change,...} where Change={advanced,Extra} is given in @@ -1144,7 +1159,7 @@ erlang:'!' -----> Module:StateName/5 is the checksum of the BEAM file.

OldState and OldStateData is the internal state - of the gen_statem. + of the gen_statem.

Extra is passed as-is from the {advanced,Extra} part of the update instruction. @@ -1163,7 +1178,7 @@ erlang:'!' -----> Module:StateName/5 Status Optional function for providing a term describing the - current gen_statem status + current gen_statem status Opt = normal | terminate PDict = [{Key, Value}] @@ -1180,43 +1195,43 @@ erlang:'!' -----> Module:StateName/5

This callback is optional, so callback modules need not - export it. The gen_statem module provides a default + export it. The gen_statem module provides a default implementation of this function that returns the callback module state.

-

This function is called by a gen_statem process when:

+

This function is called by a gen_statem process when:

One of sys:get_status/1,2 - is invoked to get the gen_statem status. Opt is set + is invoked to get the gen_statem status. Opt is set to the atom normal for this case. - The gen_statem terminates abnormally and logs an error. + The gen_statem terminates abnormally and logs an error. Opt is set to the atom terminate for this case.

This function is useful for customising the form and - appearance of the gen_statem status for these cases. A + appearance of the gen_statem status for these cases. A callback module wishing to customise the sys:get_status/1,2 return value as well as how its status appears in termination error logs exports an instance of format_status/2 that returns a term - describing the current status of the gen_statem. + describing the current status of the gen_statem.

-

PDict is the current value of the gen_statem's +

PDict is the current value of the gen_statem's process dictionary.

State - is the internal state of the gen_statem. + is the internal state of the gen_statem.

The function should return Status, a term that customises the details of the current state and status of - the gen_statem. There are no restrictions on the + the gen_statem. There are no restrictions on the form Status can take, but for the sys:get_status/1,2 @@ -1224,7 +1239,7 @@ erlang:'!' -----> Module:StateName/5 is normal), the recommended form for the Status value is [{data, [{"State", Term}]}] where Term provides relevant details of - the gen_statem state. Following this recommendation isn't + the gen_statem state. Following this recommendation isn't required, but doing so will make the callback module status consistent with the rest of the -- cgit v1.2.3 From 898e66f07dce8b7b33874255bb3ea1c6f5534d34 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 15:26:33 +0100 Subject: Update terminology to data(), transition_op(), etc --- lib/stdlib/doc/src/gen_statem.xml | 222 +++++++++++++++++++++----------------- 1 file changed, 124 insertions(+), 98 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index c685d24b78..15e9584360 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -94,7 +94,7 @@ erlang:'!' -----> Module:StateName/5 Module:StateName/5 . - This naturally collects all code for a specific state + This gathers all code for a specific state in one function and hence dispatches on state first.

When @@ -135,8 +135,8 @@ erlang:'!' -----> Module:StateName/5

The state function can insert events using the - - state_operation() next_event + + transition_action() next_event and such an event is inserted as the next to present to the state function. That is: as if it is @@ -176,8 +176,8 @@ erlang:'!' -----> Module:StateName/5 state function or Module:init/1 specifies 'hibernate' in the returned - StateOps list. - This might be useful if the server is expected to be idle + Ops + list. This might be useful if the server is expected to be idle for a long time. However use this feature with care since hibernation implies at least two garbage collections (when hibernating and shortly after waking up) and that is not @@ -273,8 +273,8 @@ erlang:'!' -----> Module:StateName/5

Client address to use when replying through for example the - - state_op() {reply,Client,Reply} + + transition_op() {reply,Client,Reply} to a client that has called the gen_statem server using call/2. @@ -296,19 +296,21 @@ erlang:'!' -----> Module:StateName/5 callback_mode is state_functions, which is the default, - the state has to be of this type i.e an atom(). + the state has to be of this type.

- + -

A term() in which the state machine implementation - should store any state data it needs. The difference between - this data and the - state() +

A term in which the state machine implementation + should store any server data it needs. The difference between + this and the state() itself is that a change in this data does not cause - postponed events to be retried. + postponed events to be retried. Hence if a change + in this data would change the set of events that + are handled than that data item should be made + a part of the state.

@@ -334,8 +336,8 @@ erlang:'!' -----> Module:StateName/5

A fun() of arity 2 that takes an event and returns a boolean. - When used in {remove_event,RemoveEventPredicate} - from state_op(). + When used in {remove_event,RemoveEventPredicate} from + transition_op(). The event for which the predicate returns true will be removed.

@@ -378,17 +380,16 @@ erlang:'!' -----> Module:StateName/5 - +

Either a - - state_option() + + transition_option() of which the last occurence in the containing list takes precedence, or a - - state_operation() - that are performed in order of - the containing list. + + transition_action() + performed in the order of the containing list.

These may be returned from the state function, @@ -404,7 +405,7 @@ erlang:'!' -----> Module:StateName/5 If the state changes the queue of incoming events is reset to start with the oldest postponed. - All operations are processed in order of appearance. + All actions are processed in order of appearance. The timeout option is processed if present, so a state timer may be started or a timeout zero event @@ -424,9 +425,9 @@ erlang:'!' -----> Module:StateName/5 - + -

If multiple state options of the same type are present +

If multiple state options of the same kind are present in the containing list these are set in the list order and the last value is kept.

@@ -448,7 +449,7 @@ erlang:'!' -----> Module:StateName/5 proc_lib:hibernate/3 before receive to wait for a new event. - If there are enqueued events the hibernate operation + If there are enqueued events the hibernate action is ignored as if an event just arrived and awakened the gen_statem. @@ -464,8 +465,8 @@ erlang:'!' -----> Module:StateName/5 is immediately enqueued as the newest received. Also note that it is not possible nor needed to cancel this timeout using the - - state_operation() + + transition_action() cancel_timer. This timeout is cancelled automatically by any event. @@ -473,17 +474,20 @@ erlang:'!' -----> Module:StateName/5 - + -

The state operations are executed in the containing - list order. This matters for next_event where - the last one in the list will become the next event to present - to the state functions. Regarding the other operations - it is only for remove_event with - EventPredicate - and for reply_operation() that the order may matter. +

The state transition actions are executed + in the containing list order. This matters + for next_event where the last one in the list + will become the next event to present + to the state functions. Regarding the other actions + it is only for remove_event with + EventPredicate + and for reply_action() that the order may matter.

+ reply_action() + Reply to a calling client. next_event Insert the given EventType and EventContent the next to process. @@ -518,7 +522,7 @@ erlang:'!' -----> Module:StateName/5 demonitor/2 with MonitorRef. - {unlink,Id} + unlink Like {cancel_timer,_} above but for unlink/1 @@ -528,7 +532,7 @@ erlang:'!' -----> Module:StateName/5 - +

Reply to a client that called call/2. @@ -550,26 +554,26 @@ erlang:'!' -----> Module:StateName/5 Module:terminate/3 with Reason and - NewStateData, if given. + NewData, if given. next_state The gen_statem will do a state transition to NewState (which may be the same as the current state), - set NewStateData - and execute all StateOps + set NewData + and execute all Ops keep_state The gen_statem will keep the current state, or do a state transition to the current state if you like, - set NewStateData - and execute all StateOps + set NewData + and execute all Ops keep_state_and_data The gen_statem will keep the current state, or do a state transition to the current state if you like, - keep the current state data, - and execute all StateOps + keep the current server data, + and execute all Ops @@ -614,7 +618,7 @@ erlang:'!' -----> Module:StateName/5 .

If the option {timeout,Time} is present in - Options, the gen_statem + Opts, the gen_statem is allowed to spend Time milliseconds initializing or it will be terminated and the start function will return @@ -623,15 +627,14 @@ erlang:'!' -----> Module:StateName/5

If the option {debug,Dbgs} - is present in Options, debugging through + is present in Opts, debugging through sys is activated.

-

If the option {spawn_opt,SOpts} is present in - Options, SOpts will be passed - as option list to the spawn_opt BIF - which is used to - spawn - the gen_statem. +

If the option {spawn_opt,SpawnOpts} is present in + Opts, SpawnOpts will be passed + as option list to + spawn_opt/2 + which is used to spawn the gen_statem process.

Using the spawn option monitor is currently not @@ -760,7 +763,9 @@ erlang:'!' -----> Module:StateName/5 state function returns with {reply,Client,Reply} as one - state_op(), + + transition_op() + , and that Reply becomes the return value of this function.

@@ -823,8 +828,8 @@ erlang:'!' -----> Module:StateName/5 state function. Client and Reply can also be specified using a - - reply_operation() + + reply_action() and multiple replies with a list of them.

@@ -852,20 +857,20 @@ erlang:'!' -----> Module:StateName/5 Enter the gen_statem receive loop -

If Server_or_StateOps is a list() +

If Server_or_Ops is a list() the same as enter_loop/6 except that no server_name() must have been registered and - StateOps = Server_or_StateOps. + Ops = Server_or_Ops.

Otherwise the same as enter_loop/6 with - Server = Server_or_StateOps and - StateOps = []. + Server = Server_or_Ops and + Ops = [].

@@ -887,7 +892,7 @@ erlang:'!' -----> Module:StateName/5 procedure is needed than the gen_statem behaviour provides.

-

Module, Options and +

Module, Opts and Server have the same meanings as when calling @@ -898,8 +903,8 @@ erlang:'!' -----> Module:StateName/5 server_name() name must have been registered accordingly before this function is called.

-

State, StateData - and StateOps +

State, Data + and Ops have the same meanings as in the return value of Module:init/1. Also, the callback module Module @@ -933,15 +938,14 @@ erlang:'!' -----> Module:StateName/5 Initialize process and internal state Args = term() - Result = {ok,State,StateData} -  | {ok,State,StateData,StateOps} + Result = {ok,State,Data} +  | {ok,State,Data,Ops}  | {stop,Reason} | ignore State = state() - StateData = - state_data() + Data = data() - StateOps = - [state_op() + Ops = + [transition_op() | init_option()] Reason = term() @@ -953,17 +957,17 @@ erlang:'!' -----> Module:StateName/5 or start/3,4, this function is called by the new process to initialize - the implementation loop data. + the implementation state and server data.

Args is the Args argument provided to the start function.

If the initialization is successful, the function should - return {ok,State,StateData} or - {ok,State,StateData,StateOps}. + return {ok,State,Data} or + {ok,State,Data,Ops}. State is the state of the gen_statem.

-

The StateOps +

The Ops are executed when entering the first state just as for a state function. @@ -978,15 +982,19 @@ erlang:'!' -----> Module:StateName/5 or ignore. See start_link/3,4.

+

This function may use + throw, + to return its value. +

Module:StateName(EventType, EventContent, - PrevStateName, StateName, StateData) -> Result + PrevStateName, StateName, Data) -> Result Module:handle_event(EventType, EventContent, - PrevState, State, StateData) -> Result + PrevState, State, Data) -> Result Handle an event @@ -1003,8 +1011,8 @@ erlang:'!' -----> Module:StateName/5 PrevState = State = state() - StateData = NewStateData = - state_data() + Data = NewData = + data() Result = @@ -1029,8 +1037,8 @@ erlang:'!' -----> Module:StateName/5 from this or from any other state function by returning with {reply,Client,Reply} in - StateOps, in - Replies + Ops, in + Replies or by calling reply(Client, Reply) @@ -1050,23 +1058,25 @@ erlang:'!' -----> Module:StateName/5 does not match equal (=/=) to the current state all postponed events will be retried in the new state.

-

See state_op() - for options that can be set and operations that can be done +

See + transition_op() + for options that can be set and actions that can be done by gen_statem after returning from this function.

+

These functions may use + throw, + to return its value. +

- Module:terminate(Reason, State, StateData) -> Ignored + Module:terminate(Reason, State, Data) -> Ignored Clean up before termination Reason = normal | shutdown | {shutdown,term()} | term() State = state() - StateData = - - state_data() - + Data = data() Ignored = term() @@ -1085,7 +1095,7 @@ erlang:'!' -----> Module:StateName/5 is terminating. If it is because another callback function has returned a stop tuple {stop,Reason} in - StateOps, + Ops, Reason will have the value specified in that tuple. If it is due to a failure, Reason is the error reason.

@@ -1118,11 +1128,15 @@ erlang:'!' -----> Module:StateName/5 error_logger:format/2 .

+

This function may use + throw, + to return its value. +

- Module:code_change(OldVsn, OldState, OldStateData, Extra) -> + Module:code_change(OldVsn, OldState, OldData, Extra) -> Result Update the internal state during upgrade/downgrade @@ -1131,12 +1145,12 @@ erlang:'!' -----> Module:StateName/5   Vsn = term() OldState = NewState = term() Extra = term() - Result = {ok,{NewState,NewStateData}} | Reason + Result = {ok,{NewState,NewData}} | Reason OldState = NewState = state() - OldStateData = NewStateData = - state_data() + OldData = NewData = + data() Reason = term() @@ -1158,7 +1172,7 @@ erlang:'!' -----> Module:StateName/5 Module. If no such attribute is defined, the version is the checksum of the BEAM file.

-

OldState and OldStateData is the internal state +

OldState and OldData is the internal state of the gen_statem.

Extra is passed as-is from the {advanced,Extra} @@ -1166,15 +1180,19 @@ erlang:'!' -----> Module:StateName/5

If successful, the function shall return the updated internal state in an - {ok,{NewState,NewStateData}} tuple. + {ok,{NewState,NewData}} tuple.

If the function returns Reason, the ongoing upgrade will fail and roll back to the old release.

+

This function may use + throw, + to return its value. +

- Module:format_status(Opt, [PDict,State,StateData]) -> + Module:format_status(Opt, [PDict,State,Data]) -> Status Optional function for providing a term describing the @@ -1185,8 +1203,8 @@ erlang:'!' -----> Module:StateName/5 State = state() - StateData = - state_data() + Data = + data() Key = term() Value = term() @@ -1197,7 +1215,8 @@ erlang:'!' -----> Module:StateName/5

This callback is optional, so callback modules need not export it. The gen_statem module provides a default implementation of this function that returns the callback - module state. + module state and data. The default function will also + be used if this callback fails.

This function is called by a gen_statem process when:

@@ -1229,6 +1248,9 @@ erlang:'!' -----> Module:StateName/5

State is the internal state of the gen_statem.

+

Data + is the internal server data of the gen_statem. +

The function should return Status, a term that customises the details of the current state and status of the gen_statem. There are no restrictions on the @@ -1250,6 +1272,10 @@ erlang:'!' -----> Module:StateName/5 state representations to avoid having large state terms printed in logfiles.

+

This function may use + throw, + to return its value. +

-- cgit v1.2.3 From 867c27c5b03c846aef1e5fe4b3ee63de5f3a7f32 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 19 Feb 2016 15:36:13 +0100 Subject: Hide Data in default format_status/2 if callback crashes --- lib/stdlib/doc/src/gen_statem.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 15e9584360..8462f5ff5f 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -1212,11 +1212,13 @@ erlang:'!' -----> Module:StateName/5 -

This callback is optional, so callback modules need not +

This callback is optional, so a callback module need not export it. The gen_statem module provides a default - implementation of this function that returns the callback - module state and data. The default function will also - be used if this callback fails. + implementation of this function that returns + {State,Data}. If this callback fails the default + function will return {State,Info} + where Info informs of the crash but no details, + to hide possibly sensitive data.

This function is called by a gen_statem process when:

@@ -1270,7 +1272,8 @@ erlang:'!' -----> Module:StateName/5

One use for this function is to return compact alternative state representations to avoid having large state terms - printed in logfiles. + printed in logfiles. Another is to hide sensitive data from + being written to the error log.

This function may use throw, -- cgit v1.2.3 From 759548838fa8b27eaa574233c9897d9578540a5a Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Mon, 22 Feb 2016 14:55:52 +0100 Subject: Make callback_option() mandatory --- lib/stdlib/doc/src/gen_statem.xml | 80 ++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 44 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 8462f5ff5f..bd210a0d22 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -190,7 +190,7 @@ erlang:'!' -----> Module:StateName/5

Name specification to use when starting - agen_statem server. + a gen_statem server. See start_link/3 and @@ -347,17 +347,6 @@ erlang:'!' -----> Module:StateName/5

- - - -

Option that only is valid when initializing - the gen_statem that is it can be returned from - Module:init/1 - or given to - enter_loop/5,6. -

- - @@ -459,7 +448,7 @@ erlang:'!' -----> Module:StateName/5 type timeout after Time milliseconds unless some other event is received before that time. Note that a retried - event counts just like a new in this respect. + or inserted event counts just like a new in this respect. If Time =:= infinity no timer is started. If Time =:= 0 the timeout event is immediately enqueued as the newest received. @@ -468,7 +457,7 @@ erlang:'!' -----> Module:StateName/5 transition_action() cancel_timer. - This timeout is cancelled automatically by any event. + This timeout is cancelled automatically by any other event. @@ -478,9 +467,9 @@ erlang:'!' -----> Module:StateName/5

The state transition actions are executed in the containing list order. This matters - for next_event where the last one in the list - will become the next event to present - to the state functions. Regarding the other actions + for next_event where the last such in the list + will become the next event to process by + the current state function. Regarding the other actions it is only for remove_event with EventPredicate and for reply_action() that the order may matter. @@ -490,7 +479,9 @@ erlang:'!' -----> Module:StateName/5 Reply to a calling client. next_event Insert the given EventType - and EventContent the next to process. + and EventContent as the next to process. + This will bypass any events in the process mailbox as well + as any other queued events. An event of type internal @@ -841,11 +832,11 @@ erlang:'!' -----> Module:StateName/5 - + Enter the gen_statem receive loop

The same as - enter_loop/6 + enter_loop/7 except that no server_name() @@ -854,12 +845,12 @@ erlang:'!' -----> Module:StateName/5 - + Enter the gen_statem receive loop

If Server_or_Ops is a list() the same as - enter_loop/6 + enter_loop/7 except that no server_name() @@ -867,7 +858,7 @@ erlang:'!' -----> Module:StateName/5 Ops = Server_or_Ops.

Otherwise the same as - enter_loop/6 + enter_loop/7 with Server = Server_or_Ops and Ops = []. @@ -875,7 +866,7 @@ erlang:'!' -----> Module:StateName/5 - + Enter the gen_statem receive loop

Makes an the calling process become a gen_statem. @@ -903,8 +894,8 @@ erlang:'!' -----> Module:StateName/5 server_name() name must have been registered accordingly before this function is called.

-

State, Data - and Ops +

CallbackMode, State, + Data and Ops have the same meanings as in the return value of Module:init/1. Also, the callback module Module @@ -938,15 +929,17 @@ erlang:'!' -----> Module:StateName/5 Initialize process and internal state Args = term() - Result = {ok,State,Data} -  | {ok,State,Data,Ops} + Result = {CallbackMode,State,Data} +  | {CallbackMode,State,Data,Ops}  | {stop,Reason} | ignore + CallbackMode = + callback_mode() + State = state() Data = data() Ops = - [transition_op() - | init_option()] + [transition_op()] Reason = term() @@ -962,21 +955,20 @@ erlang:'!' -----> Module:StateName/5

Args is the Args argument provided to the start function.

If the initialization is successful, the function should - return {ok,State,Data} or - {ok,State,Data,Ops}. - State is the state + return {CallbackMode,State,Data} or + {CallbackMode,State,Data,Ops}. + CallbackMode selects the + callback_mode(). of the gen_statem. + State is the state() + of the gen_statem and + Data the server data()

The Ops are executed when entering the first state just as for a state function.

-

This function allows an option to select the callback mode - of the gen_statem. See - init_option. - This option is not allowed from the state function(s). -

If something goes wrong during the initialization the function should return {stop,Reason} or ignore. See @@ -984,7 +976,7 @@ erlang:'!' -----> Module:StateName/5

This function may use throw, - to return its value. + to return Result.

@@ -1065,7 +1057,7 @@ erlang:'!' -----> Module:StateName/5

These functions may use throw, - to return its value. + to return Result.

@@ -1130,7 +1122,7 @@ erlang:'!' -----> Module:StateName/5

This function may use throw, - to return its value. + to return Ignored, which is ignored anyway.

@@ -1184,11 +1176,11 @@ erlang:'!' -----> Module:StateName/5

If the function returns Reason, the ongoing upgrade will fail and roll back to the old release.

-

This function may use throw, - to return its value. + to return Result or Reason.

+ @@ -1277,7 +1269,7 @@ erlang:'!' -----> Module:StateName/5

This function may use throw, - to return its value. + to return Status.

-- cgit v1.2.3 From a435cefa6ee51bbec400836195359c94682a1008 Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Tue, 9 Feb 2016 10:59:56 +0100 Subject: s/is/are --- lib/stdlib/doc/src/filename.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 77e262dbe6..1d4ffc10f9 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -214,7 +214,7 @@

Converts Path to a form accepted by the command shell and native applications on the current platform. On Windows, - forward slashes is converted to backward slashes. On all + forward slashes are converted to backward slashes. On all platforms, the name is normalized as done by join/1.

 19> filename:nativename("/usr/local/bin/"). % Unix
-- 
cgit v1.2.3


From 793fe40e3883bca7c37b71fb59616a4ec8d379b1 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen 
Date: Tue, 23 Feb 2016 16:55:45 +0100
Subject: Rename Client -> Caller

---
 lib/stdlib/doc/src/gen_statem.xml | 50 +++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index bd210a0d22..5ae930f48b 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -270,13 +270,13 @@ erlang:'!'            -----> Module:StateName/5
     
 
     
-      
+      
       
-	
Client address to use when replying through for example the
+	
Destination to use when replying through for example the
 	  
-	    transition_op() {reply,Client,Reply}
+	    transition_op() {reply,Caller,Reply}
 	  
-	  to a client that has called the gen_statem server using
+	  to a process that has called the gen_statem server using
 	  call/2.
 	

       
@@ -318,7 +318,7 @@ erlang:'!'            -----> Module:StateName/5
       
       
 	
External events are of 3 different type:
-	  {call,Client}, cast or info.
+	  {call,Caller}, cast or info.
 	  Calls (synchronous) and casts (asynchronous)
 	  originate from the corresponding API functions.
 	  For calls the event contain whom to reply to.
@@ -476,7 +476,7 @@ erlang:'!'            -----> Module:StateName/5
 	

 	
 	  reply_action()
-	  Reply to a calling client.
+	  Reply to a caller.
 	  next_event
 	  Insert the given EventType
 	    and EventContent as the next to process.
@@ -525,11 +525,11 @@ erlang:'!'            -----> Module:StateName/5
     
       
       
-	
Reply to a client that called
+	
Reply to a caller waiting for a reply in
 	  call/2.
-          Client must be the term from the
+          Caller must be the term from the
 	  
-	    {call,Client}
+	    {call,Caller}
 	   argument to the
 	  state function.
 	

@@ -747,13 +747,13 @@ erlang:'!'            -----> Module:StateName/5
 	  The gen_statem will call the
 	  state function with
 	  event_type()
-	  {call,Client} and event content
+	  {call,Caller} and event content
 	  Request.
 	

 	
A Reply is generated when a
 	  state function
 	  returns with
-	  {reply,Client,Reply} as one
+	  {reply,Caller,Reply} as one
 	  
 	    transition_op()
 	  ,
@@ -803,21 +803,21 @@ erlang:'!'            -----> Module:StateName/5
     
       
       
-      Send a reply to a client
+      Reply to a caller
       
         
This function can be used by a gen_statem
-	  to explicitly send a reply to a client that called
+	  to explicitly send a reply to a process that waits in
 	  call/2
           when the reply cannot be defined in
-          the return value of the
+          the return value of a
 	  state function.
 	

-        
Client must be the term from the
+        
Caller must be the term from the
 	  
-	    {call,Client}
+	    {call,Caller}
 	   argument to the
 	  state function.
-	  Client and Reply
+	  Caller and Reply
 	  can also be specified using a
 	  
 	    reply_action()
@@ -975,7 +975,7 @@ erlang:'!'            -----> Module:StateName/5
           start_link/3,4.
 	

 	
This function may use
-	  throw,
+	  throw
 	  to return Result.
 	

       
@@ -1024,16 +1024,16 @@ erlang:'!'            -----> Module:StateName/5
 	  then Module:handle_event/5 is called.
 	

 	
If EventType is
-	  {call,Client}
-	  the client is waiting for a reply.  The reply can be sent
+	  {call,Caller}
+	  the caller is waiting for a reply.  The reply can be sent
 	  from this or from any other
 	  state function
-	  by returning with {reply,Client,Reply} in
+	  by returning with {reply,Caller,Reply} in
 	  Ops, in
 	  Replies
 	  or by calling
 	  
-	    reply(Client, Reply)
+	    reply(Caller, Reply)
 	  .
 	

         
StateName is useful in some odd cases for example
@@ -1121,7 +1121,7 @@ erlang:'!'            -----> Module:StateName/5
 	  .
 	

 	
This function may use
-	  throw,
+	  throw
 	  to return Ignored, which is ignored anyway.
 	

       
@@ -1177,7 +1177,7 @@ erlang:'!'            -----> Module:StateName/5
 	
If the function returns Reason, the ongoing
 	  upgrade will fail and roll back to the old release.

 	
This function may use
-	  throw,
+	  throw
 	  to return Result or Reason.
 	

       
@@ -1268,7 +1268,7 @@ erlang:'!'            -----> Module:StateName/5
 	  being written to the error log.
 	

 	
This function may use
-	  throw,
+	  throw
 	  to return Status.
 	

       
-- 
cgit v1.2.3


From 2b3a82ae44b222ce1146badcff972abb539d40ca Mon Sep 17 00:00:00 2001
From: Raimo Niskanen 
Date: Tue, 23 Feb 2016 17:58:45 +0100
Subject: Add {stop_and_reply,Reason,Replies [,Data])

Cleanup some error handling
---
 lib/stdlib/doc/src/gen_statem.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 5ae930f48b..096be3025e 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -540,7 +540,14 @@ erlang:'!'            -----> Module:StateName/5
       
 	
 	  stop
-	  Send all Replies if given,
+	  Terminate the gen_statem by calling
+	    
+	      Module:terminate/3
+	     with Reason and
+	    NewData, if given.
+	  
+	  stop_and_reply
+	  Send all Replies
 	    then terminate the gen_statem by calling
 	    
 	      Module:terminate/3
-- 
cgit v1.2.3


From 1958b93b4aa90883be5102d465f67f167549dea9 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen 
Date: Wed, 24 Feb 2016 09:41:34 +0100
Subject: Ditch State so StateName/5 -> StateName/4

---
 lib/stdlib/doc/src/gen_statem.xml | 64 ++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 28 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 096be3025e..8934d912c6 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -62,7 +62,7 @@ gen_statem:stop       -----> Module:terminate/2
 gen_statem:call
 gen_statem:cast
 erlang:send
-erlang:'!'            -----> Module:StateName/5
+erlang:'!'            -----> Module:StateName/4
                              Module:handle_event/5
 
 -                     -----> Module:terminate/3
@@ -84,18 +84,28 @@ erlang:'!'            -----> Module:StateName/5
       in a gen_statem is the callback function that is called
       for all events in this state, and is selected depending on
       callback_mode
-      that the implementation selects during gen_statem init.
+      that the implementation specifies during gen_statem init.
     

     
When
       callback_mode
       is state_functions the state has to be an atom and
       is used as the state function name.
       See
-      
-        Module:StateName/5
+      
+        Module:StateName/4
       .
       This gathers all code for a specific state
       in one function and hence dispatches on state first.
+      Note that in this mode the callback function
+      
+        Module:code_change/4
+       makes the state name code_change
+      unusable.  Actually you might get away with using it
+      as a state name but you will have to find a way to separate
+      the two callback roles e.g by observing that you can force
+      argument 3 into having different types for the different roles.
+      This is a slippery slope, though.  It is easier
+      to simply not use code_change as a state name.
     

     
When
       callback_mode
@@ -110,13 +120,11 @@ erlang:'!'            -----> Module:StateName/5
       states so you do not accidentally postpone one event
       forever creating an infinite busy loop.
     

-    
Any state name or any state value (depending on
-      callback_mode)
-      is permitted with a small gotcha regarding the state
-      undefined that is used as the previous state when
-      the first gen_statem state function is called.
-      You might need to know about this faked state if you
-      inspect the previous state argument in your state functions.
+    
There is a small gotcha in both callback modes regarding
+      the state undefined that is used as the previous state
+      when the first state function is called.  So either do not
+      use undefined as a state, or figure out
+      the implications yourself.
     

     
The gen_statem enqueues incoming events in order of arrival
       and presents these to the
@@ -181,7 +189,7 @@ erlang:'!'            -----> Module:StateName/5
       for a long time. However use this feature with care
       since hibernation implies at least two garbage collections
       (when hibernating and shortly after waking up) and that is not
-      something you'd want to do between each event on a busy server.
+      something you would want to do between each event on a busy server.
     

   
 
@@ -350,13 +358,20 @@ erlang:'!'            -----> Module:StateName/5
     
       
       
+	

+	  The callback_mode is selected when starting the
+	  gen_statem using the return value from
+	  Module:init/1
+	  or when calling
+	  enter_loop/5-7.
+	

 	
 	  state_functions
 	  The state has to be of type
 	    state_name()
 	    and one callback function per state that is
-	    
-	      Module:StateName/5
+	    
+	      Module:StateName/4
 	     is used.  This is the default.
 	  
 	  handle_event_function
@@ -384,7 +399,7 @@ erlang:'!'            -----> Module:StateName/5
 	  state function,
 	  from Module:init/1
 	  or given to
-	  enter_loop/5,6.
+	  enter_loop/6,7.
 	

 	
The processing order for a state change is:

 	
@@ -990,7 +1005,7 @@ erlang:'!'            -----> Module:StateName/5
 
     
       Module:StateName(EventType, EventContent,
-        PrevStateName, StateName, Data) -> Result
+      PrevStateName, Data) -> Result
       
       Module:handle_event(EventType, EventContent,
         PrevState, State, Data) -> Result
@@ -1004,9 +1019,6 @@ erlang:'!'            -----> Module:StateName/5
 	PrevStateName =
 	  state_name()
 	
-	StateName =
-	  state_name()
-	
 	PrevState = State =
 	  state()
 	
@@ -1023,10 +1035,9 @@ erlang:'!'            -----> Module:StateName/5
         
Whenever a gen_statem receives an event from
           call/2,
           cast/2 or
-	  as a normal process message this function is called.
-	  If
-	  callback_mode
-	  is state_functions then Module:StateName/5 is called,
+	  as a normal process message one of these functions is called.
+	  If callback_mode
+	  is state_functions then Module:StateName/4 is called,
 	  and if it is handle_event_function
 	  then Module:handle_event/5 is called.
 	

@@ -1043,13 +1054,10 @@ erlang:'!'            -----> Module:StateName/5
 	    reply(Caller, Reply)
 	  .
 	

-        
StateName is useful in some odd cases for example
-	  if you call a common event handling function from your state
-	  function then you might want to pass StateName.
-	

 	
PrevStateName and PrevState are useful
 	  in some odd cases for example when you want to do something
-	  only at the first event in a state.
+	  only at the first event in a state, or when you need to
+	  handle events differently depending on the previous state.
 	  Note that when gen_statem enters its first state
 	  this is set to undefined.
 	

-- 
cgit v1.2.3


From 8b16506b0763d13b69aef3baeabef4729c708fe5 Mon Sep 17 00:00:00 2001
From: Raimo Niskanen 
Date: Wed, 24 Feb 2016 15:50:29 +0100
Subject: Make first next_event in list arrive first

Define options as actions that set options,
rework the documentation about this.
---
 lib/stdlib/doc/src/gen_statem.xml | 298 +++++++++++++++++++++++---------------
 1 file changed, 185 insertions(+), 113 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 8934d912c6..1e41d616e9 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -143,8 +143,8 @@ erlang:'!'            -----> Module:StateName/4
     
The
       state function
       can insert events using the
-      
-	transition_action() next_event
+      
+	action() next_event
       
       and such an event is inserted as the next to present
       to the state function.  That is: as if it is
@@ -158,12 +158,19 @@ erlang:'!'            -----> Module:StateName/4
     
Inserting an event replaces the trick of calling your own
       state handling functions that you often would have to
       resort to in e.g gen_fsm
-      to force processing a faked event before others.
+      to force processing an inserted event before others.
       If you for example in gen_statem postpone an event
       in one state and then call some other state function of yours,
       you have not changed states and hence the postponed event
       will not be retried, which is logical but might be confusing.
     

+    

+      See the type
+      
+	transition_option().
+      
+      for the details of a state transition.
+    

     
A gen_statem handles system messages as documented in
        sys.
        The sys module
@@ -184,7 +191,7 @@ erlang:'!'            -----> Module:StateName/4
       state function or
       Module:init/1
       specifies 'hibernate' in the returned
-      Ops
+      Actions
       list. This might be useful if the server is expected to be idle
       for a long time. However use this feature with care
       since hibernation implies at least two garbage collections
@@ -281,8 +288,8 @@ erlang:'!'            -----> Module:StateName/4
       
       
 	
Destination to use when replying through for example the
-	  
-	    transition_op() {reply,Caller,Reply}
+	  
+	    action() {reply,Caller,Reply}
 	  
 	  to a process that has called the gen_statem server using
 	  call/2.
@@ -344,10 +351,11 @@ erlang:'!'            -----> Module:StateName/4
       
 	
A fun() of arity 2 that takes an event
 	  and returns a boolean.
-	  When used in {remove_event,RemoveEventPredicate} from
-	  transition_op().
-	  The event for which the predicate returns true will
-	  be removed.
+	  When used in the
+	  action()
+	  {remove_event,RemoveEventPredicate},
+	  the event for which the predicate returns true
+	  will be removed.
 	

 	

 	  The predicate may not use a throw exception
@@ -384,40 +392,45 @@ erlang:'!'            -----> Module:StateName/4
       
     
     
-      
+      
       
-	
Either a
-	  
-	    transition_option()
-	   of which the last occurence
-	  in the containing list takes precedence, or a
-	  
-	    transition_action()
-	   performed in the order of the containing list.
-	

-	
These may be returned from the
-	  state function,
-	  from Module:init/1
-	  or given to
-	  enter_loop/6,7.
+	

+	  Transition options may be set by
+	  actions
+	  and they modify how the state transition is done:
 	

-	
The processing order for a state change is:

 	
-	  If the option postpone is true
-	    the current event is postponed.
+	  All
+          actions
+	  are processed in order of appearance.
 	  
-	  If the state changes the queue of incoming events
-	    is reset to start with the oldest postponed.
+	  
+	    If the
+            
+	      transition_option()
+	    
+            postpone
+	    is true the current event is postponed.
 	  
-	  All actions are processed in order of appearance.
+	  
+	    If the state changes the queue of incoming events
+            is reset to start with the oldest postponed.
 	  
-	  The timeout option is processed if present,
-	    so a state timer may be started or a timeout zero event
+	  
+	    If the
+            
+	      transition_option()
+	    
+            
+	      timeout
+	    
+	    is set a state timer may be started or a timeout zero event
 	    may be enqueued as the newest incoming.
 	  
-	  The (possibly new)
-	    state function
-	    is called with the oldest enqueued event if there is any,
+	  
+	    The (possibly new)
+            state function
+            is called with the oldest enqueued event if there is any,
 	    otherwise the gen_statem goes into receive
 	    or hibernation (if the option hibernate is true)
 	    to wait for the next message.  In hibernation the next
@@ -429,91 +442,145 @@ erlang:'!'            -----> Module:StateName/4
       
     
     
-      
+      
+      
+	

+	  If true postpone the current event and retry
+	  it when the state changes that is:
+	  NewState =/= State.
+	

+      
+    
+    
+      
+      
+	

+	  If true hibernate the gen_statem
+	  by calling
+	  
+	    proc_lib:hibernate/3
+	  
+	  before going into receive
+	  to wait for a new external event.
+	  If there are enqueued events the hibernate
+	  is ignored as if an event just arrived and awakened
+	  the gen_statem.
+	

+      
+    
+    
+      
       
-	
If multiple state options of the same kind are present
-	  in the containing list these are set in the list order
-	  and the last value is kept.
+	

+	  Generate an event of
+	  type timeout
+	  after this time (in milliseconds) unless some other
+	  event arrives in which case this timeout is cancelled.
+	  Note that a retried or inserted event
+	  counts just like a new in this respect.
+	  If the value is infinity no timer is started.
+	  If it is 0 the timeout event
+	  is immediately enqueued as the newest received.
+	  Also note that it is not possible nor needed
+	  to cancel this timeout using the
+	  
+	    action() cancel_timer.
+	  
+	  since this timeout is cancelled automatically by any other event.
+	

+      
+    
+    
+      
+      
+	
These state transition actions may be invoked by
+	  returning them from the
+	  state function,
+	  from Module:init/1
+	  or by giving them to
+	  enter_loop/6,7.
+	

+	
Actions are executed in the containing list order.
+	  The order matters for some actions such as next_event
+	  and reply_action().  The order can in peculiar cases
+	  matter for remove_event with
+	  EventPredicate versus other
+	  event removal actions.
+	

+	

+	  The order also matters for actions that set
+	  
+	    transition options
+	  
+	  since setting an option overrides any previous
+	  of the same kind, so the last in the containing list wins.
 	

 	
 	  postpone
-	  If Postpone =:= true
-	    or plain postpone postpone the current event
-	    to be retried after a state change.
-	    This option is ignored when returned from
+	  
+	    Set the
+	    
+	      transition_option() postpone
+	    
+	    for this state transition.
+	    This action is ignored when returned from
 	    Module:init/1
 	    or given to
 	    enter_loop/5,6
 	    since there is no event to postpone in those cases.
 	  
 	  hibernate
-	  If Hibernate =:= true
-	    or plain hibernate hibernate the gen_statem
-	    by calling
-	    
-	      proc_lib:hibernate/3
-	     before receive to wait for a new event.
-	    If there are enqueued events the hibernate action
-	    is ignored as if an event just arrived and awakened
-	    the gen_statem.
+	  
+	    Set the
+	    
+	      transition_option() hibernate
+	    
+	    for this state transition.
 	  
-	  timeout
-	  
-	  Generate an event of
-	    type timeout
-	    after Time milliseconds unless some other
-	    event is received before that time.  Note that a retried
-	    or inserted event counts just like a new in this respect.
-	    If Time =:= infinity no timer is started.
-	    If Time =:= 0 the timeout event
-	    is immediately enqueued as the newest received.
-	    Also note that it is not possible nor needed
-	    to cancel this timeout using the
-	    
-	      transition_action()
-	     cancel_timer.
-	    This timeout is cancelled automatically by any other event.
+	  timeout
+	  
+	    Set the
+	    
+	      transition_option() timeout
+	    
+	    to Time with the
+	    EventContent as Msg
+	    for the next state.
 	  
-	
-      
-    
-    
-      
-      
-	
The state transition actions are executed
-	  in the containing list order.  This matters
-	  for next_event where the last such in the list
-	  will become the next event to process by
-	  the current state function.  Regarding the other actions
-	  it is only for remove_event with
-	  EventPredicate
-	  and for reply_action() that the order may matter.
-	

-	
 	  reply_action()
 	  Reply to a caller.
 	  next_event
-	  Insert the given EventType
+	  
+	    Insert the given EventType
 	    and EventContent as the next to process.
 	    This will bypass any events in the process mailbox as well
 	    as any other queued events.
 	    An event of type
 	    
 	      internal
-	     should be used when you want to reliably distinguish
+	    
+	    should be used when you want to reliably distinguish
 	    an event inserted this way from any external event.
+	    If there are multiple next_event actions
+	    in the containing list they are buffered and all are
+	    inserted so the first in the list will be the
+	    first to process.
 	  
 	  remove_event
-	  Remove the oldest queued event
+	  
+	    Remove the oldest queued event
 	    that matches equal to EventType
 	    and EventContent or for which
-	    EventPredicate returns true.
+	    EventPredicate
+	    returns true.
 	  
 	  cancel_timer
-	  Cancel the timer by calling
+	  
+	    Cancel the timer by calling
 	    
 	      erlang:cancel_timer/2
-	     with TimerRef,
+	    
+	    with TimerRef,
 	    clean the process message queue from any late timeout message,
 	    and removes any late timeout message
 	    from the gen_statem event queue using
@@ -523,16 +590,20 @@ erlang:'!'            -----> Module:StateName/4
 	    the primitives mentioned above.
 	  
 	  demonitor
-	  Like cancel_timer above but for
+	  
+	    Like cancel_timer above but for
 	    
 	      demonitor/2
-	     with MonitorRef.
+	    
+	    with MonitorRef.
 	  
 	  unlink
-	  Like {cancel_timer,_} above but for
+	  
+	    Like {cancel_timer,_} above but for
 	    
 	      unlink/1
-	     with Id.
+	    
+	    with Id.
 	  
 	
       
@@ -574,19 +645,19 @@ erlang:'!'            -----> Module:StateName/4
 	    NewState
 	    (which may be the same as the current state),
 	    set NewData
-	    and execute all Ops
+	    and execute all Actions
 	  
 	  keep_state
 	  The gen_statem will keep the current state, or
 	    do a state transition to the current state if you like,
 	    set NewData
-	    and execute all Ops
+	    and execute all Actions
 	  
 	  keep_state_and_data
 	  The gen_statem will keep the current state, or
 	    do a state transition to the current state if you like,
 	    keep the current server data,
-	    and execute all Ops
+	    and execute all Actions
 	  
 	
       
@@ -776,8 +847,8 @@ erlang:'!'            -----> Module:StateName/4
 	  state function
 	  returns with
 	  {reply,Caller,Reply} as one
-	  
-	    transition_op()
+	  
+	    action()
 	  ,
 	  and that Reply becomes the return value
 	  of this function.
@@ -870,20 +941,20 @@ erlang:'!'            -----> Module:StateName/4
       
       Enter the gen_statem receive loop
       
-	
If Server_or_Ops is a list()
+	
If Server_or_Actions is a list()
 	  the same as
 	  enter_loop/7
 	  except that no
 	  
 	    server_name()
 	   must have been registered and
-	  Ops = Server_or_Ops.
+	  Actions = Server_or_Actions.
 	

 	
Otherwise the same as
 	  enter_loop/7
 	  with
-	  Server = Server_or_Ops and
-	  Ops = [].
+	  Server = Server_or_Actions and
+	  Actions = [].
 	

       
     
@@ -917,7 +988,7 @@ erlang:'!'            -----> Module:StateName/4
 	   name must have been registered accordingly
 	  before this function is called.

         
CallbackMode, State,
-	  Data and Ops
+	  Data and Actions
 	  have the same meanings as in the return value of
           Module:init/1.
           Also, the callback module Module
@@ -952,7 +1023,7 @@ erlang:'!'            -----> Module:StateName/4
       
         Args = term()
         Result = {CallbackMode,State,Data}
-	 | {CallbackMode,State,Data,Ops}
+	 | {CallbackMode,State,Data,Actions}
          | {stop,Reason} | ignore
 	CallbackMode =
 	  callback_mode()
@@ -960,8 +1031,9 @@ erlang:'!'            -----> Module:StateName/4
 	State = state()
 	Data = data()
 	
-	Ops =
-	  [transition_op()]
+	Actions =
+	  [action()] |
+	  action()
 	
 	Reason = term()
       
@@ -978,7 +1050,7 @@ erlang:'!'            -----> Module:StateName/4
           function.

         
If the initialization is successful, the function should
           return {CallbackMode,State,Data} or
-	  {CallbackMode,State,Data,Ops}.
+	  {CallbackMode,State,Data,Actions}.
 	  CallbackMode selects the
 	  callback_mode().
 	  of the gen_statem.
@@ -986,7 +1058,7 @@ erlang:'!'            -----> Module:StateName/4
 	  of the gen_statem and
 	  Data the server data()
 	

-	
The Ops
+	
The Actions
 	  are executed when entering the first
 	  state just as for a
 	  state function.
@@ -1047,7 +1119,7 @@ erlang:'!'            -----> Module:StateName/4
 	  from this or from any other
 	  state function
 	  by returning with {reply,Caller,Reply} in
-	  Ops, in
+	  Actions, in
 	  Replies
 	  or by calling
 	  
@@ -1066,7 +1138,7 @@ erlang:'!'            -----> Module:StateName/4
 	  all postponed events will be retried in the new state.
 	

 	
See
-	  transition_op()
+	  action()
 	  for options that can be set and actions that can be done
 	  by gen_statem after returning from this function.
 	

@@ -1102,7 +1174,7 @@ erlang:'!'            -----> Module:StateName/4
 	  is terminating.
           If it is because another callback function has returned a
           stop tuple {stop,Reason} in
-	  Ops,
+	  Actions,
 	  Reason will have the value specified in that tuple.
 	  If it is due to a failure, Reason is the error reason.
 	

-- 
cgit v1.2.3


From 14028aee428c135211e33df77c1bee2fdc128f6e Mon Sep 17 00:00:00 2001
From: Raimo Niskanen 
Date: Wed, 24 Feb 2016 16:36:24 +0100
Subject: Ditch PrevState

StateName/4 -> StateName/3
handle_event/5 -> handle_event/4
---
 lib/stdlib/doc/src/gen_statem.xml | 70 ++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 46 deletions(-)

(limited to 'lib/stdlib/doc')

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml
index 1e41d616e9..f21610d14c 100644
--- a/lib/stdlib/doc/src/gen_statem.xml
+++ b/lib/stdlib/doc/src/gen_statem.xml
@@ -62,12 +62,12 @@ gen_statem:stop       -----> Module:terminate/2
 gen_statem:call
 gen_statem:cast
 erlang:send
-erlang:'!'            -----> Module:StateName/4
-                             Module:handle_event/5
+erlang:'!'            -----> Module:StateName/3
+                             Module:handle_event/4
 
 -                     -----> Module:terminate/3
 
--                     -----> Module:code_change/3
+- -----> Module:code_change/4

Events are of different types so the callback functions can know the origin of an event @@ -91,28 +91,22 @@ erlang:'!' -----> Module:StateName/4 is state_functions the state has to be an atom and is used as the state function name. See - - Module:StateName/4 + + Module:StateName/3 . This gathers all code for a specific state in one function and hence dispatches on state first. Note that in this mode the callback function - - Module:code_change/4 - makes the state name code_change - unusable. Actually you might get away with using it - as a state name but you will have to find a way to separate - the two callback roles e.g by observing that you can force - argument 3 into having different types for the different roles. - This is a slippery slope, though. It is easier - to simply not use code_change as a state name. + + Module:terminate/3 + makes the state name terminate unusable.

When callback_mode is handle_event_function the state can be any term and the state function name is - - Module:handle_event/5 + + Module:handle_event/4 . This makes it easy to dispatch on state or on event as you like but you will have to implement it. @@ -120,12 +114,6 @@ erlang:'!' -----> Module:StateName/4 states so you do not accidentally postpone one event forever creating an infinite busy loop.

-

There is a small gotcha in both callback modes regarding - the state undefined that is used as the previous state - when the first state function is called. So either do not - use undefined as a state, or figure out - the implications yourself. -

The gen_statem enqueues incoming events in order of arrival and presents these to the state function @@ -378,14 +366,14 @@ erlang:'!' -----> Module:StateName/4 The state has to be of type state_name() and one callback function per state that is - - Module:StateName/4 - is used. This is the default. + + Module:StateName/3 + is used. handle_event_function The state can be any term and the callback function - - Module:handle_event/5 + + Module:handle_event/4 is used for all states. @@ -1054,9 +1042,10 @@ erlang:'!' -----> Module:StateName/4 CallbackMode selects the callback_mode(). of the gen_statem. - State is the state() - of the gen_statem and - Data the server data() + State is the initial + state() + and Data the initial server + data()

The Actions are executed when entering the first @@ -1076,11 +1065,10 @@ erlang:'!' -----> Module:StateName/4 - Module:StateName(EventType, EventContent, - PrevStateName, Data) -> Result + Module:StateName(EventType, EventContent, Data) -> Result Module:handle_event(EventType, EventContent, - PrevState, State, Data) -> Result + State, Data) -> Result Handle an event @@ -1088,10 +1076,7 @@ erlang:'!' -----> Module:StateName/4 event_type() EventContent = term() - PrevStateName = - state_name() - - PrevState = State = + State = NewState = state() Data = NewData = @@ -1109,9 +1094,9 @@ erlang:'!' -----> Module:StateName/4 cast/2 or as a normal process message one of these functions is called. If callback_mode - is state_functions then Module:StateName/4 is called, + is state_functions then Module:StateName/3 is called, and if it is handle_event_function - then Module:handle_event/5 is called. + then Module:handle_event/4 is called.

If EventType is {call,Caller} @@ -1126,13 +1111,6 @@ erlang:'!' -----> Module:StateName/4 reply(Caller, Reply) .

-

PrevStateName and PrevState are useful - in some odd cases for example when you want to do something - only at the first event in a state, or when you need to - handle events differently depending on the previous state. - Note that when gen_statem enters its first state - this is set to undefined. -

If this function returns with a new state that does not match equal (=/=) to the current state all postponed events will be retried in the new state. -- cgit v1.2.3 From 7a731535a3c4eebac00bd56ae7862c2dac25284c Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Wed, 24 Feb 2016 16:52:01 +0100 Subject: Unify whitespace in XML doc --- lib/stdlib/doc/src/gen_statem.xml | 534 +++++++++++++++++++++++--------------- 1 file changed, 330 insertions(+), 204 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index f21610d14c..da88bedf6b 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -31,7 +31,8 @@ gen_statem Generic State Machine Behaviour -

A behaviour module for implementing a state machine. +

+ A behaviour module for implementing a state machine. Two callback modes are supported. One for a finite state machine like gen_fsm that require the state to be an atom and use that state as @@ -45,9 +46,12 @@ and include functionality for tracing and error reporting. It will also fit into an OTP supervision tree. Refer to - OTP Design Principles for more information. + OTP Design Principles + + for more information.

-

A gen_statem assumes all specific parts to be located in a +

+ A gen_statem assumes all specific parts to be located in a callback module exporting a pre-defined set of functions. The relationship between the behaviour functions and the callback functions can be illustrated as follows:

@@ -68,29 +72,32 @@ erlang:'!' -----> Module:StateName/3 - -----> Module:terminate/3 - -----> Module:code_change/4 -

Events are of different +

+ Events are of different types so the callback functions can know the origin of an event and how to respond.

-

If a callback function fails or returns a bad value, +

+ If a callback function fails or returns a bad value, the gen_statem will terminate. An exception of class throw, however, is not regarded as an error but as a valid return.

-

The "state function" for a specific +

+ The "state function" for a specific state in a gen_statem is the callback function that is called for all events in this state, and is selected depending on callback_mode that the implementation specifies during gen_statem init.

-

When +

+ When callback_mode is state_functions the state has to be an atom and - is used as the state function name. - See + is used as the state function name. See Module:StateName/3 . @@ -101,8 +108,8 @@ erlang:'!' -----> Module:StateName/3 Module:terminate/3 makes the state name terminate unusable.

-

When - callback_mode +

+ When callback_mode is handle_event_function the state can be any term and the state function name is @@ -114,7 +121,8 @@ erlang:'!' -----> Module:StateName/3 states so you do not accidentally postpone one event forever creating an infinite busy loop.

-

The gen_statem enqueues incoming events in order of arrival +

+ The gen_statem enqueues incoming events in order of arrival and presents these to the state function in that order. The state function can postpone an event @@ -122,14 +130,15 @@ erlang:'!' -----> Module:StateName/3 After a state change all enqueued events (including postponed) are again presented to the state function.

-

The gen_statem event queue model is sufficient +

+ The gen_statem event queue model is sufficient to emulate the normal process message queue and selective receive with postponing an event corresponding to not matching it in a receive statement and changing states corresponding to entering a new receive statement.

-

The - state function +

+ The state function can insert events using the action() next_event @@ -143,7 +152,8 @@ erlang:'!' -----> Module:StateName/3 that can be used for such events making it impossible to mistake for an external event.

-

Inserting an event replaces the trick of calling your own +

+ Inserting an event replaces the trick of calling your own state handling functions that you often would have to resort to in e.g gen_fsm to force processing an inserted event before others. @@ -159,20 +169,24 @@ erlang:'!' -----> Module:StateName/3 for the details of a state transition.

-

A gen_statem handles system messages as documented in - sys. - The sys module - can be used for debugging a gen_statem. +

+ A gen_statem handles system messages as documented in + sys. + The sys module + can be used for debugging a gen_statem.

-

Note that a gen_statem does not trap exit signals +

+ Note that a gen_statem does not trap exit signals automatically, this must be explicitly initiated by the callback module.

-

Unless otherwise stated, all functions in this module fail if +

+ Unless otherwise stated, all functions in this module fail if the specified gen_statem does not exist or if bad arguments are given.

-

The gen_statem process can go into hibernation (see +

+ The gen_statem process can go into hibernation (see erlang:hibernate/3 ) if a @@ -192,11 +206,13 @@ erlang:'!' -----> Module:StateName/3 -

Name specification to use when starting - a gen_statem server. - See +

+ Name specification to use when starting + a gen_statem server. See + start_link/3 - and + + and server_ref() below. @@ -206,12 +222,14 @@ erlang:'!' -----> Module:StateName/3 -

Server specification to use when addressing +

+ Server specification to use when addressing a gen_statem server. See call/2 and server_name() - above. + + above.

It can be:

@@ -219,15 +237,18 @@ erlang:'!' -----> Module:StateName/3 LocalName The gen_statem is locally registered. Name, Node - The gen_statem is locally registered + + The gen_statem is locally registered on another node. GlobalName - The gen_statem is globally registered + + The gen_statem is globally registered in global. RegMod, ViaName - The gen_statem is registered through + + The gen_statem is registered through an alternative process registry. The registry callback module RegMod should export the functions @@ -244,11 +265,13 @@ erlang:'!' -----> Module:StateName/3 -

Debug option that can be used when starting +

+ Debug option that can be used when starting a gen_statem server through for example enter_loop/4.

-

For every entry in Dbgs +

+ For every entry in Dbgs the corresponding function in sys will be called.

@@ -257,7 +280,8 @@ erlang:'!' -----> Module:StateName/3 -

Options that can be used when starting +

+ Options that can be used when starting a gen_statem server through for example start_link/3.

@@ -266,7 +290,8 @@ erlang:'!' -----> Module:StateName/3 -

Return value from the start functions for_example +

+ Return value from the start functions for_example start_link/3.

@@ -275,7 +300,8 @@ erlang:'!' -----> Module:StateName/3 -

Destination to use when replying through for example the +

+ Destination to use when replying through for example the action() {reply,Caller,Reply} @@ -287,7 +313,8 @@ erlang:'!' -----> Module:StateName/3 -

After a state change (NewState =/= State) +

+ After a state change (NewState =/= State) all postponed events are retried.

@@ -295,10 +322,12 @@ erlang:'!' -----> Module:StateName/3 -

If +

+ If callback_mode - is state_functions, which is the default, + + is state_functions, which is the default, the state has to be of this type.

@@ -306,7 +335,8 @@ erlang:'!' -----> Module:StateName/3 -

A term in which the state machine implementation +

+ A term in which the state machine implementation should store any server data it needs. The difference between this and the state() itself is that a change in this data does not cause @@ -320,7 +350,8 @@ erlang:'!' -----> Module:StateName/3 -

External events are of 3 different type: +

+ External events are of 3 different type: {call,Caller}, cast or info. Calls (synchronous) and casts (asynchronous) originate from the corresponding API functions. @@ -337,7 +368,8 @@ erlang:'!' -----> Module:StateName/3 -

A fun() of arity 2 that takes an event +

+ A fun() of arity 2 that takes an event and returns a boolean. When used in the action() @@ -363,18 +395,22 @@ erlang:'!' -----> Module:StateName/3

state_functions - The state has to be of type + + The state has to be of type state_name() and one callback function per state that is Module:StateName/3 - is used. + + is used. handle_event_function - The state can be any term and the callback function + + The state can be any term and the callback function Module:handle_event/4 - is used for all states. + + is used for all states. @@ -388,9 +424,10 @@ erlang:'!' -----> Module:StateName/3 and they modify how the state transition is done:

- All - actions - are processed in order of appearance. + + All + actions + are processed in order of appearance. If the @@ -481,14 +518,16 @@ erlang:'!' -----> Module:StateName/3 -

These state transition actions may be invoked by +

+ These state transition actions may be invoked by returning them from the state function, from Module:init/1 or by giving them to enter_loop/6,7.

-

Actions are executed in the containing list order. +

+ Actions are executed in the containing list order. The order matters for some actions such as next_event and reply_action(). The order can in peculiar cases matter for remove_event with @@ -599,12 +638,14 @@ erlang:'!' -----> Module:StateName/3 -

Reply to a caller waiting for a reply in +

+ Reply to a caller waiting for a reply in call/2. Caller must be the term from the {call,Caller} - argument to the + + argument to the state function.

@@ -614,35 +655,42 @@ erlang:'!' -----> Module:StateName/3 stop - Terminate the gen_statem by calling + + Terminate the gen_statem by calling Module:terminate/3 - with Reason and + + with Reason and NewData, if given. stop_and_reply - Send all Replies + + Send all Replies then terminate the gen_statem by calling Module:terminate/3 - with Reason and + + with Reason and NewData, if given. next_state - The gen_statem will do a state transition to + + The gen_statem will do a state transition to NewState (which may be the same as the current state), set NewData and execute all Actions keep_state - The gen_statem will keep the current state, or + + The gen_statem will keep the current state, or do a state transition to the current state if you like, set NewData and execute all Actions keep_state_and_data - The gen_statem will keep the current state, or + + The gen_statem will keep the current state, or do a state transition to the current state if you like, keep the current server data, and execute all Actions @@ -659,7 +707,8 @@ erlang:'!' -----> Module:StateName/3 Create a linked gen_statem process -

Creates a gen_statem process according +

+ Creates a gen_statem process according to OTP design principles (using proc_lib @@ -668,82 +717,88 @@ erlang:'!' -----> Module:StateName/3 This is essential when the gen_statem shall be part of a supervision tree so it gets linked to its supervisor.

-

The gen_statem process calls +

+ The gen_statem process calls Module:init/1 to initialize the server. To ensure a synchronized start-up procedure, start_link/3,4 does not return until Module:init/1 has returned.

-

ServerName specifies the +

+ ServerName specifies the server_name() - to register for the gen_statem. + + to register for the gen_statem. If the gen_statem is started with start_link/3 no ServerName is provided and the gen_statem is not registered.

Module is the name of the callback module.

-

Args is an arbitrary term which is passed as +

+ Args is an arbitrary term which is passed as the argument to - Module:init/1 - . + Module:init/1.

-

If the option {timeout,Time} is present in +

+ If the option {timeout,Time} is present in Opts, the gen_statem is allowed to spend Time milliseconds initializing or it will be terminated and the start function will return - - {error,timeout} - . + {error,timeout}.

-

If the option +

+ If the option {debug,Dbgs} is present in Opts, debugging through sys is activated.

-

If the option {spawn_opt,SpawnOpts} is present in +

+ If the option {spawn_opt,SpawnOpts} is present in Opts, SpawnOpts will be passed as option list to spawn_opt/2 which is used to spawn the gen_statem process.

-

Using the spawn option monitor is currently not +

+ Using the spawn option monitor is currently not allowed, but will cause this function to fail with reason - badarg.

+ badarg. +

-

If the gen_statem is successfully created +

+ If the gen_statem is successfully created and initialized this function returns {ok,Pid}, - where Pid is the pid() + + where Pid is the pid() of the gen_statem. If there already exists a process with the specified ServerName this function returns - - {error,{already_started,Pid}} - , where Pid is the pid() of that process. + {error,{already_started,Pid}}, + where Pid is the pid() of that process.

-

If Module:init/1 fails with Reason, +

+ If Module:init/1 fails with Reason, this function returns - - {error,Reason} - . If Module:init/1 returns + {error,Reason}. + If Module:init/1 returns {stop,Reason} or - - ignore - , the process is terminated and this function + ignore, + the process is terminated and this function returns {error,Reason} - or - - ignore - , respectively. + + or + ignore, + respectively.

@@ -754,7 +809,8 @@ erlang:'!' -----> Module:StateName/3 Create a stand-alone gen_statem process -

Creates a stand-alone gen_statem process according to +

+ Creates a stand-alone gen_statem process according to OTP design principles (using proc_lib primitives). @@ -762,7 +818,8 @@ erlang:'!' -----> Module:StateName/3 this start function can not be used by a supervisor to start a child.

-

See start_link/3,4 +

+ See start_link/3,4 for a description of arguments and return values.

@@ -772,10 +829,9 @@ erlang:'!' -----> Module:StateName/3 Synchronously stop a generic server -

The same as - - stop(ServerRef, normal, infinity) - . +

+ The same as + stop(ServerRef, normal, infinity).

@@ -783,33 +839,37 @@ erlang:'!' -----> Module:StateName/3 Synchronously stop a generic server -

Orders the gen_statem +

+ Orders the gen_statem ServerRef - to exit with the given Reason + + to exit with the given Reason and waits for it to terminate. The gen_statem will call Module:terminate/3 - before exiting. + + before exiting.

-

This function returns ok if the server terminates +

+ This function returns ok if the server terminates with the expected reason. Any other reason than normal, shutdown, or {shutdown,Term} will cause an error report to be issued through - - error_logger:format/2 - . + error_logger:format/2. The default Reason is normal.

-

Timeout is an integer greater than zero +

+ Timeout is an integer greater than zero which specifies how many milliseconds to wait for the server to terminate, or the atom infinity to wait indefinitely. The default value is infinity. If the server has not terminated within the specified time, a timeout exception is raised.

-

If the process does not exist, a noproc exception +

+ If the process does not exist, a noproc exception is raised.

@@ -820,10 +880,12 @@ erlang:'!' -----> Module:StateName/3 Make a synchronous call to a gen_statem -

Makes a synchronous call to the gen_statem +

+ Makes a synchronous call to the gen_statem ServerRef - by sending a request + + by sending a request and waiting until its reply arrives. The gen_statem will call the state function with @@ -831,23 +893,24 @@ erlang:'!' -----> Module:StateName/3 {call,Caller} and event content Request.

-

A Reply is generated when a +

+ A Reply is generated when a state function returns with {reply,Caller,Reply} as one - - action() - , + action(), and that Reply becomes the return value of this function.

-

Timeout is an integer greater than zero +

+ Timeout is an integer greater than zero which specifies how many milliseconds to wait for a reply, or the atom infinity to wait indefinitely, which is the default. If no reply is received within the specified time, the function call fails. -

To avoid getting a late reply in the caller's +

+ To avoid getting a late reply in the caller's inbox this function spawns a proxy process that does the call. A late reply gets delivered to the dead proxy process hence gets discarded. This is @@ -856,7 +919,8 @@ erlang:'!' -----> Module:StateName/3

-

The call may fail for example if the gen_statem dies +

+ The call may fail for example if the gen_statem dies before or during this function call.

@@ -866,10 +930,12 @@ erlang:'!' -----> Module:StateName/3 Send an asynchronous event to a gen_statem -

Sends an asynchronous event to the gen_statem +

+ Sends an asynchronous event to the gen_statem ServerRef - and returns ok immediately, + + and returns ok immediately, ignoring if the destination node or gen_statem does not exist. The gen_statem will call the @@ -886,26 +952,31 @@ erlang:'!' -----> Module:StateName/3 Reply to a caller -

This function can be used by a gen_statem +

+ This function can be used by a gen_statem to explicitly send a reply to a process that waits in call/2 when the reply cannot be defined in the return value of a state function.

-

Caller must be the term from the +

+ Caller must be the term from the {call,Caller} - argument to the + + argument to the state function. Caller and Reply can also be specified using a reply_action() - and multiple replies with a list of them. + + and multiple replies with a list of them.

-

A reply sent with this function will not be visible +

+ A reply sent with this function will not be visible in sys debug output.

@@ -916,12 +987,14 @@ erlang:'!' -----> Module:StateName/3 Enter the gen_statem receive loop -

The same as +

+ The same as enter_loop/7 except that no server_name() - must have been registered. + + must have been registered.

@@ -929,16 +1002,19 @@ erlang:'!' -----> Module:StateName/3 Enter the gen_statem receive loop -

If Server_or_Actions is a list() +

+ If Server_or_Actions is a list() the same as enter_loop/7 except that no server_name() - must have been registered and + + must have been registered and Actions = Server_or_Actions.

-

Otherwise the same as +

+ Otherwise the same as enter_loop/7 with Server = Server_or_Actions and @@ -950,7 +1026,8 @@ erlang:'!' -----> Module:StateName/3 Enter the gen_statem receive loop -

Makes an the calling process become a gen_statem. +

+ Makes an the calling process become a gen_statem. Does not return, instead the calling process will enter the gen_statem receive loop and become a gen_statem server. @@ -960,35 +1037,36 @@ erlang:'!' -----> Module:StateName/3 The user is responsible for any initialization of the process, including registering a name for it.

-

This function is useful when a more complex initialization +

+ This function is useful when a more complex initialization procedure is needed than the gen_statem behaviour provides.

-

Module, Opts and +

+ Module, Opts and Server have the same meanings as when calling - - gen_statem:start[_link]/3,4 - . + gen_statem:start[_link]/3,4. However, the server_name() - name must have been registered accordingly + + name must have been registered accordingly before this function is called.

-

CallbackMode, State, +

+ CallbackMode, State, Data and Actions have the same meanings as in the return value of Module:init/1. Also, the callback module Module does not need to export an init/1 function.

-

Failure: If the calling process was not started by a +

+ Failure: If the calling process was not started by a proc_lib start function, or if it is not registered according to - - server_name() - . + server_name().

@@ -999,7 +1077,8 @@ erlang:'!' -----> Module:StateName/3
CALLBACK FUNCTIONS -

The following functions should be exported from a +

+ The following functions should be exported from a gen_statem callback module.

@@ -1013,13 +1092,16 @@ erlang:'!' -----> Module:StateName/3 Result = {CallbackMode,State,Data}  | {CallbackMode,State,Data,Actions}  | {stop,Reason} | ignore - CallbackMode = + + CallbackMode = callback_mode() State = state() - Data = data() + + Data = data() - Actions = + + Actions = [action()] | action() @@ -1027,16 +1109,20 @@ erlang:'!' -----> Module:StateName/3 -

Whenever a gen_statem is started using +

+ Whenever a gen_statem is started using start_link/3,4 or start/3,4, this function is called by the new process to initialize the implementation state and server data.

-

Args is the Args argument provided to the start - function.

-

If the initialization is successful, the function should +

+ Args is the Args argument provided to the start + function. +

+

+ If the initialization is successful, the function should return {CallbackMode,State,Data} or {CallbackMode,State,Data,Actions}. CallbackMode selects the @@ -1045,19 +1131,22 @@ erlang:'!' -----> Module:StateName/3 State is the initial state() and Data the initial server - data() + data().

-

The Actions +

+ The Actions are executed when entering the first state just as for a state function.

-

If something goes wrong during the initialization +

+ If something goes wrong during the initialization the function should return {stop,Reason} or ignore. See start_link/3,4.

-

This function may use +

+ This function may use throw to return Result.

@@ -1072,24 +1161,29 @@ erlang:'!' -----> Module:StateName/3 Handle an event - EventType = + + EventType = event_type() EventContent = term() - State = NewState = + + State = NewState = state() - Data = NewData = + + Data = NewData = data() - Result = + + Result = state_callback_result() -

Whenever a gen_statem receives an event from +

+ Whenever a gen_statem receives an event from call/2, cast/2 or as a normal process message one of these functions is called. @@ -1098,7 +1192,8 @@ erlang:'!' -----> Module:StateName/3 and if it is handle_event_function then Module:handle_event/4 is called.

-

If EventType is +

+ If EventType is {call,Caller} the caller is waiting for a reply. The reply can be sent from this or from any other @@ -1107,20 +1202,20 @@ erlang:'!' -----> Module:StateName/3 Actions, in Replies or by calling - - reply(Caller, Reply) - . + reply(Caller, Reply).

-

If this function returns with a new state that +

+ If this function returns with a new state that does not match equal (=/=) to the current state all postponed events will be retried in the new state.

-

See - action() +

+ See action() for options that can be set and actions that can be done by gen_statem after returning from this function.

-

These functions may use +

+ These functions may use throw, to return Result.

@@ -1133,22 +1228,24 @@ erlang:'!' -----> Module:StateName/3 Reason = normal | shutdown | {shutdown,term()} | term() State = state() - Data = data() - + Data = data() Ignored = term() -

This function is called by a gen_statem +

+ This function is called by a gen_statem when it is about to terminate. It should be the opposite of Module:init/1 and do any necessary cleaning up. When it returns, the gen_statem terminates with Reason. The return value is ignored.

-

Reason is a term denoting the stop reason and +

+ Reason is a term denoting the stop reason and State is the internal state of the gen_statem.

-

Reason depends on why the gen_statem +

+ Reason depends on why the gen_statem is terminating. If it is because another callback function has returned a stop tuple {stop,Reason} in @@ -1156,36 +1253,41 @@ erlang:'!' -----> Module:StateName/3 Reason will have the value specified in that tuple. If it is due to a failure, Reason is the error reason.

-

If the gen_statem is part of a supervision tree and is +

+ If the gen_statem is part of a supervision tree and is ordered by its supervisor to terminate, this function will be called with Reason = shutdown if the following conditions apply:

- the gen_statem has been set + + the gen_statem has been set to trap exit signals, and - the shutdown strategy as defined in the supervisor's + + the shutdown strategy as defined in the supervisor's child specification is an integer timeout value, not brutal_kill. -

Even if the gen_statem is not +

+ Even if the gen_statem is not part of a supervision tree, this function will be called if it receives an 'EXIT' message from its parent. Reason will be the same as in the 'EXIT' message.

-

Otherwise, the gen_statem will be immediately terminated. +

+ Otherwise, the gen_statem will be immediately terminated.

-

Note that for any other reason than normal, +

+ Note that for any other reason than normal, shutdown, or {shutdown,Term} the gen_statem is assumed to terminate due to an error and an error report is issued using - - error_logger:format/2 - . + error_logger:format/2.

-

This function may use +

+ This function may use throw to return Ignored, which is ignored anyway.

@@ -1203,16 +1305,19 @@ erlang:'!' -----> Module:StateName/3 OldState = NewState = term() Extra = term() Result = {ok,{NewState,NewData}} | Reason - OldState = NewState = + + OldState = NewState = state() - OldData = NewData = + + OldData = NewData = data() Reason = term() -

This function is called by a gen_statem when it should +

+ This function is called by a gen_statem when it should update its internal state during a release upgrade/downgrade, i.e. when the instruction {update,Module,Change,...} where Change={advanced,Extra} is given in @@ -1222,26 +1327,32 @@ erlang:'!' -----> Module:StateName/3 for more information.

-

In the case of an upgrade, OldVsn is Vsn, and +

+ In the case of an upgrade, OldVsn is Vsn, and in the case of a downgrade, OldVsn is {down,Vsn}. Vsn is defined by the vsn attribute(s) of the old version of the callback module Module. If no such attribute is defined, the version is the checksum of the BEAM file.

-

OldState and OldData is the internal state +

+ OldState and OldData is the internal state of the gen_statem.

-

Extra is passed as-is from the {advanced,Extra} +

+ Extra is passed as-is from the {advanced,Extra} part of the update instruction.

-

If successful, the function shall return the updated +

+ If successful, the function shall return the updated internal state in an {ok,{NewState,NewData}} tuple.

-

If the function returns Reason, the ongoing +

+ If the function returns Reason, the ongoing upgrade will fail and roll back to the old release.

-

This function may use +

+ This function may use throw to return Result or Reason.

@@ -1257,10 +1368,12 @@ erlang:'!' -----> Module:StateName/3 Opt = normal | terminate PDict = [{Key, Value}] - State = + + State = state() - Data = + + Data = data() Key = term() @@ -1269,7 +1382,8 @@ erlang:'!' -----> Module:StateName/3 -

This callback is optional, so a callback module need not +

+ This callback is optional, so a callback module need not export it. The gen_statem module provides a default implementation of this function that returns {State,Data}. If this callback fails the default @@ -1280,43 +1394,52 @@ erlang:'!' -----> Module:StateName/3

This function is called by a gen_statem process when:

- One of + + One of sys:get_status/1,2 is invoked to get the gen_statem status. Opt is set to the atom normal for this case. - The gen_statem terminates abnormally and logs an error. + + The gen_statem terminates abnormally and logs an error. Opt is set to the atom terminate for this case. -

This function is useful for customising the form and +

+ This function is useful for customising the form and appearance of the gen_statem status for these cases. A callback module wishing to customise the sys:get_status/1,2 - return value as well as how + + return value as well as how its status appears in termination error logs exports an instance of format_status/2 that returns a term describing the current status of the gen_statem.

-

PDict is the current value of the gen_statem's +

+ PDict is the current value of the gen_statem's process dictionary.

-

State +

+ State is the internal state of the gen_statem.

-

Data +

+ Data is the internal server data of the gen_statem.

-

The function should return Status, a term that +

+ The function should return Status, a term that customises the details of the current state and status of the gen_statem. There are no restrictions on the form Status can take, but for the sys:get_status/1,2 - case (when Opt + + case (when Opt is normal), the recommended form for the Status value is [{data, [{"State", Term}]}] where Term provides relevant details of @@ -1325,14 +1448,17 @@ erlang:'!' -----> Module:StateName/3 consistent with the rest of the sys:get_status/1,2 - return value. + + return value.

-

One use for this function is to return compact alternative +

+ One use for this function is to return compact alternative state representations to avoid having large state terms printed in logfiles. Another is to hide sensitive data from being written to the error log.

-

This function may use +

+ This function may use throw to return Status.

-- cgit v1.2.3 From edc94441562b255467773ec27b11835910a708fd Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 25 Feb 2016 15:12:48 +0100 Subject: Remove {keep_state_and_data} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Correct typo reported by Luïc Hoguin. --- lib/stdlib/doc/src/gen_statem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index da88bedf6b..35b842c173 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -61,7 +61,7 @@ gen_statem module Callback module gen_statem:start gen_statem:start_link -----> Module:init/1 -gen_statem:stop -----> Module:terminate/2 +gen_statem:stop -----> Module:terminate/3 gen_statem:call gen_statem:cast -- cgit v1.2.3 From 63b291070d5522b5b116c8fe158497ee55149656 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 25 Feb 2016 15:45:32 +0100 Subject: Clarify documentation after Torben Hoffman's comments --- lib/stdlib/doc/src/gen_statem.xml | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 35b842c173..4af6732e7c 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -374,7 +374,7 @@ erlang:'!' -----> Module:StateName/3 When used in the action() {remove_event,RemoveEventPredicate}, - the event for which the predicate returns true + the oldest event for which the predicate returns true will be removed.

@@ -441,6 +441,14 @@ erlang:'!' -----> Module:StateName/3 If the state changes the queue of incoming events is reset to start with the oldest postponed. + + All events inserted with + + action() next_event + + are inserted in the queue to be processed before + all other events. + If the @@ -450,7 +458,8 @@ erlang:'!' -----> Module:StateName/3 timeout is set a state timer may be started or a timeout zero event - may be enqueued as the newest incoming. + may be enqueued as the newest incoming that is the last + to process before going into receive for new events. The (possibly new) @@ -582,16 +591,16 @@ erlang:'!' -----> Module:StateName/3 and EventContent as the next to process. This will bypass any events in the process mailbox as well as any other queued events. + All next_event actions + in the containing list are buffered and inserted + after the actions have been done + so the first in the list will be the first to process. An event of type internal should be used when you want to reliably distinguish an event inserted this way from any external event. - If there are multiple next_event actions - in the containing list they are buffered and all are - inserted so the first in the list will be the - first to process. remove_event @@ -599,7 +608,11 @@ erlang:'!' -----> Module:StateName/3 that matches equal to EventType and EventContent or for which EventPredicate - returns true. + returns true. Note that next_event + and postpone events in the same actions list + does not get into the event queue until after all actions + has been done so you can not remove an event that you insert + in the same actions list. Make up your mind! cancel_timer -- cgit v1.2.3 From cea77ca09be156669c657592bebf6efc9d5cfaee Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 25 Feb 2016 16:02:59 +0100 Subject: Write a simple example in the reference manual --- lib/stdlib/doc/src/gen_statem.xml | 188 +++++++++++++++++++++++++++++--------- 1 file changed, 144 insertions(+), 44 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 4af6732e7c..d50b88c561 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -91,7 +91,7 @@ erlang:'!' -----> Module:StateName/3 in a gen_statem is the callback function that is called for all events in this state, and is selected depending on callback_mode - that the implementation specifies during gen_statem init. + that the implementation specifies when the the server starts.

When @@ -103,7 +103,8 @@ erlang:'!' -----> Module:StateName/3 . This gathers all code for a specific state in one function and hence dispatches on state first. - Note that in this mode the callback function + Note that in this mode the fact that there is + a mandatory callback function Module:terminate/3 makes the state name terminate unusable. @@ -115,9 +116,8 @@ erlang:'!' -----> Module:StateName/3 Module:handle_event/4 . - This makes it easy to dispatch on state or on event as - you like but you will have to implement it. - Also be careful about which events you handle in which + This makes it easy to dispatch on state or on event as you desire. + Be careful about which events you handle in which states so you do not accidentally postpone one event forever creating an infinite busy loop.

@@ -132,9 +132,9 @@ erlang:'!' -----> Module:StateName/3

The gen_statem event queue model is sufficient - to emulate the normal process message queue and selective receive - with postponing an event corresponding to not matching - it in a receive statement and changing states corresponding + to emulate the normal process message queue with selective receive. + Postponing an event corresponds to not matching it + in a receive statement and changing states corresponds to entering a new receive statement.

@@ -149,8 +149,8 @@ erlang:'!' -----> Module:StateName/3 event_type() internal - that can be used for such events making it impossible - to mistake for an external event. + that can be used for such events making them impossible + to mistake for external events.

Inserting an event replaces the trick of calling your own @@ -165,7 +165,7 @@ erlang:'!' -----> Module:StateName/3

See the type - transition_option(). + transition_option() for the details of a state transition.

@@ -192,7 +192,7 @@ erlang:'!' -----> Module:StateName/3 ) if a state function or Module:init/1 - specifies 'hibernate' in the returned + specifies hibernate in the returned Actions list. This might be useful if the server is expected to be idle for a long time. However use this feature with care @@ -202,6 +202,99 @@ erlang:'!' -----> Module:StateName/3

+
+ EXAMPLE +

+ This example shows a simple pushbutton model + for a toggling pushbutton implemented with + + callback_mode() + + state_functions. + You can push the button and it replies if it went on or off, + and you can ask for a count of how many times it has been + pushed to on. +

+

This is the complete callback module file pushbutton.erl:

+ +-module(pushbutton). +-behaviour(gen_statem). + +-export([start/0,push/0,get_count/0,stop/0]). +-export([terminate/3,code_change/4,init/1]). +-export([on/3,off/3]). + +name() -> pushbutton_statem. % The registered server name + +%% API. This example uses a registered name name() +%% and does not link to the caller. +start() -> + gen_statem:start({local,name()}, ?MODULE, [], []). +push() -> + gen_statem:call(name(), push). +get_count() -> + gen_statem:call(name(), get_count). +stop() -> + gen_statem:stop(name()). + +%% Mandatory callback functions +terminate(_Reason, _State, _Data) -> + void. +code_change(_Vsn, State, Data, _Extra) -> + {ok,{State,Data}}. +init([]) -> + %% Set the callback mode and initial state + data. + %% Data is used only as a counter. + State = off, Data = 0, + {state_functions,State,Data}. + + +%%% State functions + +off({call,Caller}, push, Data) -> + %% Go to 'on', increment count and reply + %% that the resulting status is 'on' + {next_state,on,Data+1,[{reply,Caller,on}]}; +off(EventType, EventContent, Data) -> + handle_event(EventType, EventContent, Data). + +on({call,Caller}, push, Data) -> + %% Go to 'off' and reply that the resulting status is 'off' + {next_state,off,Data,[{reply,Caller,off}]}; +on(EventType, EventContent, Data) -> + handle_event(EventType, EventContent, Data). + +%% Handle events common to all states +handle_event({call,Caller}, get_count, Data) -> + %% Reply with the current count + {keep_state,Data,[{reply,Caller,Data}]}; +handle_event(_, _, Data) -> + %% Ignore all other events + {keep_state,Data}. + +

And this is a shell session when running it:

+ 
+1> pushbutton:start().
+{ok,<0.36.0>}
+2> pushbutton:get_count().
+0
+3> pushbutton:push().
+on
+4> pushbutton:get_count().
+1
+5> pushbutton:push().
+off
+6> pushbutton:get_count().
+1
+7> pushbutton:stop().
+ok
+8> pushbutton:push().
+** exception exit: {noproc,{gen_statem,call,[pushbutton_statem,push,infinity]}}
+     in function  gen:do_for_proc/2 (gen.erl, line 261)
+     in call from gen_statem:call/3 (gen_statem.erl, line 386)
+
+
+ @@ -327,7 +420,7 @@ erlang:'!' -----> Module:StateName/3 callback_mode - is state_functions, which is the default, + is state_functions, the state has to be of this type.

@@ -353,11 +446,14 @@ erlang:'!' -----> Module:StateName/3

External events are of 3 different type: {call,Caller}, cast or info. - Calls (synchronous) and casts (asynchronous) + Calls + (synchronous) and + casts originate from the corresponding API functions. For calls the event contain whom to reply to. - Type info originates from normal messages sent - to the gen_statem process. + Type info originates from + regular process messages sent + to the gen_statem. It is also possible for the state machine implementation to insert events to itself, in particular of types @@ -421,7 +517,8 @@ erlang:'!' -----> Module:StateName/3

Transition options may be set by actions - and they modify how the state transition is done: + and they modify some details below in how + the state transition is done:

@@ -430,12 +527,12 @@ erlang:'!' -----> Module:StateName/3 are processed in order of appearance. - If the + If - transition_option() + postpone() - postpone - is true the current event is postponed. + is true + the current event is postponed. If the state changes the queue of incoming events @@ -450,15 +547,16 @@ erlang:'!' -----> Module:StateName/3 all other events. - If the - - transition_option() - + If a - timeout + state_timeout() + + is set through + + action() timeout - is set a state timer may be started or a timeout zero event - may be enqueued as the newest incoming that is the last + a state timer may be started or a timeout zero event + may be enqueued as the newest incoming, that is the last to process before going into receive for new events. @@ -466,7 +564,12 @@ erlang:'!' -----> Module:StateName/3 state function is called with the oldest enqueued event if there is any, otherwise the gen_statem goes into receive - or hibernation (if the option hibernate is true) + or hibernation + (if + + hibernate() + + is true) to wait for the next message. In hibernation the next non-system event awakens the gen_statem, or rather the next incoming message awakens the gen_statem @@ -518,7 +621,7 @@ erlang:'!' -----> Module:StateName/3 Also note that it is not possible nor needed to cancel this timeout using the - action() cancel_timer. + action() cancel_timer since this timeout is cancelled automatically by any other event.

@@ -538,25 +641,22 @@ erlang:'!' -----> Module:StateName/3

Actions are executed in the containing list order. The order matters for some actions such as next_event - and reply_action(). The order can in peculiar cases - matter for remove_event with - EventPredicate versus other - event removal actions. + and reply_action().

- The order also matters for actions that set + Actions that set transition options - since setting an option overrides any previous - of the same kind, so the last in the containing list wins. + overrides any previous of the same kind, + so the last in the containing list wins.

postpone Set the - transition_option() postpone + transition_option() postpone() for this state transition. This action is ignored when returned from @@ -569,7 +669,7 @@ erlang:'!' -----> Module:StateName/3 Set the - transition_option() hibernate + transition_option() hibernate() for this state transition. @@ -577,7 +677,7 @@ erlang:'!' -----> Module:StateName/3 Set the - transition_option() timeout + transition_option() state_timeout() to Time with the EventContent as Msg @@ -594,7 +694,7 @@ erlang:'!' -----> Module:StateName/3 All next_event actions in the containing list are buffered and inserted after the actions have been done - so the first in the list will be the first to process. + so that the first in the list will be the first to process. An event of type internal @@ -612,7 +712,7 @@ erlang:'!' -----> Module:StateName/3 and postpone events in the same actions list does not get into the event queue until after all actions has been done so you can not remove an event that you insert - in the same actions list. Make up your mind! + with the same actions list. Make up your mind! cancel_timer @@ -622,7 +722,7 @@ erlang:'!' -----> Module:StateName/3 with TimerRef, clean the process message queue from any late timeout message, - and removes any late timeout message + and remove any late timeout message from the gen_statem event queue using {remove_event,EventPredicate} above. This is a convenience function that saves quite some @@ -639,7 +739,7 @@ erlang:'!' -----> Module:StateName/3 unlink - Like {cancel_timer,_} above but for + Like cancel_timer above but for unlink/1 -- cgit v1.2.3 From 1e4831762b5ab4bd2210fc9e0a204e00dfe81b39 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 26 Feb 2016 10:35:16 +0100 Subject: Implement 'keep_state_and_data' and 'stop' --- lib/stdlib/doc/src/gen_statem.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index d50b88c561..bda3ef081d 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -803,12 +803,17 @@ ok keep_state_and_data - The gen_statem will keep the current state, or + The gen_statem will keep the current state or do a state transition to the current state if you like, keep the current server data, and execute all Actions +

+ All these terms are tuples or atoms and this property + will hold in any future version of gen_statem, + just in case you need such a promise. +

-- cgit v1.2.3 From e660572b020da58c89149c7f052c7127cc0263cb Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Mon, 29 Feb 2016 11:36:27 +0100 Subject: Remove the remove_event action and all alike Removing events from the internal queues is not necessary with the choosen semantics of the event queue vs. hibernate. In an early implementation it was possible by combining hibernate with e.g. postpone to get an event in the queue that you would not see before processing the postponed event, and therefore should you decide to cancel a timer it was essential to be able to remove that unseen event from the queue. With the choosen semantics you will have to postpone or generate an event for it to be in the event queue, and if you e.g. postpone a timeout event and then cancel the timer it is your mistake. You have seen the event and should know better than to try to cancel the timer. So, the actions: remove_event, cancel_timer, demonitor and unlink are now removed. There have also been some cleanup of the timer handling code. --- lib/stdlib/doc/src/gen_statem.xml | 71 +++------------------------------------ 1 file changed, 4 insertions(+), 67 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index bda3ef081d..04b80d29ac 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -461,24 +461,6 @@ ok

- - - -

- A fun() of arity 2 that takes an event - and returns a boolean. - When used in the - action() - {remove_event,RemoveEventPredicate}, - the oldest event for which the predicate returns true - will be removed. -

-

- The predicate may not use a throw exception - to return its result. -

- - @@ -617,13 +599,11 @@ ok counts just like a new in this respect. If the value is infinity no timer is started. If it is 0 the timeout event - is immediately enqueued as the newest received. + is immediately enqueued as the newest received + (unless there are retried or inserted events to process). Also note that it is not possible nor needed - to cancel this timeout using the - - action() cancel_timer - - since this timeout is cancelled automatically by any other event. + to cancel this timeout since it is cancelled automatically + by any other event.

@@ -702,49 +682,6 @@ ok should be used when you want to reliably distinguish an event inserted this way from any external event. - remove_event - - Remove the oldest queued event - that matches equal to EventType - and EventContent or for which - EventPredicate - returns true. Note that next_event - and postpone events in the same actions list - does not get into the event queue until after all actions - has been done so you can not remove an event that you insert - with the same actions list. Make up your mind! - - cancel_timer - - Cancel the timer by calling - - erlang:cancel_timer/2 - - with TimerRef, - clean the process message queue from any late timeout message, - and remove any late timeout message - from the gen_statem event queue using - {remove_event,EventPredicate} above. - This is a convenience function that saves quite some - lines of code and testing time over doing it from - the primitives mentioned above. - - demonitor - - Like cancel_timer above but for - - demonitor/2 - - with MonitorRef. - - unlink - - Like cancel_timer above but for - - unlink/1 - - with Id. - -- cgit v1.2.3 From 9dfb4e6cf574870ac6e6a5a2a507c989c64e7525 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 1 Mar 2016 08:31:58 +0100 Subject: Change code_change/4 to {ok,State,Data} --- lib/stdlib/doc/src/gen_statem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 04b80d29ac..01be3099c1 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -241,7 +241,7 @@ stop() -> terminate(_Reason, _State, _Data) -> void. code_change(_Vsn, State, Data, _Extra) -> - {ok,{State,Data}}. + {ok,State,Data}. init([]) -> %% Set the callback mode and initial state + data. %% Data is used only as a counter. @@ -1359,7 +1359,7 @@ ok   Vsn = term() OldState = NewState = term() Extra = term() - Result = {ok,{NewState,NewData}} | Reason + Result = {ok,NewState,NewData} | Reason OldState = NewState = state() -- cgit v1.2.3 From 6a8efbde7620e3fc6fffe354cb01edee5d13fc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Thu, 25 Jun 2015 13:28:14 +0200 Subject: stdlib: Add filename:basedir/2,3 --- lib/stdlib/doc/src/filename.xml | 156 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index 77e262dbe6..65009753f3 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -47,7 +47,12 @@

The module supports raw file names in the way that if a binary is present, or the file name cannot be interpreted according to the return value of file:native_name_encoding/0, a raw file name will also be returned. For example filename:join/1 provided with a path component being a binary (and also not being possible to interpret under the current native file name encoding) will result in a raw file name being returned (the join operation will have been performed of course). For more information about raw file names, see the file module.

- + + + + + + @@ -101,6 +106,155 @@ from the result - minimizing its length.

 + + + Equivalent to basedir(Type,Application,#{}). + +

+ Equivalent to + basedir(Type, Application, #{}). +

+ + + + + + +

+ Returns a suitable path, or paths, for a given type. + If os is not set in Opts the function will default to + the native option, i.e. 'linux', 'darwin' or 'windows', as understood + by os:type/0. Anything not recognized as 'darwin' or 'windows' is + interpreted as 'linux'.

+

+ The options 'author' and 'version' are only used with 'windows' option mode. +

+ + user_cache +

The path location is intended for transient data files on a local machine.

+

+ On Linux: + Respects the os environment variable XDG_CACHE_HOME. +

+ 
+1> filename:basedir(user_cache, "my_application", #{os=>linux}).
+"/home/otptest/.cache/my_application"
+ On Darwin: 
+1> filename:basedir(user_cache, "my_application", #{os=>darwin}).
+"/home/otptest/Library/Caches/my_application"
+ On Windows: 
+1> filename:basedir(user_cache, "My App").
+"c:/Users/otptest/AppData/Local/My App/Cache"
+2> filename:basedir(user_cache, "My App").
+"c:/Users/otptest/AppData/Local/My App/Cache"
+3> filename:basedir(user_cache, "My App", #{author=>"Erlang"}).
+"c:/Users/otptest/AppData/Local/Erlang/My App/Cache"
+4> filename:basedir(user_cache, "My App", #{version=>"1.2"}).
+"c:/Users/otptest/AppData/Local/My App/1.2/Cache"
+5> filename:basedir(user_cache, "My App", #{author=>"Erlang",version=>"1.2"}).
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2/Cache"
+ + user_config +

+ The path location is intended for persistent configuration files. +

+

+ On Linux: + Respects the os environment variable XDG_CONFIG_HOME. +

+ 
+2> filename:basedir(user_config, "my_application", #{os=>linux}).
+"/home/otptest/.config/my_application"
+ On Darwin:
+2> filename:basedir(user_config, "my_application", #{os=>darwin}).
+"/home/otptest/Library/Application Support/my_application"
+ On Windows:
+1> filename:basedir(user_config, "My App").
+"c:/Users/otptest/AppData/Roaming/My App"
+2> filename:basedir(user_config, "My App", #{author=>"Erlang", version=>"1.2"}).
+"c:/Users/otptest/AppData/Roaming/Erlang/My App/1.2"
+ + user_data +

+ The path location is intended for persistent data files. +

+

+ On Linux: + Respects the os environment variable XDG_DATA_HOME. +

+ 
+3> filename:basedir(user_data, "my_application", #{os=>linux}).
+"/home/otptest/.local/my_application"
+ On Darwin:
+3> filename:basedir(user_data, "my_application", #{os=>darwin}).
+"/home/otptest/Library/Application Support/my_application"
+ On Windows:
+8> filename:basedir(user_data, "My App").
+"c:/Users/otptest/AppData/Local/My App"
+9> filename:basedir(user_data, "My App",#{author=>"Erlang",version=>"1.2"}).
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2"
+ + user_log +

The path location is intended for transient log files on a local machine.

+

+ On Linux: + Respects the os environment variable XDG_CACHE_HOME.

+ 
+4> filename:basedir(user_log, "my_application", #{os=>linux}).
+"/home/otptest/.cache/my_application/log"
+ On Darwin:
+4> filename:basedir(user_log, "my_application", #{os=>darwin}).
+"/home/otptest/Library/Caches/my_application"
+ On Windows:
+12> filename:basedir(user_log, "My App").
+"c:/Users/otptest/AppData/Local/My App/Logs"
+13> filename:basedir(user_log, "My App",#{author=>"Erlang",version=>"1.2"}).
+"c:/Users/otptest/AppData/Local/Erlang/My App/1.2/Logs"
+ + site_config

+ On Linux: + Respects the os environment variable XDG_CONFIG_DIRS.

+
+5> filename:basedir(site_data, "my_application", #{os=>linux}).
+["/usr/local/share/my_application",
+ "/usr/share/my_application"]
+6> os:getenv("XDG_CONFIG_DIRS").
+"/etc/xdg/xdg-ubuntu:/usr/share/upstart/xdg:/etc/xdg"
+7> filename:basedir(site_config, "my_application", #{os=>linux}).
+["/etc/xdg/xdg-ubuntu/my_application",
+ "/usr/share/upstart/xdg/my_application",
+ "/etc/xdg/my_application"]
+8> os:unsetenv("XDG_CONFIG_DIRS").
+true
+9> filename:basedir(site_config, "my_application", #{os=>linux}).
+["/etc/xdg/my_application"]
+ On Darwin:
+5> filename:basedir(site_config, "my_application", #{os=>darwin}).
+["/Library/Application Support/my_application"]
+ + site_data

+ On Linux: + Respects the os environment variable XDG_DATA_DIRS.

+ 
+10> os:getenv("XDG_DATA_DIRS").
+"/usr/share/ubuntu:/usr/share/gnome:/usr/local/share/:/usr/share/"
+11> filename:basedir(site_data, "my_application", #{os=>linux}).
+["/usr/share/ubuntu/my_application",
+ "/usr/share/gnome/my_application",
+ "/usr/local/share/my_application",
+ "/usr/share/my_application"]
+12> os:unsetenv("XDG_DATA_DIRS").
+true
+13> filename:basedir(site_data, "my_application", #{os=>linux}).
+["/usr/local/share/my_application",
+ "/usr/share/my_application"]
+ On Darwin:
+5> filename:basedir(site_data, "my_application", #{os=>darwin}).
+["/Library/Application Support/my_application"]
+ + + + Return the last component of a filename -- cgit v1.2.3 From d840b24857a1d54419953661f70716c449c11864 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 3 Mar 2016 10:54:01 +0100 Subject: Fix most of the system docs and emacs mode --- lib/stdlib/doc/src/gen_statem.xml | 87 +++++++++++++++++++++++++++++---------- lib/stdlib/doc/src/proc_lib.xml | 8 ++-- lib/stdlib/doc/src/supervisor.xml | 10 +++-- lib/stdlib/doc/src/sys.xml | 31 +++++++++----- 4 files changed, 97 insertions(+), 39 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 01be3099c1..db6a4e03ea 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -407,7 +407,7 @@ ok

- After a state change (NewState =/= State) + After a state change (NextState =/= State) all postponed events are retried.

@@ -566,7 +566,7 @@ ok

If true postpone the current event and retry it when the state changes that is: - NewState =/= State. + NextState =/= State.

@@ -701,7 +701,47 @@ ok - + + + + next_state + + The gen_statem will do a state transition to + NextStateName + (which may be the same as the current state), + set NewData + and execute all Actions + + +

+ All these terms are tuples or atoms and this property + will hold in any future version of gen_statem, + just in case you need such a promise. +

+ + + + + + + next_state + + The gen_statem will do a state transition to + NextState + (which may be the same as the current state), + set NewData + and execute all Actions + + +

+ All these terms are tuples or atoms and this property + will hold in any future version of gen_statem, + just in case you need such a promise. +

+ + + + stop @@ -723,14 +763,6 @@ ok with Reason and NewData, if given. - next_state - - The gen_statem will do a state transition to - NewState - (which may be the same as the current state), - set NewData - and execute all Actions - keep_state The gen_statem will keep the current state, or @@ -1209,10 +1241,11 @@ ok - Module:StateName(EventType, EventContent, Data) -> Result + Module:StateName(EventType, EventContent, Data) -> + StateFunctionResult Module:handle_event(EventType, EventContent, - State, Data) -> Result + State, Data) -> HandleEventResult Handle an event @@ -1222,7 +1255,7 @@ ok EventContent = term() - State = NewState = + State = state() @@ -1230,9 +1263,15 @@ ok data() - Result = - - state_callback_result() + StateFunctionResult = + + state_function_result() + + + + HandleEventResult = + + handle_event_result() @@ -1260,9 +1299,15 @@ ok reply(Caller, Reply).

- If this function returns with a new state that + If this function returns with a next state that does not match equal (=/=) to the current state - all postponed events will be retried in the new state. + all postponed events will be retried in the next state. +

+

+ The only difference between StateFunctionResult and + HandleEventResult is that for StateFunctionResult + the next state has to be an atom but for HandleEventResult + there is no restriction on the next state.

See action() @@ -1272,7 +1317,7 @@ ok

These functions may use throw, - to return Result. + to return the result.

@@ -1401,7 +1446,7 @@ ok

If successful, the function shall return the updated internal state in an - {ok,{NewState,NewData}} tuple. + {ok,NewState,NewData} tuple.

If the function returns Reason, the ongoing diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 85f0c0c908..245580b1ba 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -4,7 +4,7 @@

- 19962014 + 19962016 Ericsson AB. All Rights Reserved. @@ -34,9 +34,9 @@

This module is used to start processes adhering to the OTP Design Principles. Specifically, the functions in this module are used by the OTP standard behaviors (gen_server, - gen_fsm, ...) when starting new processes. The functions - can also be used to start special processes, user - defined processes which comply to the OTP design principles. See + gen_fsm, gen_statem, ...) when starting new processes. + The functions can also be used to start special processes, + user defined processes which comply to the OTP design principles. See Sys and Proc_Lib in OTP Design Principles for an example.

Some useful information is initialized when a process starts. The registered names, or the process identifiers, of the parent diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 24ff251ce3..9d81fb0db7 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -4,7 +4,7 @@

- 19962014 + 19962016 Ericsson AB. All Rights Reserved. @@ -34,8 +34,8 @@

A behaviour module for implementing a supervisor, a process which supervises other processes called child processes. A child process can either be another supervisor or a worker process. - Worker processes are normally implemented using one of - the gen_event, gen_fsm, or gen_server + Worker processes are normally implemented using one of the + gen_event, gen_fsm, gen_statem or gen_server behaviours. A supervisor implemented using this module will have a standard set of interface functions and include functionality for tracing and error reporting. Supervisors are used to build a @@ -221,7 +221,8 @@

modules is used by the release handler during code replacement to determine which processes are using a certain module. As a rule of thumb, if the child process is a - supervisor, gen_server, or gen_fsm, + supervisor, gen_server, + gen_fsm or gen_statem this should be a list with one element [Module], where Module is the callback module. If the child process is an event manager (gen_event) with a @@ -633,6 +634,7 @@ SEE ALSO

gen_event(3), gen_fsm(3), + gen_statem(3), gen_server(3), sys(3)

diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index d400f72e1d..2255395f46 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. @@ -217,14 +217,18 @@ processes. For example, a gen_server process returns the callback module's state, a gen_fsm process returns information such as its current state name and state data, - and a gen_event process returns information about each of its + a gen_statem process returns information about + its current state and data, and a gen_event process + returns information about each of its registered handlers. Callback modules for gen_server, - gen_fsm, and gen_event can also customise the value + gen_fsm, gen_statem and gen_event + can also customise the value of Misc by exporting a format_status/2 function that contributes module-specific information; - see gen_server:format_status/2, - gen_fsm:format_status/2, and - gen_event:format_status/2 + see gen_server format_status/2, + gen_fsm format_status/2, + gen_statem format_status/2, and + gen_event format_status/2 for more details.

@@ -245,6 +249,8 @@ processes. For a gen_server process, the returned State is simply the callback module's state. For a gen_fsm process, State is the tuple {CurrentStateName, CurrentStateData}. + For a gen_statem process State is + the tuple {CurrentState,CurrentData}. For a gen_event process, State a list of tuples, where each tuple corresponds to an event handler registered in the process and contains {Module, Id, HandlerState}, where Module is the event handler's module name, @@ -263,8 +269,9 @@ details of the exception.

The system_get_state/1 function is primarily useful for user-defined behaviours and modules that implement OTP special - processes. The gen_server, gen_fsm, and gen_event OTP - behaviour modules export this function, and so callback modules for those behaviours + processes. The gen_server, gen_fsm, + gen_statem and gen_event OTP + behaviour modules export this function, so callback modules for those behaviours need not supply their own.

To obtain more information about a process, including its state, see get_status/1 and @@ -290,6 +297,8 @@ gen_fsm process, State is the tuple {CurrentStateName, CurrentStateData}, and NewState is a similar tuple that may contain a new state name, new state data, or both. + The same applies for a gen_statem process but + it names the tuple fields {CurrentState,CurrentData}. For a gen_event process, State is the tuple {Module, Id, HandlerState} where Module is the event handler's module name, Id is the handler's ID (which is the value false if it was registered without @@ -304,7 +313,8 @@ state, then regardless of process type, it may simply return its State argument.

If a StateFun function crashes or throws an exception, then - for gen_server and gen_fsm processes, the original state of the process is + for gen_server, gen_fsm or gen_statem processes, + the original state of the process is unchanged. For gen_event processes, a crashing or failing StateFun function means that only the state of the particular event handler it was working on when it failed or crashed is unchanged; it can still succeed in changing the states of other event @@ -329,7 +339,8 @@ {callback_failed, StateFun, {Class, Reason}}.

The system_replace_state/2 function is primarily useful for user-defined behaviours and modules that implement OTP special processes. The - gen_server, gen_fsm, and gen_event OTP behaviour modules export this function, + gen_server, gen_fsm, gen_statem and + gen_event OTP behaviour modules export this function, and so callback modules for those behaviours need not supply their own.

-- cgit v1.2.3 From 447f3cf2d041670d93683de4fab02338b26fbaf1 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 3 Mar 2016 11:27:02 +0100 Subject: Rename state_timeout -> event_timeout --- lib/stdlib/doc/src/gen_statem.xml | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index db6a4e03ea..4489ddfb91 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -155,7 +155,7 @@ erlang:'!' -----> Module:StateName/3

Inserting an event replaces the trick of calling your own state handling functions that you often would have to - resort to in e.g gen_fsm + resort to in for example gen_fsm to force processing an inserted event before others. If you for example in gen_statem postpone an event in one state and then call some other state function of yours, @@ -529,17 +529,16 @@ ok all other events. - If a - - state_timeout() + If an + + event_timeout() is set through action() timeout - a state timer may be started or a timeout zero event - may be enqueued as the newest incoming, that is the last - to process before going into receive for new events. + an event timer may be started or a timeout zero event + may be enqueued. The (possibly new) @@ -588,7 +587,7 @@ ok - +

Generate an event of @@ -600,7 +599,8 @@ ok If the value is infinity no timer is started. If it is 0 the timeout event is immediately enqueued as the newest received - (unless there are retried or inserted events to process). + (unless there are retried or inserted events to process + since then the timeout is cancelled). Also note that it is not possible nor needed to cancel this timeout since it is cancelled automatically by any other event. @@ -653,15 +653,25 @@ ok for this state transition. + Timeout + + Short for {timeout,Timeout} that is + the timeout message is the timeout time. + This form exists to make the + state function + return value {next_state,NextState,NewData,Timeout} + allowed like for + + gen_fsm Module:StateName/2. + timeout Set the - transition_option() state_timeout() + transition_option() event_timeout() to Time with the - EventContent as Msg - for the next state. + EventContent as Msg. reply_action() Reply to a caller. @@ -1419,7 +1429,7 @@ ok

This function is called by a gen_statem when it should update its internal state during a release upgrade/downgrade, - i.e. when the instruction {update,Module,Change,...} + that is when the instruction {update,Module,Change,...} where Change={advanced,Extra} is given in the appup file. See -- cgit v1.2.3 From 65d2eecef2dedb012abcc76c855b8da90934f10c Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 4 Mar 2016 14:28:27 +0100 Subject: Fix broken documenation reference --- lib/stdlib/doc/src/gen_statem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 4489ddfb91..4708fc1301 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -361,7 +361,7 @@ ok

Debug option that can be used when starting a gen_statem server through for example - enter_loop/4. + enter_loop/5.

For every entry in Dbgs -- cgit v1.2.3 From 0f8afe80c6582f7affd17f36dc9cb48cc7946713 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Mon, 14 Mar 2016 10:46:23 +0100 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 267a993a1b..5d4f9d912f 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,93 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 2.8 + +
Fixed Bugs and Malfunctions + + +

+ Fix evaluation in matching of bound map key variables in + the interpreter.

+

+ Prior to this patch, the following code would not + evaluate: X = key,(fun(#{X := value}) -> true + end)(#{X => value})

+

+ Own Id: OTP-13218

+ + +

Fix erl_eval not using non-local function + handler.

+

+ Own Id: OTP-13228 Aux Id: ERL-32

+ + +

The Erlang Code Linter no longer crashes if there is + a -deprecated() attribute but no -module() + declaration.

+

+ Own Id: OTP-13230 Aux Id: ERL-62

+ + +

+ The timestamp in the result returned by dets:info(Tab, + safe_fixed) was unintentionally broken as a result of + the time API rewrites in OTP 18.0. This has now been + fixed.

+

+ Own Id: OTP-13239 Aux Id: OTP-11997

+ + +

A rare race condition in beam_lib when using + encrypted abstract format has been eliminated.

+

+ Own Id: OTP-13278

+ + +

+ Improved maps:with/2 and maps:without/2 algorithms

+

+ The new implementation speeds up the execution + significantly for all sizes of input.

+

+ Own Id: OTP-13376

+ + +
+ + +
Improvements and New Features + + +

+ Time warp safety improvements.

+

+ Introduced the options monotonic_timestamp, and + strict_monotonic_timestamp to the trace, + sequential trace, and system profile functionality. This + since the already existing timestamp option is not + time warp safe.

+

+ Introduced the option safe_fixed_monotonic_time to + ets:info/2 and dets:info/2. This since the + already existing safe_fixed option is not time + warp safe.

+

+ Own Id: OTP-13222 Aux Id: OTP-11997

+ + +

+ In the shell Ctrl+W (delete word) will no longer consider + "." as being part of a word.

+

+ Own Id: OTP-13281

+ + +
+ +
+
STDLIB 2.7
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 6664eed554974336909d3ffe03f20349cc4c38fd Mon Sep 17 00:00:00 2001 From: Henrik Nord Date: Tue, 15 Mar 2016 15:19:56 +0100 Subject: update copyright-year --- lib/stdlib/doc/src/array.xml | 2 +- lib/stdlib/doc/src/base64.xml | 2 +- lib/stdlib/doc/src/binary.xml | 2 +- lib/stdlib/doc/src/book.xml | 2 +- lib/stdlib/doc/src/c.xml | 2 +- lib/stdlib/doc/src/calendar.xml | 2 +- lib/stdlib/doc/src/dets.xml | 2 +- lib/stdlib/doc/src/dict.xml | 2 +- lib/stdlib/doc/src/digraph.xml | 2 +- lib/stdlib/doc/src/digraph_utils.xml | 2 +- lib/stdlib/doc/src/epp.xml | 2 +- lib/stdlib/doc/src/erl_eval.xml | 2 +- lib/stdlib/doc/src/erl_expand_records.xml | 2 +- lib/stdlib/doc/src/erl_id_trans.xml | 2 +- lib/stdlib/doc/src/erl_internal.xml | 2 +- lib/stdlib/doc/src/erl_lint.xml | 2 +- lib/stdlib/doc/src/erl_pp.xml | 2 +- lib/stdlib/doc/src/erl_tar.xml | 2 +- lib/stdlib/doc/src/ets.xml | 2 +- lib/stdlib/doc/src/file_sorter.xml | 2 +- lib/stdlib/doc/src/filelib.xml | 2 +- lib/stdlib/doc/src/filename.xml | 2 +- lib/stdlib/doc/src/gen_event.xml | 2 +- lib/stdlib/doc/src/gen_fsm.xml | 2 +- lib/stdlib/doc/src/gen_server.xml | 2 +- lib/stdlib/doc/src/io.xml | 2 +- lib/stdlib/doc/src/io_lib.xml | 2 +- lib/stdlib/doc/src/io_protocol.xml | 2 +- lib/stdlib/doc/src/lib.xml | 2 +- lib/stdlib/doc/src/lists.xml | 2 +- lib/stdlib/doc/src/log_mf_h.xml | 2 +- lib/stdlib/doc/src/maps.xml | 2 +- lib/stdlib/doc/src/math.xml | 2 +- lib/stdlib/doc/src/ms_transform.xml | 2 +- lib/stdlib/doc/src/notes.xml | 2 +- lib/stdlib/doc/src/notes_history.xml | 2 +- lib/stdlib/doc/src/ordsets.xml | 2 +- lib/stdlib/doc/src/part.xml | 2 +- lib/stdlib/doc/src/part_notes.xml | 2 +- lib/stdlib/doc/src/part_notes_history.xml | 2 +- lib/stdlib/doc/src/pool.xml | 2 +- lib/stdlib/doc/src/proc_lib.xml | 2 +- lib/stdlib/doc/src/proplists.xml | 2 +- lib/stdlib/doc/src/qlc.xml | 2 +- lib/stdlib/doc/src/queue.xml | 2 +- lib/stdlib/doc/src/random.xml | 2 +- lib/stdlib/doc/src/re.xml | 2 +- lib/stdlib/doc/src/shell.xml | 2 +- lib/stdlib/doc/src/shell_default.xml | 2 +- lib/stdlib/doc/src/slave.xml | 2 +- lib/stdlib/doc/src/sofs.xml | 2 +- lib/stdlib/doc/src/stdlib_app.xml | 2 +- lib/stdlib/doc/src/string.xml | 2 +- lib/stdlib/doc/src/supervisor.xml | 2 +- lib/stdlib/doc/src/supervisor_bridge.xml | 2 +- lib/stdlib/doc/src/sys.xml | 2 +- lib/stdlib/doc/src/timer.xml | 2 +- lib/stdlib/doc/src/unicode.xml | 2 +- lib/stdlib/doc/src/unicode_usage.xml | 2 +- lib/stdlib/doc/src/win32reg.xml | 2 +- lib/stdlib/doc/src/zip.xml | 2 +- 61 files changed, 61 insertions(+), 61 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index 0f33e2621c..bff98245bf 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -3,7 +3,7 @@
- 20072014 + 20072016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml index 276d28e174..7b82d7dd3d 100644 --- a/lib/stdlib/doc/src/base64.xml +++ b/lib/stdlib/doc/src/base64.xml @@ -4,7 +4,7 @@
- 20072013 + 20072016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 2682198fe5..5402fd0163 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -5,7 +5,7 @@
2009 - 2014 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/book.xml b/lib/stdlib/doc/src/book.xml index 043f6cc19b..84ce3f0788 100644 --- a/lib/stdlib/doc/src/book.xml +++ b/lib/stdlib/doc/src/book.xml @@ -4,7 +4,7 @@
- 19972013 + 19972016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml index e5238fa7db..9b4a9489c0 100644 --- a/lib/stdlib/doc/src/c.xml +++ b/lib/stdlib/doc/src/c.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index 853184dc0f..38bf55679e 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 48400733d1..177c2ba508 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index e10531caac..20bab99a9c 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 291be6c08b..16dd789caf 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index 639069543c..9bddee546f 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -4,7 +4,7 @@
- 20002013 + 20002016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index 8c901f57ec..0802f0e47c 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml index ba988e7ca2..d60b04b510 100644 --- a/lib/stdlib/doc/src/erl_eval.xml +++ b/lib/stdlib/doc/src/erl_eval.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml index 497b371434..93e464c733 100644 --- a/lib/stdlib/doc/src/erl_expand_records.xml +++ b/lib/stdlib/doc/src/erl_expand_records.xml @@ -5,7 +5,7 @@
2005 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml index 30eb213493..153bd4148e 100644 --- a/lib/stdlib/doc/src/erl_id_trans.xml +++ b/lib/stdlib/doc/src/erl_id_trans.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml index e1ee50b424..940f8c5b40 100644 --- a/lib/stdlib/doc/src/erl_internal.xml +++ b/lib/stdlib/doc/src/erl_internal.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml index 318cb5ac19..3747b0f3c3 100644 --- a/lib/stdlib/doc/src/erl_lint.xml +++ b/lib/stdlib/doc/src/erl_lint.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml index 4b8a571c81..e96fd576ec 100644 --- a/lib/stdlib/doc/src/erl_pp.xml +++ b/lib/stdlib/doc/src/erl_pp.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 898b55df72..1f4a43f622 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 447fe51130..4e430d101e 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index f033eebec7..bc24f02a99 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -4,7 +4,7 @@
- 20012013 + 20012016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml index 2cf9490f4b..3ad159a66d 100644 --- a/lib/stdlib/doc/src/filelib.xml +++ b/lib/stdlib/doc/src/filelib.xml @@ -4,7 +4,7 @@
- 20032013 + 20032016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index ce6aba3657..f284a7596c 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -4,7 +4,7 @@
- 19972013 + 19972016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index c4bab45781..b2c482d3ed 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 4d594b8eb2..37e7c6ed17 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 6d04771cd4..02da11250a 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index 4655c8662f..9ae50ed90c 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml index cd58090dcd..b22ec15a0c 100644 --- a/lib/stdlib/doc/src/io_lib.xml +++ b/lib/stdlib/doc/src/io_lib.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml index 170dab17ca..f2a669a49a 100644 --- a/lib/stdlib/doc/src/io_protocol.xml +++ b/lib/stdlib/doc/src/io_protocol.xml @@ -5,7 +5,7 @@
1999 - 2013 + 2016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml index f4dddf646d..ac41987eaf 100644 --- a/lib/stdlib/doc/src/lib.xml +++ b/lib/stdlib/doc/src/lib.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 89ba5238b5..a8435efc6f 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml index eccda516ba..65622e52f5 100644 --- a/lib/stdlib/doc/src/log_mf_h.xml +++ b/lib/stdlib/doc/src/log_mf_h.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index 48c1abc2f8..0f58f19421 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -4,7 +4,7 @@
- 20132014 + 20132016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml index aee6c3f238..38084638f6 100644 --- a/lib/stdlib/doc/src/math.xml +++ b/lib/stdlib/doc/src/math.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml index 22cb39c576..84712486ea 100644 --- a/lib/stdlib/doc/src/ms_transform.xml +++ b/lib/stdlib/doc/src/ms_transform.xml @@ -4,7 +4,7 @@
- 20022013 + 20022016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 5d4f9d912f..87f5335723 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -4,7 +4,7 @@
- 20042013 + 20042016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/notes_history.xml b/lib/stdlib/doc/src/notes_history.xml index 25641fdf3a..efcb5ac7df 100644 --- a/lib/stdlib/doc/src/notes_history.xml +++ b/lib/stdlib/doc/src/notes_history.xml @@ -4,7 +4,7 @@
- 20062013 + 20062016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml index 639e041d79..0d5d618b66 100644 --- a/lib/stdlib/doc/src/ordsets.xml +++ b/lib/stdlib/doc/src/ordsets.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/part.xml b/lib/stdlib/doc/src/part.xml index f7074d3404..15b7bd4a1d 100644 --- a/lib/stdlib/doc/src/part.xml +++ b/lib/stdlib/doc/src/part.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/part_notes.xml b/lib/stdlib/doc/src/part_notes.xml index 6ceead1af5..461de749dd 100644 --- a/lib/stdlib/doc/src/part_notes.xml +++ b/lib/stdlib/doc/src/part_notes.xml @@ -4,7 +4,7 @@
- 20042013 + 20042016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/part_notes_history.xml b/lib/stdlib/doc/src/part_notes_history.xml index 36792b12e1..8fd048a41e 100644 --- a/lib/stdlib/doc/src/part_notes_history.xml +++ b/lib/stdlib/doc/src/part_notes_history.xml @@ -5,7 +5,7 @@
2006 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml index e9c574038c..d217d071da 100644 --- a/lib/stdlib/doc/src/pool.xml +++ b/lib/stdlib/doc/src/pool.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 85f0c0c908..bef037076b 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml index de4fbd3a7f..832df9556a 100644 --- a/lib/stdlib/doc/src/proplists.xml +++ b/lib/stdlib/doc/src/proplists.xml @@ -4,7 +4,7 @@
- 20022013 + 20022016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml index 8101b6458c..2966e94ec1 100644 --- a/lib/stdlib/doc/src/qlc.xml +++ b/lib/stdlib/doc/src/qlc.xml @@ -4,7 +4,7 @@
- 20042013 + 20042016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index c1665a1ed4..e1a96f5c65 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index fc4f796863..dea4e43c95 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 8c19926b10..fda79d51d5 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -5,7 +5,7 @@
2007 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml index 22a3321298..65c441203c 100644 --- a/lib/stdlib/doc/src/shell.xml +++ b/lib/stdlib/doc/src/shell.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/shell_default.xml b/lib/stdlib/doc/src/shell_default.xml index 51cd3b62d3..4a90b7d7cc 100644 --- a/lib/stdlib/doc/src/shell_default.xml +++ b/lib/stdlib/doc/src/shell_default.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml index 8c16cbf5b1..244822568b 100644 --- a/lib/stdlib/doc/src/slave.xml +++ b/lib/stdlib/doc/src/slave.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index 53f6ca957a..cf0855bc85 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -4,7 +4,7 @@
- 20012013 + 20012016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml index 43bcad9098..5508be9c5d 100644 --- a/lib/stdlib/doc/src/stdlib_app.xml +++ b/lib/stdlib/doc/src/stdlib_app.xml @@ -4,7 +4,7 @@
- 20052013 + 20052016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml index d64db6c7ee..a9ecb60244 100644 --- a/lib/stdlib/doc/src/string.xml +++ b/lib/stdlib/doc/src/string.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 815bf4a489..421306283c 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml index d356b4b57e..e40c8bbd6f 100644 --- a/lib/stdlib/doc/src/supervisor_bridge.xml +++ b/lib/stdlib/doc/src/supervisor_bridge.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index d400f72e1d..d80ec4dfa6 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 7609487300..4f259d57a8 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -4,7 +4,7 @@
- 19962013 + 19962016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml index 966eec49f5..edc6830cb5 100644 --- a/lib/stdlib/doc/src/unicode.xml +++ b/lib/stdlib/doc/src/unicode.xml @@ -5,7 +5,7 @@
1996 - 2013 + 2016 Ericsson AB, All Rights Reserved diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index c4cb193b07..b4c9385e33 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -5,7 +5,7 @@
1999 - 2014 + 2016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml index 2a5a4a462d..52a8942c59 100644 --- a/lib/stdlib/doc/src/win32reg.xml +++ b/lib/stdlib/doc/src/win32reg.xml @@ -4,7 +4,7 @@
- 20002013 + 20002016 Ericsson AB. All Rights Reserved. diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 186c8ac724..09a6587583 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -4,7 +4,7 @@
- 20062013 + 20062016 Ericsson AB. All Rights Reserved. -- cgit v1.2.3 From 0eddc557de9b0a996ab42aefd66f3229a06f6675 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 17 Mar 2016 15:41:26 +0100 Subject: Do documentation improvements from Fred Hebert --- lib/stdlib/doc/src/gen_statem.xml | 66 ++++++++++++++++++++++++++++++++------- 1 file changed, 54 insertions(+), 12 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 4708fc1301..90d2326954 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -35,10 +35,10 @@ A behaviour module for implementing a state machine. Two callback modes are supported. One for a finite state machine like gen_fsm - that require the state to be an atom and use that state as + that requires the state to be an atom and use that state as the name of the callback function for a particular state, - and one without restriction on the state that use the same - callback function for all states. + and one without restriction on the state data type + that uses the same callback function for all states.

A generic state machine process (gen_statem) implemented @@ -96,7 +96,7 @@ erlang:'!' -----> Module:StateName/3

When callback_mode - is state_functions the state has to be an atom and + is state_functions, the state has to be an atom and is used as the state function name. See Module:StateName/3 @@ -127,8 +127,8 @@ erlang:'!' -----> Module:StateName/3 state function in that order. The state function can postpone an event so it is not retried in the current state. - After a state change all enqueued events (including postponed) - are again presented to the state function. + After a state change all enqueued events (including postponed ones) + are presented again to the state function.

The gen_statem event queue model is sufficient @@ -177,8 +177,10 @@ erlang:'!' -----> Module:StateName/3

Note that a gen_statem does not trap exit signals - automatically, this must be explicitly initiated by - the callback module. + automatically, this must be explicitly initiated in + the callback module (by calling + + process_flag(trap_exit, true).

Unless otherwise stated, all functions in this module fail if @@ -293,6 +295,42 @@ ok in function gen:do_for_proc/2 (gen.erl, line 261) in call from gen_statem:call/3 (gen_statem.erl, line 386) + +

+ And just to compare styles here is the same example using + + callback_mode + + state_functions, or rather here is code to replace + from the init/1 function of the pushbutton + example module above: +

+ +init([]) -> + %% Set the callback mode and initial state + data. + %% Data is used only as a counter. + State = off, Data = 0, + {handle_event_function,State,Data}. + + +%%% Event handling + +handle_event({call,Caller}, push, off, Data) -> + %% Go to 'on', increment count and reply + %% that the resulting status is 'on' + {next_state,on,Data+1,[{reply,Caller,on}]}; +handle_event({call,Caller}, push, on, Data) -> + %% Go to 'off' and reply that the resulting status is 'off' + {next_state,off,Data,[{reply,Caller,off}]}; +%% +%% Event handling common to all states +handle_event({call,Caller}, get_count, State, Data) -> + %% Reply with the current count + {next_state,State,Data,[{reply,Caller,Data}]}; +handle_event(_, _, State, Data) -> + %% Ignore all other events + {next_state,State,Data}. +
@@ -564,8 +602,8 @@ ok

If true postpone the current event and retry - it when the state changes that is: - NextState =/= State. + it when the state changes + (NextState =/= State).

@@ -778,14 +816,18 @@ ok The gen_statem will keep the current state, or do a state transition to the current state if you like, set NewData - and execute all Actions + and execute all Actions. + This is the same as + {next_state,CurrentState,NewData,Actions}. keep_state_and_data The gen_statem will keep the current state or do a state transition to the current state if you like, keep the current server data, - and execute all Actions + and execute all Actions. + This is the same as + {next_state,CurrentState,CurrentData,Actions}.

-- cgit v1.2.3 From 2cd331fec3e08799bdd482399e8c969102e1142f Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 17 Mar 2016 16:05:35 +0100 Subject: Change Caller -> From as suggested by Fred Hebert --- lib/stdlib/doc/src/gen_statem.xml | 50 +++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 90d2326954..83f7dc1c8a 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -253,23 +253,23 @@ init([]) -> %%% State functions -off({call,Caller}, push, Data) -> +off({call,From}, push, Data) -> %% Go to 'on', increment count and reply %% that the resulting status is 'on' - {next_state,on,Data+1,[{reply,Caller,on}]}; + {next_state,on,Data+1,[{reply,From,on}]}; off(EventType, EventContent, Data) -> handle_event(EventType, EventContent, Data). -on({call,Caller}, push, Data) -> +on({call,From}, push, Data) -> %% Go to 'off' and reply that the resulting status is 'off' - {next_state,off,Data,[{reply,Caller,off}]}; + {next_state,off,Data,[{reply,From,off}]}; on(EventType, EventContent, Data) -> handle_event(EventType, EventContent, Data). %% Handle events common to all states -handle_event({call,Caller}, get_count, Data) -> +handle_event({call,From}, get_count, Data) -> %% Reply with the current count - {keep_state,Data,[{reply,Caller,Data}]}; + {keep_state,Data,[{reply,From,Data}]}; handle_event(_, _, Data) -> %% Ignore all other events {keep_state,Data}. @@ -315,18 +315,18 @@ init([]) -> %%% Event handling -handle_event({call,Caller}, push, off, Data) -> +handle_event({call,From}, push, off, Data) -> %% Go to 'on', increment count and reply %% that the resulting status is 'on' - {next_state,on,Data+1,[{reply,Caller,on}]}; -handle_event({call,Caller}, push, on, Data) -> + {next_state,on,Data+1,[{reply,From,on}]}; +handle_event({call,From}, push, on, Data) -> %% Go to 'off' and reply that the resulting status is 'off' - {next_state,off,Data,[{reply,Caller,off}]}; + {next_state,off,Data,[{reply,From,off}]}; %% %% Event handling common to all states -handle_event({call,Caller}, get_count, State, Data) -> +handle_event({call,From}, get_count, State, Data) -> %% Reply with the current count - {next_state,State,Data,[{reply,Caller,Data}]}; + {next_state,State,Data,[{reply,From,Data}]}; handle_event(_, _, State, Data) -> %% Ignore all other events {next_state,State,Data}. @@ -429,12 +429,12 @@ handle_event(_, _, State, Data) -> - +

Destination to use when replying through for example the - action() {reply,Caller,Reply} + action() {reply,From,Reply} to a process that has called the gen_statem server using call/2. @@ -483,7 +483,7 @@ handle_event(_, _, State, Data) ->

External events are of 3 different type: - {call,Caller}, cast or info. + {call,From}, cast or info. Calls (synchronous) and casts @@ -739,9 +739,9 @@ handle_event(_, _, State, Data) ->

Reply to a caller waiting for a reply in call/2. - Caller must be the term from the + From must be the term from the - {call,Caller} + {call,From} argument to the state function. @@ -1029,14 +1029,14 @@ handle_event(_, _, State, Data) -> The gen_statem will call the state function with event_type() - {call,Caller} and event content + {call,From} and event content Request.

A Reply is generated when a state function returns with - {reply,Caller,Reply} as one + {reply,From,Reply} as one action(), and that Reply becomes the return value of this function. @@ -1100,13 +1100,13 @@ handle_event(_, _, State, Data) -> state function.

- Caller must be the term from the + From must be the term from the - {call,Caller} + {call,From} argument to the state function. - Caller and Reply + From and Reply can also be specified using a reply_action() @@ -1340,15 +1340,15 @@ handle_event(_, _, State, Data) ->

If EventType is - {call,Caller} + {call,From} the caller is waiting for a reply. The reply can be sent from this or from any other state function - by returning with {reply,Caller,Reply} in + by returning with {reply,From,Reply} in Actions, in Replies or by calling - reply(Caller, Reply). + reply(From, Reply).

If this function returns with a next state that -- cgit v1.2.3 From 6bf2768c6836440634019d69231534ed69fcf982 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 18 Mar 2016 10:23:48 +0100 Subject: Do more intricate Fred Hebert doc changes --- lib/stdlib/doc/src/gen_statem.xml | 126 +++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 57 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 83f7dc1c8a..bd70c4c37e 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -127,8 +127,7 @@ erlang:'!' -----> Module:StateName/3 state function in that order. The state function can postpone an event so it is not retried in the current state. - After a state change all enqueued events (including postponed ones) - are presented again to the state function. + After a state change the queue restarts with the postponed events.

The gen_statem event queue model is sufficient @@ -157,10 +156,10 @@ erlang:'!' -----> Module:StateName/3 state handling functions that you often would have to resort to in for example gen_fsm to force processing an inserted event before others. - If you for example in gen_statem postpone an event - in one state and then call some other state function of yours, - you have not changed states and hence the postponed event - will not be retried, which is logical but might be confusing. + A warning, though: if you in gen_statem for example + postpone an event in one state and then call some other state function of yours, + you have not changed states and hence the postponed event will not be retried, + which is logical but might be confusing.

See the type @@ -302,8 +301,8 @@ ok callback_mode state_functions, or rather here is code to replace - from the init/1 function of the pushbutton - example module above: + from the init/1 function of the pushbutton.erl + example file above:

init([]) -> @@ -364,8 +363,8 @@ handle_event(_, _, State, Data) ->

It can be:

- pid() - LocalName + pid()
+ LocalName The gen_statem is locally registered. Name, Node @@ -489,13 +488,10 @@ handle_event(_, _, State, Data) -> casts originate from the corresponding API functions. For calls the event contain whom to reply to. - Type info originates from - regular process messages sent - to the gen_statem. - It is also possible for the state machine - implementation to insert events to itself, - in particular of types - timeout and internal. + Type info originates from regular process messages sent + to the gen_statem. It is also possible for the state machine + implementation to generate events of types + timeout and internal to itself.

@@ -559,7 +555,7 @@ handle_event(_, _, State, Data) -> is reset to start with the oldest postponed. - All events inserted with + All events stored with action() next_event @@ -634,14 +630,21 @@ handle_event(_, _, State, Data) -> event arrives in which case this timeout is cancelled. Note that a retried or inserted event counts just like a new in this respect. - If the value is infinity no timer is started. - If it is 0 the timeout event - is immediately enqueued as the newest received - (unless there are retried or inserted events to process - since then the timeout is cancelled). - Also note that it is not possible nor needed - to cancel this timeout since it is cancelled automatically - by any other event. +

+

+ If the value is infinity no timer is started since + it will never trigger anyway. +

+

+ If the value is 0 the timeout event is immediately enqueued + unless there already are enqueued events since then the + timeout is immediately cancelled. + This is a feature ensuring that a timeout 0 event + will be processed before any not yet received external event. +

+

+ Note that it is not possible nor needed to cancel this timeout + since it is cancelled automatically by any other event.

@@ -658,16 +661,19 @@ handle_event(_, _, State, Data) ->

Actions are executed in the containing list order. - The order matters for some actions such as next_event - and reply_action().

Actions that set transition options - overrides any previous of the same kind, + overrides any previous of the same type, so the last in the containing list wins. + For example the last + + event_timeout() + + overrides any other event_timeout() in the list.

postpone @@ -693,7 +699,7 @@ handle_event(_, _, State, Data) -> Timeout - Short for {timeout,Timeout} that is + Short for {timeout,Timeout,Timeout} that is the timeout message is the timeout time. This form exists to make the state function @@ -708,27 +714,33 @@ handle_event(_, _, State, Data) -> transition_option() event_timeout() - to Time with the - EventContent as Msg. + to Time with EventContent. reply_action() Reply to a caller. next_event - Insert the given EventType - and EventContent as the next to process. - This will bypass any events in the process mailbox as well - as any other queued events. - All next_event actions - in the containing list are buffered and inserted - after the actions have been done - so that the first in the list will be the first to process. - An event of type - - internal - - should be used when you want to reliably distinguish - an event inserted this way from any external event. + Store the given EventType + and EventContent for insertion after all + actions have been executed. + + +

+ The stored events are inserted in the queue as the next to process + before any already queued events. The order of these stored events + is preserved so the first next_event in the containing list + will become the first to process. +

+ + +

+ An event of type + + internal + + should be used when you want to reliably distinguish + an event inserted this way from any external event. +

@@ -1047,17 +1059,17 @@ handle_event(_, _, State, Data) -> or the atom infinity to wait indefinitely, which is the default. If no reply is received within the specified time, the function call fails. - -

- To avoid getting a late reply in the caller's - inbox this function spawns a proxy process that - does the call. A late reply gets delivered to the - dead proxy process hence gets discarded. This is - less efficient than using - Timeout =:= infinity. -

-

+ +

+ To avoid getting a late reply in the caller's + inbox this function spawns a proxy process that + does the call. A late reply gets delivered to the + dead proxy process hence gets discarded. This is + less efficient than using + Timeout =:= infinity. +

+

The call may fail for example if the gen_statem dies before or during this function call. @@ -1218,7 +1230,7 @@ handle_event(_, _, State, Data) -> CALLBACK FUNCTIONS

The following functions should be exported from a - gen_statem callback module. + gen_statem callback module.

-- cgit v1.2.3 From c660e30a7dd781f71bed050b20c3e2d0b069e063 Mon Sep 17 00:00:00 2001 From: Jesper Louis Andersen Date: Sat, 9 Apr 2016 17:17:59 +0200 Subject: Implement lists:join/2 Add a call which works much like string:join/2 but for arbitrary lists. Provide the function itself, lifted from Haskells Data.List standard library, provide documentation and provide tests for the function. --- lib/stdlib/doc/src/lists.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 89ba5238b5..84e9615e4f 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -261,6 +261,21 @@ flatmap(Fun, List1) -> preferred to foldr/3.

+ + + Insert an element between elements in a list + +

Inserts Sep between each element in List1. Has no + effect on the empty list and on a singleton list. For example:

+ 
+> lists:join(x, [a,b,c]).
+[a,x,b,x,c]
+> lists:join(x, [a]).
+[a]
+> lists:join(x, []).
+[]
+ + Apply a function to each element of a list -- cgit v1.2.3 From 8e2ec999394c77741241ef1a12728b11195961c8 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Mon, 21 Mar 2016 17:53:26 +0100 Subject: erts: Document erlang:match_spec_test/3 OTP-13501 --- lib/stdlib/doc/src/ets.xml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 4e430d101e..2d69c201bc 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -1621,6 +1621,8 @@ true if the match_spec does not match the object Tuple.

This is a useful debugging and test tool, especially when writing complicated ets:select/2 calls.

+

See also: + erlang:match_spec_test/3.

 -- cgit v1.2.3 From a2f3c685b5aeac798e12302cf8fe7df13184b669 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 15 Apr 2016 10:09:54 +0200 Subject: Introduce corrections from Fred Hebert and Ingela --- lib/stdlib/doc/src/gen_statem.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index bd70c4c37e..c21398d64d 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -45,7 +45,7 @@ using this module will have a standard set of interface functions and include functionality for tracing and error reporting. It will also fit into an OTP supervision tree. Refer to - + OTP Design Principles for more information. -- cgit v1.2.3 From 26b3c7d60d52d8a7be006b06d856bb0f7276e77a Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Thu, 21 Apr 2016 15:58:52 +0200 Subject: Modify code_change/4 to return CallbackMode Also move check of non-atom states in callback mode state_functions to where the state function is called. This gives homogenous diagnostics for state functions, code_change/4 and system_replace_state StateFun. Irregularities pointed out by James Fish. --- lib/stdlib/doc/src/gen_statem.xml | 71 ++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 27 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index c21398d64d..adca3673be 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -32,8 +32,9 @@ Generic State Machine Behaviour

- A behaviour module for implementing a state machine. - Two callback modes are supported. One for a finite state + A behaviour module for implementing a state machine. Two + callback modes + are supported. One for a finite state machine like gen_fsm that requires the state to be an atom and use that state as the name of the callback function for a particular state, @@ -89,13 +90,13 @@ erlang:'!' -----> Module:StateName/3 The "state function" for a specific state in a gen_statem is the callback function that is called - for all events in this state, and is selected depending on - callback_mode + for all events in this state, and is selected depending on which + callback mode that the implementation specifies when the the server starts.

- When - callback_mode + When the + callback mode is state_functions, the state has to be an atom and is used as the state function name. See @@ -110,7 +111,8 @@ erlang:'!' -----> Module:StateName/3 makes the state name terminate unusable.

- When callback_mode + When the + callback mode is handle_event_function the state can be any term and the state function name is @@ -208,9 +210,7 @@ erlang:'!' -----> Module:StateName/3

This example shows a simple pushbutton model for a toggling pushbutton implemented with - - callback_mode() - + callback mode state_functions. You can push the button and it replies if it went on or off, and you can ask for a count of how many times it has been @@ -226,6 +226,7 @@ erlang:'!' -----> Module:StateName/3 -export([on/3,off/3]). name() -> pushbutton_statem. % The registered server name +callback_mode() -> state_functions. %% API. This example uses a registered name name() %% and does not link to the caller. @@ -242,12 +243,12 @@ stop() -> terminate(_Reason, _State, _Data) -> void. code_change(_Vsn, State, Data, _Extra) -> - {ok,State,Data}. + {callback_mode(),State,Data}. init([]) -> %% Set the callback mode and initial state + data. %% Data is used only as a counter. State = off, Data = 0, - {state_functions,State,Data}. + {callback_mode(),State,Data}. %%% State functions @@ -297,9 +298,7 @@ ok

And just to compare styles here is the same example using - - callback_mode - + callback mode state_functions, or rather here is code to replace from the init/1 function of the pushbutton.erl example file above: @@ -453,10 +452,8 @@ handle_event(_, _, State, Data) ->

- If - - callback_mode - + If the + callback mode is state_functions, the state has to be of this type.

@@ -499,7 +496,7 @@ handle_event(_, _, State, Data) ->

- The callback_mode is selected when starting the + The callback mode is selected when starting the gen_statem using the return value from Module:init/1 or when calling @@ -1277,7 +1274,7 @@ handle_event(_, _, State, Data) -> return {CallbackMode,State,Data} or {CallbackMode,State,Data,Actions}. CallbackMode selects the - callback_mode(). + callback mode. of the gen_statem. State is the initial state() @@ -1344,8 +1341,8 @@ handle_event(_, _, State, Data) -> Whenever a gen_statem receives an event from call/2, cast/2 or - as a normal process message one of these functions is called. - If callback_mode + as a normal process message one of these functions is called. If + callback mode is state_functions then Module:StateName/3 is called, and if it is handle_event_function then Module:handle_event/4 is called. @@ -1468,7 +1465,11 @@ handle_event(_, _, State, Data) ->   Vsn = term() OldState = NewState = term() Extra = term() - Result = {ok,NewState,NewData} | Reason + Result = {NewCallbackMode,NewState,NewData} | Reason + + NewCallbackMode = + callback_mode() + OldState = NewState = state() @@ -1484,8 +1485,9 @@ handle_event(_, _, State, Data) -> This function is called by a gen_statem when it should update its internal state during a release upgrade/downgrade, that is when the instruction {update,Module,Change,...} - where Change={advanced,Extra} is given in - the appup file. See + where Change={advanced,Extra} is given in the + appup + file. See OTP Design Principles @@ -1499,6 +1501,21 @@ handle_event(_, _, State, Data) -> Module. If no such attribute is defined, the version is the checksum of the BEAM file.

+ +

+ If you would dare to change + callback mode + during release upgrade/downgrade, the upgrade is no problem + since the new code surely knows what callback mode + it needs, but for a downgrade this function will have to + know from the Extra argument that comes from the + appup + file what callback mode the old code did use. + It may also be possible to figure this out + from the {down,Vsn} argument since Vsn + in effect defines the old callback module version. +

+

OldState and OldData is the internal state of the gen_statem. @@ -1510,7 +1527,7 @@ handle_event(_, _, State, Data) ->

If successful, the function shall return the updated internal state in an - {ok,NewState,NewData} tuple. + {NewCallbackMode,NewState,NewData} tuple.

If the function returns Reason, the ongoing -- cgit v1.2.3 From b54d82fea10c24359d2a315668b6176fc47963b7 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Fri, 22 Apr 2016 15:18:07 +0200 Subject: Promote gen_statem over gen_fsm --- lib/stdlib/doc/src/gen_fsm.xml | 16 +++- lib/stdlib/doc/src/gen_server.xml | 3 +- lib/stdlib/doc/src/gen_statem.xml | 187 ++++++++++++++++++++++++-------------- 3 files changed, 137 insertions(+), 69 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 4d594b8eb2..835e252704 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -4,7 +4,7 @@

- 19962014 + 19962016 Ericsson AB. All Rights Reserved. @@ -31,12 +31,23 @@ gen_fsm Generic Finite State Machine Behaviour + +

+ There is a new behaviour + gen_statem + that is intended to replace gen_fsm for new code. + It has the same features and add some really useful. + This module will not be removed for the foreseeable future + to keep old state machine implementations running. +

+

A behaviour module for implementing a finite state machine. A generic finite state machine process (gen_fsm) implemented using this module will have a standard set of interface functions and include functionality for tracing and error reporting. It will also fit into an OTP supervision tree. Refer to - OTP Design Principles for more information.

+ OTP Design Principles for more information. +

A gen_fsm assumes all specific parts to be located in a callback module exporting a pre-defined set of functions. The relationship between the behaviour functions and the callback functions can be @@ -848,6 +859,7 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 SEE ALSO

gen_event(3), gen_server(3), + gen_statem(3), supervisor(3), proc_lib(3), sys(3)

diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 6d04771cd4..10dc978afc 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -4,7 +4,7 @@
- 19962014 + 19962016 Ericsson AB. All Rights Reserved. @@ -715,6 +715,7 @@ gen_server:abcast -----> Module:handle_cast/2 SEE ALSO

gen_event(3), gen_fsm(3), + gen_statem(3), supervisor(3), proc_lib(3), sys(3)

diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index adca3673be..91332fbdde 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -34,12 +34,40 @@

A behaviour module for implementing a state machine. Two callback modes - are supported. One for a finite state - machine like gen_fsm - that requires the state to be an atom and use that state as - the name of the callback function for a particular state, + are supported. One for finite state machines + (gen_fsm like) + that requires the state to be an atom and uses that state as + the name of the current callback function, and one without restriction on the state data type - that uses the same callback function for all states. + that uses one callback function for all states. +

+

+ This is a new behaviour in OTP-19.0. + It has been thoroughly reviewed, is stable enough + to be used by at least two heavy OTP applications, and is here to stay. + But depending on user feedback, we do not expect + but might find it necessary to make minor + not backwards compatible changes into OTP-20.0, + so its state can be designated as "not quite experimental"... +

+

+ The gen_statem behaviour is intended to replace + gen_fsm for new code. + It has the same features and add some really useful: +

+ + State code is gathered + The state can be any term + Events can be postponed + Events can be self generated + A reply can be sent from a later state + There can be multiple sys traceable replies + +

+ The callback model(s) for gen_statem differs from + the one for gen_fsm, + but it is still fairly easy to rewrite + from gen_fsm to gen_statem.

A generic state machine process (gen_statem) implemented @@ -148,15 +176,15 @@ erlang:'!' -----> Module:StateName/3 to the state function. That is: as if it is the oldest incoming event. There is a dedicated - event_type() internal + event_type() - that can be used for such events making them impossible + internal that can be used for such events making them impossible to mistake for external events.

Inserting an event replaces the trick of calling your own state handling functions that you often would have to - resort to in for example gen_fsm + resort to in for example gen_fsm to force processing an inserted event before others. A warning, though: if you in gen_statem for example postpone an event in one state and then call some other state function of yours, @@ -172,9 +200,8 @@ erlang:'!' -----> Module:StateName/3

A gen_statem handles system messages as documented in - sys. - The sys module - can be used for debugging a gen_statem. + sys. + The sysmodule can be used for debugging a gen_statem.

Note that a gen_statem does not trap exit signals @@ -354,7 +381,7 @@ handle_event(_, _, State, Data) ->

Server specification to use when addressing a gen_statem server. - See call/2 and + See call/2 and server_name() @@ -397,7 +424,7 @@ handle_event(_, _, State, Data) ->

Debug option that can be used when starting a gen_statem server through for example - enter_loop/5. + enter_loop/5.

For every entry in Dbgs @@ -412,7 +439,7 @@ handle_event(_, _, State, Data) ->

Options that can be used when starting a gen_statem server through for example - start_link/3. + start_link/3.

@@ -421,7 +448,7 @@ handle_event(_, _, State, Data) ->

Return value from the start functions for_example - start_link/3. + start_link/3.

@@ -432,10 +459,11 @@ handle_event(_, _, State, Data) ->

Destination to use when replying through for example the - action() {reply,From,Reply} + action() + {reply,From,Reply} to a process that has called the gen_statem server using - call/2. + call/2.

@@ -465,7 +493,7 @@ handle_event(_, _, State, Data) ->

A term in which the state machine implementation should store any server data it needs. The difference between - this and the state() + this and the state() itself is that a change in this data does not cause postponed events to be retried. Hence if a change in this data would change the set of events that @@ -498,9 +526,13 @@ handle_event(_, _, State, Data) ->

The callback mode is selected when starting the gen_statem using the return value from - Module:init/1 + Module:init/1 or when calling - enter_loop/5-7. + enter_loop/5-7, + and with the return value from + + Module:code_change/4. +

state_functions @@ -536,7 +568,7 @@ handle_event(_, _, State, Data) -> All - actions + actions are processed in order of appearance. @@ -554,20 +586,22 @@ handle_event(_, _, State, Data) -> All events stored with - action() next_event + action() + next_event are inserted in the queue to be processed before all other events. If an - event_timeout() + event_timeout() is set through - action() timeout + action() + timeout an event timer may be started or a timeout zero event may be enqueued. @@ -622,7 +656,8 @@ handle_event(_, _, State, Data) ->

Generate an event of - type timeout + event_type() + timeout after this time (in milliseconds) unless some other event arrives in which case this timeout is cancelled. Note that a retried or inserted event @@ -652,9 +687,9 @@ handle_event(_, _, State, Data) -> These state transition actions may be invoked by returning them from the state function, - from Module:init/1 + from Module:init/1 or by giving them to - enter_loop/6,7. + enter_loop/6,7.

Actions are executed in the containing list order. @@ -677,20 +712,26 @@ handle_event(_, _, State, Data) -> Set the - transition_option() postpone() + transition_option() + + + postpone() for this state transition. This action is ignored when returned from - Module:init/1 + Module:init/1 or given to - enter_loop/5,6 + enter_loop/5,6 since there is no event to postpone in those cases. hibernate Set the - transition_option() hibernate() + transition_option() + + + hibernate() for this state transition. @@ -703,13 +744,17 @@ handle_event(_, _, State, Data) -> return value {next_state,NextState,NewData,Timeout} allowed like for - gen_fsm Module:StateName/2. + gen_fsm Module:StateName/2. + timeout Set the - transition_option() event_timeout() + transition_option() + + + event_timeout() to Time with EventContent. @@ -906,7 +951,7 @@ handle_event(_, _, State, Data) -> If the option {spawn_opt,SpawnOpts} is present in Opts, SpawnOpts will be passed as option list to - spawn_opt/2 + spawn_opt/2 which is used to spawn the gen_statem process.

@@ -967,7 +1012,7 @@ handle_event(_, _, State, Data) -> to start a child.

- See start_link/3,4 + See start_link/3,4 for a description of arguments and return values.

@@ -979,7 +1024,9 @@ handle_event(_, _, State, Data) ->

The same as - stop(ServerRef, normal, infinity). + + stop(ServerRef, normal, infinity). +

@@ -996,7 +1043,7 @@ handle_event(_, _, State, Data) -> and waits for it to terminate. The gen_statem will call - Module:terminate/3 + Module:terminate/3 before exiting.

@@ -1005,7 +1052,9 @@ handle_event(_, _, State, Data) -> with the expected reason. Any other reason than normal, shutdown, or {shutdown,Term} will cause an error report to be issued through - error_logger:format/2. + + error_logger:format/2. + The default Reason is normal.

@@ -1125,7 +1174,7 @@ handle_event(_, _, State, Data) ->

A reply sent with this function will not be visible - in sys debug output. + in sys debug output.

@@ -1194,7 +1243,9 @@ handle_event(_, _, State, Data) -> Module, Opts and Server have the same meanings as when calling - gen_statem:start[_link]/3,4. + + gen_statem:start[_link]/3,4. + However, the server_name() @@ -1205,7 +1256,7 @@ handle_event(_, _, State, Data) -> CallbackMode, State, Data and Actions have the same meanings as in the return value of - Module:init/1. + Module:init/1. Also, the callback module Module does not need to export an init/1 function.

@@ -1259,9 +1310,9 @@ handle_event(_, _, State, Data) ->

Whenever a gen_statem is started using - start_link/3,4 + start_link/3,4 or - start/3,4, + start/3,4, this function is called by the new process to initialize the implementation state and server data.

@@ -1277,9 +1328,9 @@ handle_event(_, _, State, Data) -> callback mode. of the gen_statem. State is the initial - state() + state() and Data the initial server - data(). + data().

The Actions @@ -1291,11 +1342,11 @@ handle_event(_, _, State, Data) -> If something goes wrong during the initialization the function should return {stop,Reason} or ignore. See - start_link/3,4. + start_link/3,4.

This function may use - throw + throw/1 to return Result.

@@ -1339,8 +1390,8 @@ handle_event(_, _, State, Data) ->

Whenever a gen_statem receives an event from - call/2, - cast/2 or + call/2, + cast/2 or as a normal process message one of these functions is called. If callback mode is state_functions then Module:StateName/3 is called, @@ -1354,8 +1405,8 @@ handle_event(_, _, State, Data) -> from this or from any other state function by returning with {reply,From,Reply} in - Actions, in - Replies + Actions, in + Replies or by calling reply(From, Reply).

@@ -1371,13 +1422,13 @@ handle_event(_, _, State, Data) -> there is no restriction on the next state.

- See action() + See action() for options that can be set and actions that can be done by gen_statem after returning from this function.

These functions may use - throw, + throw/1, to return the result.

@@ -1402,7 +1453,7 @@ handle_event(_, _, State, Data) -> value is ignored.

Reason is a term denoting the stop reason and - State + State is the internal state of the gen_statem.

@@ -1410,7 +1461,7 @@ handle_event(_, _, State, Data) -> is terminating. If it is because another callback function has returned a stop tuple {stop,Reason} in - Actions, + Actions, Reason will have the value specified in that tuple. If it is due to a failure, Reason is the error reason.

@@ -1445,11 +1496,13 @@ handle_event(_, _, State, Data) -> shutdown, or {shutdown,Term} the gen_statem is assumed to terminate due to an error and an error report is issued using - error_logger:format/2. + + error_logger:format/2. +

This function may use - throw + throw/1 to return Ignored, which is ignored anyway.

@@ -1504,7 +1557,9 @@ handle_event(_, _, State, Data) ->

If you would dare to change - callback mode + + callback mode + during release upgrade/downgrade, the upgrade is no problem since the new code surely knows what callback mode it needs, but for a downgrade this function will have to @@ -1534,7 +1589,7 @@ handle_event(_, _, State, Data) -> upgrade will fail and roll back to the old release.

This function may use - throw + throw/1 to return Result or Reason.

@@ -1640,7 +1695,7 @@ handle_event(_, _, State, Data) ->

This function may use - throw + throw/1 to return Status.

@@ -1650,11 +1705,11 @@ handle_event(_, _, State, Data) ->
SEE ALSO -

gen_event, - gen_fsm, - gen_server, - supervisor, - proc_lib, - sys

+

gen_event(3), + gen_fsm(3), + gen_server(3), + supervisor(3), + proc_lib(3), + sys(3)

-- cgit v1.2.3 From 099dd67af598c0c0cd99f456062444c25308ae38 Mon Sep 17 00:00:00 2001 From: eksperimental Date: Tue, 26 Apr 2016 14:15:43 +0700 Subject: Remove extra ">" in examples --- lib/stdlib/doc/src/binary.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 5402fd0163..933157fc34 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -366,7 +366,7 @@ 1> binary:matches(<<"abcde">>, - [<<"bcde">>,<<"bc">>>,<<"de">>],[]). + [<<"bcde">>,<<"bc">>,<<"de">>],[]). [{1,4}] -- cgit v1.2.3 From 471a50ef1391f6399664f8b992da7a67c32c8b86 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 26 Apr 2016 16:49:47 +0200 Subject: Fix hibernation subtlety --- lib/stdlib/doc/src/gen_statem.xml | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 91332fbdde..ec7f267c64 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -216,19 +216,23 @@ erlang:'!' -----> Module:StateName/3 if bad arguments are given.

- The gen_statem process can go into hibernation (see - - erlang:hibernate/3 - ) if a + The gen_statem process can go into hibernation; see + + proc_lib:hibernate/3. + + It is done when a state function or Module:init/1 specifies hibernate in the returned Actions - list. This might be useful if the server is expected to be idle - for a long time. However use this feature with care - since hibernation implies at least two garbage collections - (when hibernating and shortly after waking up) and that is not - something you would want to do between each event on a busy server. + list. This feature might be useful to reclaim process heap memory + while the server is expected to be idle for a long time. + However, use this feature with care + since hibernation can be too costly + to use after every event; see + + erlang:hibernate/3. +

@@ -619,7 +623,8 @@ handle_event(_, _, State, Data) -> to wait for the next message. In hibernation the next non-system event awakens the gen_statem, or rather the next incoming message awakens the gen_statem - but if it is a system event it goes back into hibernation. + but if it is a system event + it goes right back into hibernation. @@ -645,9 +650,13 @@ handle_event(_, _, State, Data) -> before going into receive to wait for a new external event. - If there are enqueued events the hibernate - is ignored as if an event just arrived and awakened - the gen_statem. + If there are enqueued events, + to prevent receiving any new event; a + + garbage_collect/0 + is done instead to simulate + that the gen_statem entered hibernation + and immediately got awakened by the oldest enqueued event.

-- cgit v1.2.3 From f3c55529dbc9cb3bf8801bea9b64da78b9b73d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Sun, 10 Apr 2016 23:09:54 +0200 Subject: stdlib: Document maps:take/2 --- lib/stdlib/doc/src/maps.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index 0f58f19421..97a7438890 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -300,6 +300,30 @@ false + + + + +

+ The function removes the Key, if it exists, and its associated value from + Map1 and returns a tuple with the removed Value and + the new map Map2 without key Key. + If the key does not exist error is returned. +

+

+ The call will fail with a {badmap,Map} exception if Map1 is not a map. +

+

Example:

+ +> Map = #{"a" => "hello", "b" => "world"}. +#{"a" => "hello", "b" => "world"} +> maps:take("a",Map). +{"hello",#{"b" => "world"}} +> maps:take("does not exist",Map). +error + + + -- cgit v1.2.3 From eeac08ca0ed6358a87f265f87a62bea8d0feb3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Sat, 23 Apr 2016 00:17:04 +0200 Subject: stdlib: Document maps:update_with/3,4 --- lib/stdlib/doc/src/maps.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index 97a7438890..bf45461e2b 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -381,6 +381,42 @@ error + + + + +

Update a value in a Map1 associated with Key by + calling Fun on the old value to get a new value. An exception + {badkey,Key} is generated if + Key is not present in the map.

+

Example:

+ +> Map = #{"counter" => 1}, + Fun = fun(V) -> V + 1 end, + maps:update_with("counter",Fun,Map). +#{"counter" => 2} + + + + + + + +

Update a value in a Map1 associated with Key by + calling Fun on the old value to get a new value. + If Key is not present + in Map1 then Init will be associated with + Key. +

+

Example:

+ +> Map = #{"counter" => 1}, + Fun = fun(V) -> V + 1 end, + maps:update_with("new counter",Fun,42,Map). +#{"counter" => 1,"new counter" => 42} + + + -- cgit v1.2.3 From 1f145f8a444121fac1f15dfe4af54f2148419ac1 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Wed, 4 May 2016 14:36:35 +0200 Subject: Fix documentation --- lib/stdlib/doc/src/gen_statem.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index ec7f267c64..d83e17b177 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -396,17 +396,17 @@ handle_event(_, _, State, Data) -> pid()
LocalName The gen_statem is locally registered. - Name, Node + {Name,Node} The gen_statem is locally registered on another node. - GlobalName + {global,GlobalName} The gen_statem is globally registered in global. - RegMod, ViaName + {via,RegMod,ViaName} The gen_statem is registered through an alternative process registry. -- cgit v1.2.3 From 09d138e229846b7056331151135b7c8a52dc476f Mon Sep 17 00:00:00 2001 From: xsipewe Date: Fri, 6 May 2016 09:55:25 +0200 Subject: Editorial update --- lib/stdlib/doc/src/gen_statem.xml | 1723 +++++++++++++++++++------------------ 1 file changed, 895 insertions(+), 828 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index ec7f267c64..4fe940bd05 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -29,39 +29,49 @@
gen_statem - Generic State Machine Behaviour + Generic state machine behavior.

- A behaviour module for implementing a state machine. Two + This behavior module provides a state machine. Two callback modes - are supported. One for finite state machines - (gen_fsm like) - that requires the state to be an atom and uses that state as - the name of the current callback function, - and one without restriction on the state data type - that uses one callback function for all states. -

-

- This is a new behaviour in OTP-19.0. - It has been thoroughly reviewed, is stable enough - to be used by at least two heavy OTP applications, and is here to stay. - But depending on user feedback, we do not expect - but might find it necessary to make minor - not backwards compatible changes into OTP-20.0, - so its state can be designated as "not quite experimental"... + are supported:

+ + +

One for finite-state machines + (gen_fsm like), + which requires the state to be an atom and uses that state as + the name of the current callback function +

+ + +

One without restriction on the state data type + that uses one callback function for all states +

+ + + +

+ This is a new behavior in Erlang/OTP 19.0. + It has been thoroughly reviewed, is stable enough + to be used by at least two heavy OTP applications, and is here to stay. + Depending on user feedback, we do not expect + but can find it necessary to make minor + not backward compatible changes into Erlang/OTP 20.0. +

+

- The gen_statem behaviour is intended to replace + The gen_statem behavior is intended to replace gen_fsm for new code. - It has the same features and add some really useful: + It has the same features and adds some really useful:

- State code is gathered - The state can be any term - Events can be postponed - Events can be self generated - A reply can be sent from a later state - There can be multiple sys traceable replies + State code is gathered. + The state can be any term. + Events can be postponed. + Events can be self-generated. + A reply can be sent from a later state. + There can be multiple sys traceable replies.

The callback model(s) for gen_statem differs from @@ -71,19 +81,18 @@

A generic state machine process (gen_statem) implemented - using this module will have a standard set of interface functions - and include functionality for tracing and error reporting. - It will also fit into an OTP supervision tree. Refer to + using this module has a standard set of interface functions + and includes functionality for tracing and error reporting. + It also fits into an OTP supervision tree. For more information, see OTP Design Principles - - for more information. + .

A gen_statem assumes all specific parts to be located in a - callback module exporting a pre-defined set of functions. - The relationship between the behaviour functions and the callback - functions can be illustrated as follows:

+ callback module exporting a predefined set of functions. + The relationship between the behavior functions and the callback + functions is as follows:

 gen_statem module            Callback module
 -----------------            ---------------
@@ -103,37 +112,37 @@ erlang:'!'            -----> Module:StateName/3
 -                     -----> Module:code_change/4

Events are of different - types + types, so the callback functions can know the origin of an event and how to respond.

If a callback function fails or returns a bad value, - the gen_statem will terminate. An exception of class - throw, - however, is not regarded as an error but as a valid return. + the gen_statem terminates. However, an exception of class + throw + is not regarded as an error but as a valid return.

- +

The "state function" for a specific state in a gen_statem is the callback function that is called - for all events in this state, and is selected depending on which + for all events in this state. It is selected depending on which callback mode - that the implementation specifies when the the server starts. + that the implementation specifies when the server starts.

When the callback mode - is state_functions, the state has to be an atom and - is used as the state function name. See + is state_functions, the state must be an atom and + is used as the state function name; see Module:StateName/3 . This gathers all code for a specific state in one function and hence dispatches on state first. - Note that in this mode the fact that there is - a mandatory callback function + Notice that in this mode + the mandatory callback function Module:terminate/3 makes the state name terminate unusable. @@ -141,21 +150,21 @@ erlang:'!' -----> Module:StateName/3

When the callback mode - is handle_event_function the state can be any term + is handle_event_function, the state can be any term and the state function name is Module:handle_event/4 . This makes it easy to dispatch on state or on event as you desire. Be careful about which events you handle in which - states so you do not accidentally postpone one event + states so that you do not accidentally postpone one event forever creating an infinite busy loop.

The gen_statem enqueues incoming events in order of arrival and presents these to the state function - in that order. The state function can postpone an event + in that order. The state function can postpone an event so it is not retried in the current state. After a state change the queue restarts with the postponed events.

@@ -163,7 +172,7 @@ erlang:'!' -----> Module:StateName/3 The gen_statem event queue model is sufficient to emulate the normal process message queue with selective receive. Postponing an event corresponds to not matching it - in a receive statement and changing states corresponds + in a receive statement, and changing states corresponds to entering a new receive statement.

@@ -173,73 +182,76 @@ erlang:'!' -----> Module:StateName/3 action() next_event and such an event is inserted as the next to present - to the state function. That is: as if it is - the oldest incoming event. There is a dedicated + to the state function. That is, as if it is + the oldest incoming event. A dedicated event_type() - internal that can be used for such events making them impossible + internal can be used for such events making them impossible to mistake for external events.

Inserting an event replaces the trick of calling your own state handling functions that you often would have to - resort to in for example gen_fsm + resort to in, for example, + gen_fsm to force processing an inserted event before others. - A warning, though: if you in gen_statem for example - postpone an event in one state and then call some other state function of yours, - you have not changed states and hence the postponed event will not be retried, - which is logical but might be confusing.

+ +

If you in gen_statem, for example, postpone + an event in one state and then call another state function + of yours, you have not changed states and hence the postponed event + is not retried, which is logical but can be confusing. +

+

- See the type + For the details of a state transition, see type - transition_option() - - for the details of a state transition. + transition_option() + .

- A gen_statem handles system messages as documented in + A gen_statem handles system messages as described in sys. The sysmodule can be used for debugging a gen_statem.

- Note that a gen_statem does not trap exit signals + Notice that a gen_statem does not trap exit signals automatically, this must be explicitly initiated in the callback module (by calling - process_flag(trap_exit, true). + process_flag(trap_exit, true).

Unless otherwise stated, all functions in this module fail if the specified gen_statem does not exist or - if bad arguments are given. + if bad arguments are specified.

The gen_statem process can go into hibernation; see - proc_lib:hibernate/3. - + proc_lib:hibernate/3 + . It is done when a state function or Module:init/1 specifies hibernate in the returned Actions - list. This feature might be useful to reclaim process heap memory + list. This feature can be useful to reclaim process heap memory while the server is expected to be idle for a long time. - However, use this feature with care - since hibernation can be too costly + However, use this feature with care, + as hibernation can be too costly to use after every event; see - erlang:hibernate/3. - + erlang:hibernate/3 + .

- EXAMPLE + Example

- This example shows a simple pushbutton model + The following example shows a simple pushbutton model for a toggling pushbutton implemented with callback mode state_functions. @@ -247,7 +259,8 @@ erlang:'!' -----> Module:StateName/3 and you can ask for a count of how many times it has been pushed to on.

-

This is the complete callback module file pushbutton.erl:

+

The following is the complete callback module file + pushbutton.erl:

-module(pushbutton). -behaviour(gen_statem). @@ -305,7 +318,7 @@ handle_event(_, _, Data) -> %% Ignore all other events {keep_state,Data}. -

And this is a shell session when running it:

+

The following is a shell session when running it:

 1> pushbutton:start().
 {ok,<0.36.0>}
@@ -326,12 +339,11 @@ ok
      in function  gen:do_for_proc/2 (gen.erl, line 261)
      in call from gen_statem:call/3 (gen_statem.erl, line 386)
-

- And just to compare styles here is the same example using + To compare styles, here follows the same example using callback mode - state_functions, or rather here is code to replace - from the init/1 function of the pushbutton.erl + state_functions, or rather the code to replace + from function init/1 of the pushbutton.erl example file above:

@@ -364,11 +376,11 @@ handle_event(_, _, State, Data) -> - +

Name specification to use when starting - a gen_statem server. See + a gen_statem server. See start_link/3 @@ -380,7 +392,7 @@ handle_event(_, _, State, Data) -> - +

Server specification to use when addressing @@ -393,75 +405,83 @@ handle_event(_, _, State, Data) ->

It can be:

- pid()
- LocalName - The gen_statem is locally registered. + pid() | LocalName + +

+ The gen_statem is locally registered. +

+ Name, Node - The gen_statem is locally registered - on another node. +

+ The gen_statem is locally registered + on another node. +

GlobalName - The gen_statem is globally registered - in global. +

+ The gen_statem is globally registered + in kernel:global. +

RegMod, ViaName - The gen_statem is registered through - an alternative process registry. - The registry callback module RegMod - should export the functions - register_name/2, unregister_name/1, - whereis_name/1 and send/2, - which should behave like the corresponding functions - in global. - Thus, {via,global,GlobalName} is the same as - {global,GlobalName}. +

+ The gen_statem is registered through + an alternative process registry. + The registry callback module RegMod + is to export functions + register_name/2, unregister_name/1, + whereis_name/1, and send/2, + which are to behave like the corresponding functions + in kernel:global. + Thus, {via,global,GlobalName} is the same as + {global,GlobalName}. +

- +

Debug option that can be used when starting - a gen_statem server through for example + a gen_statem server through, for example, enter_loop/5.

- For every entry in Dbgs + For every entry in Dbgs, the corresponding function in - sys will be called. + sys is called.

- +

Options that can be used when starting - a gen_statem server through for example + a gen_statem server through, for example, start_link/3.

- +

- Return value from the start functions for_example + Return value from the start functions, for example, start_link/3.

- - +

- Destination to use when replying through for example the + Destination to use when replying through, for example, the action() @@ -472,178 +492,194 @@ handle_event(_, _, State, Data) -> - +

- After a state change (NextState =/= State) + After a state change (NextState =/= State), all postponed events are retried.

- +

If the callback mode is state_functions, - the state has to be of this type. + the state must be of this type.

- +

A term in which the state machine implementation - should store any server data it needs. The difference between + is to store any server data it needs. The difference between this and the state() itself is that a change in this data does not cause - postponed events to be retried. Hence if a change + postponed events to be retried. Hence, if a change in this data would change the set of events that - are handled than that data item should be made + are handled, then that data item is to be made a part of the state.

- +

- External events are of 3 different type: - {call,From}, cast or info. + External events are of three types: + {call,From}, cast, or info. Calls (synchronous) and casts originate from the corresponding API functions. - For calls the event contain whom to reply to. + For calls, the event contains whom to reply to. Type info originates from regular process messages sent - to the gen_statem. It is also possible for the state machine - implementation to generate events of types + to the gen_statem. Also, the state machine + implementation can generate events of types timeout and internal to itself.

- +

The callback mode is selected when starting the gen_statem using the return value from Module:init/1 or when calling - enter_loop/5-7, + enter_loop/5,6,7, and with the return value from - Module:code_change/4. - + Module:code_change/4 + .

state_functions - The state has to be of type - state_name() - and one callback function per state that is - - Module:StateName/3 - - is used. +

+ The state must be of type + state_name() + and one callback function per state, that is, + + Module:StateName/3 + , + is used. +

handle_event_function - The state can be any term and the callback function - - Module:handle_event/4 - - is used for all states. +

+ The state can be any term and the callback function + + Module:handle_event/4 + + is used for all states. +

- +

- Transition options may be set by + Transition options can be set by actions - and they modify some details below in how + and they modify the following in how the state transition is done:

- All - actions - are processed in order of appearance. +

+ All + actions + are processed in order of appearance. +

- If - - postpone() - - is true - the current event is postponed. +

+ If + + postpone() + + is true, + the current event is postponed. +

- If the state changes the queue of incoming events - is reset to start with the oldest postponed. +

+ If the state changes, the queue of incoming events + is reset to start with the oldest postponed. +

- All events stored with - - action() - - next_event - are inserted in the queue to be processed before - all other events. +

+ All events stored with + + action() + + next_event + are inserted in the queue to be processed before + all other events. +

- If an - - event_timeout() - - is set through - - action() - - timeout - an event timer may be started or a timeout zero event - may be enqueued. +

+ If an + + event_timeout() + + is set through + + action() + + timeout, + an event timer can be started or a time-out zero event + can be enqueued. +

- The (possibly new) - state function - is called with the oldest enqueued event if there is any, - otherwise the gen_statem goes into receive - or hibernation - (if - - hibernate() - - is true) - to wait for the next message. In hibernation the next - non-system event awakens the gen_statem, or rather - the next incoming message awakens the gen_statem - but if it is a system event - it goes right back into hibernation. +

+ The (possibly new) + state function + is called with the oldest enqueued event if there is any, + otherwise the gen_statem goes into receive + or hibernation + (if + + hibernate() + + is true) + to wait for the next message. In hibernation the next + non-system event awakens the gen_statem, or rather + the next incoming message awakens the gen_statem, + but if it is a system event + it goes right back into hibernation. +

- +

- If true postpone the current event and retry + If true, postpones the current event and retries it when the state changes (NextState =/= State).

- +

- If true hibernate the gen_statem + If true, hibernates the gen_statem by calling proc_lib:hibernate/3 @@ -651,9 +687,9 @@ handle_event(_, _, State, Data) -> before going into receive to wait for a new external event. If there are enqueued events, - to prevent receiving any new event; a + to prevent receiving any new event, an - garbage_collect/0 + erlang:garbage_collect/0 is done instead to simulate that the gen_statem entered hibernation and immediately got awakened by the oldest enqueued event. @@ -661,39 +697,39 @@ handle_event(_, _, State, Data) -> - +

- Generate an event of + Generates an event of event_type() timeout - after this time (in milliseconds) unless some other - event arrives in which case this timeout is cancelled. - Note that a retried or inserted event - counts just like a new in this respect. + after this time (in milliseconds) unless another + event arrives in which case this time-out is cancelled. + Notice that a retried or inserted event + counts like a new in this respect.

- If the value is infinity no timer is started since - it will never trigger anyway. + If the value is infinity, no timer is started, as + it never triggers anyway.

- If the value is 0 the timeout event is immediately enqueued - unless there already are enqueued events since then the - timeout is immediately cancelled. - This is a feature ensuring that a timeout 0 event - will be processed before any not yet received external event. + If the value is 0, the time-out event is immediately enqueued + unless there already are enqueued events, as the + time-out is then immediately cancelled. + This is a feature ensuring that a time-out 0 event + is processed before any not yet received external event.

- Note that it is not possible nor needed to cancel this timeout - since it is cancelled automatically by any other event. + Notice that it is not possible or needed to cancel this time-out, + as it is cancelled automatically by any other event.

- +

- These state transition actions may be invoked by + These state transition actions can be invoked by returning them from the state function, from Module:init/1 @@ -708,9 +744,9 @@ handle_event(_, _, State, Data) -> transition options - overrides any previous of the same type, + override any previous of the same type, so the last in the containing list wins. - For example the last + For example, the last event_timeout() @@ -719,77 +755,87 @@ handle_event(_, _, State, Data) -> postpone - Set the - - transition_option() - - - postpone() - - for this state transition. - This action is ignored when returned from - Module:init/1 - or given to - enter_loop/5,6 - since there is no event to postpone in those cases. +

+ Sets the + + transition_option() + + + postpone() + + for this state transition. + This action is ignored when returned from + Module:init/1 + or given to + enter_loop/5,6, + as there is no event to postpone in those cases. +

hibernate - Set the - - transition_option() - - - hibernate() - - for this state transition. +

+ Sets the + + transition_option() + + + hibernate() + + for this state transition. +

Timeout - Short for {timeout,Timeout,Timeout} that is - the timeout message is the timeout time. - This form exists to make the - state function - return value {next_state,NextState,NewData,Timeout} - allowed like for - - gen_fsm Module:StateName/2. - +

+ Short for {timeout,Timeout,Timeout}, that is, + the time-out message is the time-out time. + This form exists to make the + state function + return value {next_state,NextState,NewData,Timeout} + allowed like for + + gen_fsm:Module:StateName/2 + . +

timeout - Set the - - transition_option() - - - event_timeout() - - to Time with EventContent. +

+ Sets the + + transition_option() + + + event_timeout() + + to Time with EventContent. +

reply_action() - Reply to a caller. + +

+ Replies to a caller. +

+ next_event - Store the given EventType +

+ Stores the specified EventType and EventContent for insertion after all actions have been executed. - - +

The stored events are inserted in the queue as the next to process - before any already queued events. The order of these stored events - is preserved so the first next_event in the containing list - will become the first to process. + before any already queued events. The order of these stored events + is preserved, so the first next_event in the containing + list becomes the first to process.

- -

An event of type internal - should be used when you want to reliably distinguish + is to be used when you want to reliably distinguish an event inserted this way from any external event.

@@ -797,294 +843,125 @@ handle_event(_, _, State, Data) -> - +

- Reply to a caller waiting for a reply in + Replies to a caller waiting for a reply in call/2. - From must be the term from the + From must be the term from argument {call,From} - argument to the + to the state function.

- + next_state - The gen_statem will do a state transition to - NextStateName - (which may be the same as the current state), - set NewData - and execute all Actions +

+ The gen_statem does a state transition to + NextStateName + (which can be the same as the current state), + sets NewData, + and executes all Actions. +

All these terms are tuples or atoms and this property - will hold in any future version of gen_statem, - just in case you need such a promise. + will hold in any future version of gen_statem.

- + next_state - The gen_statem will do a state transition to - NextState - (which may be the same as the current state), - set NewData - and execute all Actions +

+ The gen_statem does a state transition to + NextState + (which can be the same as the current state), + sets NewData, + and executes all Actions. +

All these terms are tuples or atoms and this property - will hold in any future version of gen_statem, - just in case you need such a promise. + will hold in any future version of gen_statem.

- + stop - Terminate the gen_statem by calling - - Module:terminate/3 - - with Reason and - NewData, if given. +

+ Terminates the gen_statem by calling + + Module:terminate/3 + + with Reason and + NewData, if specified. +

stop_and_reply - Send all Replies - then terminate the gen_statem by calling - - Module:terminate/3 - - with Reason and - NewData, if given. +

+ Sends all Replies, + then terminates the gen_statem by calling + + Module:terminate/3 + + with Reason and + NewData, if specified. +

keep_state - The gen_statem will keep the current state, or - do a state transition to the current state if you like, - set NewData - and execute all Actions. - This is the same as - {next_state,CurrentState,NewData,Actions}. +

+ The gen_statem keeps the current state, or + does a state transition to the current state if you like, + sets NewData, + and executes all Actions. + This is the same as + {next_state,CurrentState,NewData,Actions}. +

keep_state_and_data - The gen_statem will keep the current state or - do a state transition to the current state if you like, - keep the current server data, - and execute all Actions. - This is the same as - {next_state,CurrentState,CurrentData,Actions}. +

+ The gen_statem keeps the current state or + does a state transition to the current state if you like, + keeps the current server data, + and executes all Actions. + This is the same as + {next_state,CurrentState,CurrentData,Actions}. +

All these terms are tuples or atoms and this property - will hold in any future version of gen_statem, - just in case you need such a promise. + will hold in any future version of gen_statem.

- - - - - Create a linked gen_statem process - -

- Creates a gen_statem process according - to OTP design principles - (using - proc_lib - primitives) - that is linked to the calling process. - This is essential when the gen_statem shall be part of - a supervision tree so it gets linked to its supervisor. -

-

- The gen_statem process calls - Module:init/1 - to initialize the server. To ensure a synchronized start-up - procedure, start_link/3,4 does not return until - Module:init/1 - has returned. -

-

- ServerName specifies the - - server_name() - - to register for the gen_statem. - If the gen_statem is started with start_link/3 - no ServerName is provided and - the gen_statem is not registered. -

-

Module is the name of the callback module.

-

- Args is an arbitrary term which is passed as - the argument to - Module:init/1. -

-

- If the option {timeout,Time} is present in - Opts, the gen_statem - is allowed to spend Time milliseconds initializing - or it will be terminated and the start function will return - {error,timeout}. -

-

- If the option - {debug,Dbgs} - is present in Opts, debugging through - sys is activated. -

-

- If the option {spawn_opt,SpawnOpts} is present in - Opts, SpawnOpts will be passed - as option list to - spawn_opt/2 - which is used to spawn the gen_statem process. -

- -

- Using the spawn option monitor is currently not - allowed, but will cause this function to fail with reason - badarg. -

- -

- If the gen_statem is successfully created - and initialized this function returns - - {ok,Pid}, - - where Pid is the pid() - of the gen_statem. - If there already exists a process with the specified - ServerName this function returns - {error,{already_started,Pid}}, - where Pid is the pid() of that process. -

-

- If Module:init/1 fails with Reason, - this function returns - {error,Reason}. - If Module:init/1 returns - - {stop,Reason} - - or - ignore, - the process is terminated and this function - returns - - {error,Reason} - - or - ignore, - respectively. -

- - - - - - - - Create a stand-alone gen_statem process - -

- Creates a stand-alone gen_statem process according to - OTP design principles (using - proc_lib - primitives). - Since it does not get linked to the calling process - this start function can not be used by a supervisor - to start a child. -

-

- See start_link/3,4 - for a description of arguments and return values. -

- - - - - - Synchronously stop a generic server - -

- The same as - - stop(ServerRef, normal, infinity). - -

- - - - - Synchronously stop a generic server - -

- Orders the gen_statem - - ServerRef - - to exit with the given Reason - and waits for it to terminate. - The gen_statem will call - - Module:terminate/3 - - before exiting. -

-

- This function returns ok if the server terminates - with the expected reason. Any other reason than normal, - shutdown, or {shutdown,Term} will cause an - error report to be issued through - - error_logger:format/2. - - The default Reason is normal. -

-

- Timeout is an integer greater than zero - which specifies how many milliseconds to wait for the server to - terminate, or the atom infinity to wait indefinitely. - The default value is infinity. - If the server has not terminated within the specified time, - a timeout exception is raised. -

-

- If the process does not exist, a noproc exception - is raised. -

- - - - - - Make a synchronous call to a gen_statem + + + Make a synchronous call to a gen_statem.

Makes a synchronous call to the gen_statem @@ -1093,7 +970,7 @@ handle_event(_, _, State, Data) -> by sending a request and waiting until its reply arrives. - The gen_statem will call the + The gen_statem calls the state function with event_type() {call,From} and event content @@ -1108,33 +985,33 @@ handle_event(_, _, State, Data) -> and that Reply becomes the return value of this function.

-

- Timeout is an integer greater than zero +

+ Timeout is an integer > 0, which specifies how many milliseconds to wait for a reply, or the atom infinity to wait indefinitely, - which is the default. If no reply is received within + which is the default. If no reply is received within the specified time, the function call fails.

To avoid getting a late reply in the caller's - inbox this function spawns a proxy process that - does the call. A late reply gets delivered to the - dead proxy process hence gets discarded. This is + inbox, this function spawns a proxy process that + does the call. A late reply gets delivered to the + dead proxy process, hence gets discarded. This is less efficient than using Timeout =:= infinity.

-

- The call may fail for example if the gen_statem dies +

+ The call can fail, for example, if the gen_statem dies before or during this function call.

- - Send an asynchronous event to a gen_statem + + Send an asynchronous event to a gen_statem.

Sends an asynchronous event to the gen_statem @@ -1144,7 +1021,7 @@ handle_event(_, _, State, Data) -> and returns ok immediately, ignoring if the destination node or gen_statem does not exist. - The gen_statem will call the + The gen_statem calls the state function with event_type() cast and event content @@ -1154,44 +1031,8 @@ handle_event(_, _, State, Data) -> - - - Reply to a caller - -

- This function can be used by a gen_statem - to explicitly send a reply to a process that waits in - call/2 - when the reply cannot be defined in - the return value of a - state function. -

-

- From must be the term from the - - {call,From} - - argument to the - state function. - From and Reply - can also be specified using a - - reply_action() - - and multiple replies with a list of them. -

- -

- A reply sent with this function will not be visible - in sys debug output. -

- - - - - - - Enter the gen_statem receive loop + + Enter the gen_statem receive loop.

The same as @@ -1204,12 +1045,13 @@ handle_event(_, _, State, Data) ->

+ - - Enter the gen_statem receive loop + + Enter the gen_statem receive loop.

- If Server_or_Actions is a list() + If Server_or_Actions is a list(), the same as enter_loop/7 except that no @@ -1228,34 +1070,35 @@ handle_event(_, _, State, Data) ->

+ - - Enter the gen_statem receive loop + + Enter the gen_statem receive loop. -

- Makes an the calling process become a gen_statem. - Does not return, instead the calling process will enter - the gen_statem receive loop and become +

+ Makes the calling process become a gen_statem. + Does not return, instead the calling process enters + the gen_statem receive loop and becomes a gen_statem server. The process must have been started using one of the start functions in - proc_lib. + proc_lib. The user is responsible for any initialization of the process, including registering a name for it.

-

+

This function is useful when a more complex initialization - procedure is needed than - the gen_statem behaviour provides. + procedure is needed than + the gen_statem behavior provides.

-

- Module, Opts and +

+ Module, Opts, and Server have the same meanings as when calling - - gen_statem:start[_link]/3,4. - - However, the + + start[_link]/3,4 + . + However, the server_name() @@ -1263,265 +1106,260 @@ handle_event(_, _, State, Data) -> before this function is called.

CallbackMode, State, - Data and Actions + Data, and Actions have the same meanings as in the return value of - Module:init/1. - Also, the callback module Module + Module:init/1. + Also, the callback module Module does not need to export an init/1 function.

- Failure: If the calling process was not started by a - proc_lib + The function fails if the calling process was not started by a + proc_lib start function, or if it is not registered - according to + according to server_name().

- - - - -
- CALLBACK FUNCTIONS -

- The following functions should be exported from a - gen_statem callback module. -

-
- - - Module:init(Args) -> Result - Initialize process and internal state - - Args = term() - Result = {CallbackMode,State,Data} -  | {CallbackMode,State,Data,Actions} -  | {stop,Reason} | ignore - - CallbackMode = - callback_mode() - - State = state() - - Data = data() - - - Actions = - [action()] | - action() - - Reason = term() - + + + Reply to a caller. -

- Whenever a gen_statem is started using - start_link/3,4 - or - start/3,4, - this function is called by the new process to initialize - the implementation state and server data. -

-

- Args is the Args argument provided to the start - function. -

-

- If the initialization is successful, the function should - return {CallbackMode,State,Data} or - {CallbackMode,State,Data,Actions}. - CallbackMode selects the - callback mode. - of the gen_statem. - State is the initial - state() - and Data the initial server - data(). + This function can be used by a gen_statem + to explicitly send a reply to a process that waits in + call/2 + when the reply cannot be defined in + the return value of a + state function.

- The Actions - are executed when entering the first - state just as for a + From must be the term from argument + + {call,From} + + to the state function. + From and Reply + can also be specified using a + + reply_action() + + and multiple replies with a list of them.

+ +

+ A reply sent with this function is not visible + in sys debug output. +

+ + + + + + + + Create a standalone gen_statem process. +

- If something goes wrong during the initialization - the function should return {stop,Reason} - or ignore. See - start_link/3,4. + Creates a standalone gen_statem process according to + OTP design principles (using + proc_lib + primitives). + As it does not get linked to the calling process, + this start function cannot be used by a supervisor + to start a child.

- This function may use - throw/1 - to return Result. + For a description of arguments and return values, see + start_link/3,4.

- Module:StateName(EventType, EventContent, Data) -> - StateFunctionResult - - Module:handle_event(EventType, EventContent, - State, Data) -> HandleEventResult - - Handle an event - - - EventType = - event_type() - - EventContent = term() - - State = - state() - - - Data = NewData = - data() - - - StateFunctionResult = - - state_function_result() - - - - HandleEventResult = - - handle_event_result() - - - + + + Create a linked gen_statem process.

- Whenever a gen_statem receives an event from - call/2, - cast/2 or - as a normal process message one of these functions is called. If - callback mode - is state_functions then Module:StateName/3 is called, - and if it is handle_event_function - then Module:handle_event/4 is called. + Creates a gen_statem process according + to OTP design principles + (using + proc_lib + primitives) + that is linked to the calling process. + This is essential when the gen_statem must be part of + a supervision tree so it gets linked to its supervisor.

- If EventType is - {call,From} - the caller is waiting for a reply. The reply can be sent - from this or from any other - state function - by returning with {reply,From,Reply} in - Actions, in - Replies - or by calling - reply(From, Reply). + The gen_statem process calls + Module:init/1 + to initialize the server. To ensure a synchronized startup + procedure, start_link/3,4 does not return until + Module:init/1 + has returned.

- If this function returns with a next state that - does not match equal (=/=) to the current state - all postponed events will be retried in the next state. + ServerName specifies the + + server_name() + + to register for the gen_statem. + If the gen_statem is started with start_link/3, + no ServerName is provided and + the gen_statem is not registered.

-

- The only difference between StateFunctionResult and - HandleEventResult is that for StateFunctionResult - the next state has to be an atom but for HandleEventResult - there is no restriction on the next state. +

Module is the name of the callback module.

+

+ Args is an arbitrary term that is passed as + the argument to + Module:init/1.

+ + +

+ If option {timeout,Time} is present in + Opts, the gen_statem + is allowed to spend Time milliseconds initializing + or it terminates and the start function returns + + {error,timeout}. +

+ + +

+ If option + {debug,Dbgs} + is present in Opts, debugging through + sys is activated. +

+ + +

+ If option {spawn_opt,SpawnOpts} is present in + Opts, SpawnOpts is passed + as option list to + erlang:spawn_opt/2, + which is used to spawn the gen_statem process. +

+ + + +

+ Using spawn option monitor is not + allowed, it cause this function to fail with reason + badarg. +

+

- See action() - for options that can be set and actions that can be done - by gen_statem after returning from this function. + If the gen_statem is successfully created + and initialized, this function returns + + {ok,Pid} + , + where Pid is the pid() + of the gen_statem. + If a process with the specified ServerName + exists already, this function returns + + {error,{already_started,Pid}}, + where Pid is the pid() of that process.

- These functions may use - throw/1, - to return the result. + If Module:init/1 fails with Reason, + this function returns + {error,Reason}. + If Module:init/1 returns + + {stop,Reason} + + or + ignore, + the process is terminated and this function + returns + + {error,Reason} + + or + ignore, + respectively.

- Module:terminate(Reason, State, Data) -> Ignored - Clean up before termination - - Reason = normal | shutdown | {shutdown,term()} | term() - State = state() - Data = data() - Ignored = term() - + + Synchronously stop a generic server. -

- This function is called by a gen_statem - when it is about to terminate. It should be the opposite of - Module:init/1 - and do any necessary cleaning up. When it returns, - the gen_statem terminates with Reason. The return - value is ignored.

-

- Reason is a term denoting the stop reason and - State - is the internal state of the gen_statem. -

-

- Reason depends on why the gen_statem - is terminating. - If it is because another callback function has returned a - stop tuple {stop,Reason} in - Actions, - Reason will have the value specified in that tuple. - If it is due to a failure, Reason is the error reason. +

+ The same as + + stop(ServerRef, normal, infinity). +

-

- If the gen_statem is part of a supervision tree and is - ordered by its supervisor to terminate, this function will be - called with Reason = shutdown if the following - conditions apply:

- - - the gen_statem has been set - to trap exit signals, and - - - the shutdown strategy as defined in the supervisor's - child specification is an integer timeout value, not - brutal_kill. - - -

- Even if the gen_statem is not - part of a supervision tree, this function will be called - if it receives an 'EXIT' message from its parent. - Reason will be the same as - in the 'EXIT' message. + + + + + + Synchronously stop a generic server. + +

+ Orders the gen_statem + + ServerRef + + to exit with the specified Reason + and waits for it to terminate. + The gen_statem calls + + Module:terminate/3 + + before exiting.

-

- Otherwise, the gen_statem will be immediately terminated. +

+ This function returns ok if the server terminates + with the expected reason. Any other reason than normal, + shutdown, or {shutdown,Term} causes an + error report to be issued through + + error_logger:format/2 + . + The default Reason is normal.

-

- Note that for any other reason than normal, - shutdown, or {shutdown,Term} - the gen_statem is assumed to terminate due to an error - and an error report is issued using - - error_logger:format/2. - +

+ Timeout is an integer > 0, + which specifies how many milliseconds to wait for the server to + terminate, or the atom infinity to wait indefinitely. + Defaults to infinity. + If the server does not terminate within the specified time, + a timeout exception is raised.

- This function may use - throw/1 - to return Ignored, which is ignored anyway. + If the process does not exist, a noproc exception + is raised.

+ + +
+ Callback Functions +

+ The following functions are to be exported from a + gen_statem callback module. +

+
+ Module:code_change(OldVsn, OldState, OldData, Extra) -> Result - Update the internal state during upgrade/downgrade + Update the internal state during upgrade/downgrade. OldVsn = Vsn | {down,Vsn}   Vsn = term() @@ -1544,24 +1382,23 @@ handle_event(_, _, State, Data) ->

- This function is called by a gen_statem when it should - update its internal state during a release upgrade/downgrade, - that is when the instruction {update,Module,Change,...} - where Change={advanced,Extra} is given in the + This function is called by a gen_statem when it is to + update its internal state during a release upgrade/downgrade, + that is, when the instruction {update,Module,Change,...}, + where Change={advanced,Extra}, is specified in the appup - file. See - + file. For more information, see + OTP Design Principles - - for more information. + .

-

- In the case of an upgrade, OldVsn is Vsn, and - in the case of a downgrade, OldVsn is - {down,Vsn}. Vsn is defined by the vsn - attribute(s) of the old version of the callback module - Module. If no such attribute is defined, the version - is the checksum of the BEAM file. +

+ For an upgrade, OldVsn is Vsn, and + for a downgrade, OldVsn is + {down,Vsn}. Vsn is defined by the vsn + attribute(s) of the old version of the callback module + Module. If no such attribute is defined, the version + is the checksum of the Beam file.

@@ -1569,14 +1406,14 @@ handle_event(_, _, State, Data) -> callback mode - during release upgrade/downgrade, the upgrade is no problem - since the new code surely knows what callback mode - it needs, but for a downgrade this function will have to - know from the Extra argument that comes from the - appup + during release upgrade/downgrade, the upgrade is no problem, + as the new code surely knows what callback mode + it needs. However, for a downgrade this function must + know from argument Extra that comes from the + sasl:appup file what callback mode the old code did use. - It may also be possible to figure this out - from the {down,Vsn} argument since Vsn + It can also be possible to figure this out + from argument {down,Vsn}, as Vsn in effect defines the old callback module version.

@@ -1584,32 +1421,102 @@ handle_event(_, _, State, Data) -> OldState and OldData is the internal state of the gen_statem.

-

- Extra is passed as-is from the {advanced,Extra} - part of the update instruction. +

+ Extra is passed "as is" from the {advanced,Extra} + part of the update instruction.

-

- If successful, the function shall return the updated - internal state in an +

+ If successful, the function must return the updated + internal state in an {NewCallbackMode,NewState,NewData} tuple.

If the function returns Reason, the ongoing - upgrade will fail and roll back to the old release.

+ upgrade fails and rolls back to the old release.

- This function may use - throw/1 + This function can use + erlang:throw/1 to return Result or Reason.

+ + Module:init(Args) -> Result + Initialize process and internal state. + + Args = term() + Result = {CallbackMode,State,Data} +  | {CallbackMode,State,Data,Actions} +  | {stop,Reason} | ignore + + CallbackMode = + callback_mode() + + State = state() + + Data = data() + + + Actions = + [action()] | + action() + + Reason = term() + + + +

+ Whenever a gen_statem is started using + start_link/3,4 + or + start/3,4, + this function is called by the new process to initialize + the implementation state and server data. +

+

+ Args is the Args argument provided to the start + function. +

+

+ If the initialization is successful, the function is to + return {CallbackMode,State,Data} or + {CallbackMode,State,Data,Actions}. + CallbackMode selects the + + callback mode + of the gen_statem. + State is the initial + state() + and Data the initial server + data(). +

+

+ The Actions + are executed when entering the first + state just as for a + state function. +

+

+ If the initialization fails, + the function is to return {stop,Reason} + or ignore; see + start_link/3,4. +

+

+ This function can use + erlang:throw/1 + to return Result. +

+ + + Module:format_status(Opt, [PDict,State,Data]) -> Status Optional function for providing a term describing the - current gen_statem status + current gen_statem status. Opt = normal | terminate PDict = [{Key, Value}] @@ -1627,58 +1534,59 @@ handle_event(_, _, State, Data) -> -

- This callback is optional, so a callback module need not - export it. The gen_statem module provides a default - implementation of this function that returns - {State,Data}. If this callback fails the default - function will return {State,Info} +

+ This callback is optional, so a callback module does not need + to export it. The gen_statem module provides a default + implementation of this function that returns + {State,Data}. If this callback fails, the default + function returns {State,Info}, where Info informs of the crash but no details, to hide possibly sensitive data.

-

This function is called by a gen_statem process when:

+

This function is called by a gen_statem process when + any of the following apply:

- + One of - + sys:get_status/1,2 - is invoked to get the gen_statem status. Opt is set - to the atom normal for this case. + is invoked to get the gen_statem status. Opt is set + to the atom normal for this case. - + The gen_statem terminates abnormally and logs an error. Opt is set to the atom terminate for this case. - +

- This function is useful for customising the form and + This function is useful for changing the form and appearance of the gen_statem status for these cases. A - callback module wishing to customise the + callback module wishing to change the sys:get_status/1,2 - return value as well as how + return value and how its status appears in termination error logs exports an - instance of format_status/2 that returns a term + instance of format_status/2, which returns a term describing the current status of the gen_statem.

-

- PDict is the current value of the gen_statem's - process dictionary. +

+ PDict is the current value of the process dictionary + of the gen_statem.

-

+

State is the internal state of the gen_statem.

-

+

Data is the internal server data of the gen_statem.

-

- The function should return Status, a term that - customises the details of the current state and status of +

+ The function is to return Status, a term that + changes the details of the current state and status of the gen_statem. There are no restrictions on the form Status can take, but for the @@ -1687,38 +1595,197 @@ handle_event(_, _, State, Data) -> case (when Opt is normal), the recommended form for the Status value is [{data, [{"State", - Term}]}] where Term provides relevant details of - the gen_statem state. Following this recommendation isn't - required, but doing so will make the callback module status + Term}]}], where Term provides relevant details of + the gen_statem state. Following this recommendation is not + required, but it makes the callback module status consistent with the rest of the sys:get_status/1,2 return value.

-

+

One use for this function is to return compact alternative state representations to avoid having large state terms - printed in logfiles. Another is to hide sensitive data from + printed in log files. Another use is to hide sensitive data from being written to the error log.

- This function may use - throw/1 + This function can use + erlang:throw/1 to return Status.

+ + Module:StateName(EventType, EventContent, Data) -> + StateFunctionResult + + Module:handle_event(EventType, EventContent, + State, Data) -> HandleEventResult + + Handle an event. + + + EventType = + event_type() + + EventContent = term() + + State = + state() + + + Data = NewData = + data() + + + StateFunctionResult = + + state_function_result() + + + + HandleEventResult = + + handle_event_result() + + + + +

+ Whenever a gen_statem receives an event from + call/2, + cast/2, or + as a normal process message, one of these functions is called. If + callback mode + is state_functions, Module:StateName/3 is called, + and if it is handle_event_function, + Module:handle_event/4 is called. +

+

+ If EventType is + {call,From}, + the caller waits for a reply. The reply can be sent + from this or from any other + state function + by returning with {reply,From,Reply} in + Actions, in + Replies, + or by calling + reply(From, Reply). +

+

+ If this function returns with a next state that + does not match equal (=/=) to the current state, + all postponed events are retried in the next state. +

+

+ The only difference between StateFunctionResult and + HandleEventResult is that for StateFunctionResult + the next state must be an atom, but for HandleEventResult + there is no restriction on the next state. +

+

+ For options that can be set and actions that can be done + by gen_statem after returning from this function, + see action(). +

+

+ These functions can use + erlang:throw/1, + to return the result. +

+ + + + + Module:terminate(Reason, State, Data) -> Ignored + Clean up before termination. + + Reason = normal | shutdown | {shutdown,term()} | term() + State = state() + Data = data() + Ignored = term() + + +

+ This function is called by a gen_statem + when it is about to terminate. It is to be the opposite of + Module:init/1 + and do any necessary cleaning up. When it returns, + the gen_statem terminates with Reason. The return + value is ignored.

+

+ Reason is a term denoting the stop reason and + State + is the internal state of the gen_statem. +

+

+ Reason depends on why the gen_statem + is terminating. + If it is because another callback function has returned, a + stop tuple {stop,Reason} in + Actions, + Reason has the value specified in that tuple. + If it is because of a failure, Reason is the error reason. +

+

+ If the gen_statem is part of a supervision tree and is + ordered by its supervisor to terminate, this function is + called with Reason = shutdown if both the following + conditions apply:

+ + +

+ The gen_statem has been set + to trap exit signals. +

+ + +

+ The shutdown strategy as defined in the supervisor's + child specification is an integer time-out value, not + brutal_kill. +

+ + +

+ Even if the gen_statem is not + part of a supervision tree, this function is called + if it receives an 'EXIT' message from its parent. + Reason is the same as + in the 'EXIT' message. +

+

+ Otherwise, the gen_statem is immediately terminated. +

+

+ Notice that for any other reason than normal, + shutdown, or {shutdown,Term}, + the gen_statem is assumed to terminate because of an error + and an error report is issued using + + error_logger:format/2. + +

+

+ This function can use + erlang:throw/1 + to return Ignored, which is ignored anyway. +

+ +
- SEE ALSO + See Also

gen_event(3), gen_fsm(3), gen_server(3), - supervisor(3), proc_lib(3), + supervisor(3), sys(3)

-- cgit v1.2.3 From 17405463ba134e71ff09e8d2921de9aa931805ee Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Mon, 9 May 2016 14:20:03 +0200 Subject: Fix all seealso and other minor changes --- lib/stdlib/doc/src/gen_statem.xml | 296 ++++++++++++-------------------------- 1 file changed, 88 insertions(+), 208 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index be90488a1f..b1d9799917 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -84,9 +84,7 @@ using this module has a standard set of interface functions and includes functionality for tracing and error reporting. It also fits into an OTP supervision tree. For more information, see - - OTP Design Principles - . + OTP Design Principles.

A gen_statem assumes all specific parts to be located in a @@ -136,28 +134,23 @@ erlang:'!' -----> Module:StateName/3 callback mode is state_functions, the state must be an atom and is used as the state function name; see - - Module:StateName/3 - . + Module:StateName/3. This gathers all code for a specific state in one function and hence dispatches on state first. Notice that in this mode the mandatory callback function - - Module:terminate/3 - makes the state name terminate unusable. + Module:terminate/3 + makes the state name terminate unusable.

When the callback mode is handle_event_function, the state can be any term and the state function name is - - Module:handle_event/4 - . + Module:handle_event/4. This makes it easy to dispatch on state or on event as you desire. Be careful about which events you handle in which - states so that you do not accidentally postpone one event + states so that you do not accidentally postpone an event forever creating an infinite busy loop.

@@ -178,15 +171,12 @@ erlang:'!' -----> Module:StateName/3

The state function can insert events using the - - action() next_event - + action() + next_event and such an event is inserted as the next to present to the state function. That is, as if it is the oldest incoming event. A dedicated - - event_type() - + event_type() internal can be used for such events making them impossible to mistake for external events.

@@ -206,21 +196,18 @@ erlang:'!' -----> Module:StateName/3

For the details of a state transition, see type - - transition_option() - . + transition_option().

A gen_statem handles system messages as described in sys. - The sysmodule can be used for debugging a gen_statem. + The sys module can be used for debugging a gen_statem.

Notice that a gen_statem does not trap exit signals automatically, this must be explicitly initiated in the callback module (by calling - - process_flag(trap_exit, true). + process_flag(trap_exit, true).

Unless otherwise stated, all functions in this module fail if @@ -229,9 +216,7 @@ erlang:'!' -----> Module:StateName/3

The gen_statem process can go into hibernation; see - - proc_lib:hibernate/3 - . + proc_lib:hibernate/3. It is done when a state function or Module:init/1 @@ -242,9 +227,7 @@ erlang:'!' -----> Module:StateName/3 However, use this feature with care, as hibernation can be too costly to use after every event; see - - erlang:hibernate/3 - . + erlang:hibernate/3.

@@ -257,7 +240,7 @@ erlang:'!' -----> Module:StateName/3 state_functions. You can push the button and it replies if it went on or off, and you can ask for a count of how many times it has been - pushed to on. + pushed to switch on.

The following is the complete callback module file pushbutton.erl:

@@ -381,13 +364,10 @@ handle_event(_, _, State, Data) ->

Name specification to use when starting a gen_statem server. See - - start_link/3 - + start_link/3 and - - server_ref() - below. + server_ref() + below.

@@ -398,14 +378,12 @@ handle_event(_, _, State, Data) -> Server specification to use when addressing a gen_statem server. See call/2 and - - server_name() - + server_name() above.

It can be:

- pid() | LocalName + pid() | LocalName

The gen_statem is locally registered. @@ -421,21 +399,21 @@ handle_event(_, _, State, Data) -> {global,GlobalName}

- The gen_statem is globally registered - in kernel:global. + The gen_statem is globally registered in + kernel:global.

{via,RegMod,ViaName}

- The gen_statem is registered through + The gen_statem is registered in an alternative process registry. The registry callback module RegMod is to export functions register_name/2, unregister_name/1, whereis_name/1, and send/2, - which are to behave like the corresponding functions - in kernel:global. + which are to behave like the corresponding functions in + kernel:global. Thus, {via,global,GlobalName} is the same as {global,GlobalName}.

@@ -482,9 +460,7 @@ handle_event(_, _, State, Data) ->

Destination to use when replying through, for example, the - - action() - + action() {reply,From,Reply} to a process that has called the gen_statem server using call/2. @@ -554,9 +530,7 @@ handle_event(_, _, State, Data) -> or when calling enter_loop/5,6,7, and with the return value from - - Module:code_change/4 - . + Module:code_change/4.

state_functions @@ -565,9 +539,7 @@ handle_event(_, _, State, Data) -> The state must be of type state_name() and one callback function per state, that is, - - Module:StateName/3 - , + Module:StateName/3, is used.

@@ -575,9 +547,7 @@ handle_event(_, _, State, Data) ->

The state can be any term and the callback function - - Module:handle_event/4 - + Module:handle_event/4 is used for all states.

@@ -604,9 +574,7 @@ handle_event(_, _, State, Data) ->

If - - postpone() - + postpone() is true, the current event is postponed.

@@ -620,9 +588,7 @@ handle_event(_, _, State, Data) ->

All events stored with - - action() - + action() next_event are inserted in the queue to be processed before all other events. @@ -631,13 +597,9 @@ handle_event(_, _, State, Data) ->

If an - - event_timeout() - + event_timeout() is set through - - action() - + action() timeout, an event timer can be started or a time-out zero event can be enqueued. @@ -651,9 +613,7 @@ handle_event(_, _, State, Data) -> otherwise the gen_statem goes into receive or hibernation (if - - hibernate() - + hibernate() is true) to wait for the next message. In hibernation the next non-system event awakens the gen_statem, or rather @@ -681,16 +641,13 @@ handle_event(_, _, State, Data) ->

If true, hibernates the gen_statem by calling - - proc_lib:hibernate/3 - + proc_lib:hibernate/3 before going into receive to wait for a new external event. If there are enqueued events, to prevent receiving any new event, an - - erlang:garbage_collect/0 - is done instead to simulate + erlang:garbage_collect/0 + is done instead to simulate that the gen_statem entered hibernation and immediately got awakened by the oldest enqueued event.

@@ -731,8 +688,8 @@ handle_event(_, _, State, Data) ->

These state transition actions can be invoked by returning them from the - state function, - from Module:init/1 + state function, from + Module:init/1 or by giving them to enter_loop/6,7.

@@ -741,15 +698,11 @@ handle_event(_, _, State, Data) ->

Actions that set - - transition options - + transition options override any previous of the same type, so the last in the containing list wins. For example, the last - - event_timeout() - + event_timeout() overrides any other event_timeout() in the list.

@@ -757,12 +710,8 @@ handle_event(_, _, State, Data) ->

Sets the - - transition_option() - - - postpone() - + transition_option() + postpone() for this state transition. This action is ignored when returned from Module:init/1 @@ -775,12 +724,8 @@ handle_event(_, _, State, Data) ->

Sets the - - transition_option() - - - hibernate() - + transition_option() + hibernate() for this state transition.

@@ -792,22 +737,16 @@ handle_event(_, _, State, Data) -> This form exists to make the state function return value {next_state,NextState,NewData,Timeout} - allowed like for - - gen_fsm:Module:StateName/2 - . + allowed like for gen_fsm's + Module:StateName/2.

timeout

Sets the - - transition_option() - - - event_timeout() - + transition_option() + event_timeout() to Time with EventContent.

@@ -832,9 +771,7 @@ handle_event(_, _, State, Data) ->

An event of type - - internal - + internal is to be used when you want to reliably distinguish an event inserted this way from any external event.

@@ -849,9 +786,7 @@ handle_event(_, _, State, Data) -> Replies to a caller waiting for a reply in call/2. From must be the term from argument - - {call,From} - + {call,From} to the state function.

@@ -907,9 +842,7 @@ handle_event(_, _, State, Data) ->

Terminates the gen_statem by calling - - Module:terminate/3 - + Module:terminate/3 with Reason and NewData, if specified.

@@ -919,9 +852,7 @@ handle_event(_, _, State, Data) ->

Sends all Replies, then terminates the gen_statem by calling - - Module:terminate/3 - + Module:terminate/3 with Reason and NewData, if specified.

@@ -965,9 +896,7 @@ handle_event(_, _, State, Data) ->

Makes a synchronous call to the gen_statem - - ServerRef - + ServerRef by sending a request and waiting until its reply arrives. The gen_statem calls the @@ -1015,9 +944,7 @@ handle_event(_, _, State, Data) ->

Sends an asynchronous event to the gen_statem - - ServerRef - + ServerRef and returns ok immediately, ignoring if the destination node or gen_statem does not exist. @@ -1038,9 +965,7 @@ handle_event(_, _, State, Data) -> The same as enter_loop/7 except that no - - server_name() - + server_name() must have been registered.

@@ -1055,9 +980,7 @@ handle_event(_, _, State, Data) -> the same as enter_loop/7 except that no - - server_name() - + server_name() must have been registered and Actions = Server_or_Actions.

@@ -1095,13 +1018,9 @@ handle_event(_, _, State, Data) -> Module, Opts, and Server have the same meanings as when calling - - start[_link]/3,4 - . + start[_link]/3,4. However, the - - server_name() - + server_name() name must have been registered accordingly before this function is called.

@@ -1137,16 +1056,12 @@ handle_event(_, _, State, Data) ->

From must be the term from argument - - {call,From} - + {call,From} to the state function. From and Reply can also be specified using a - - reply_action() - + reply_action() and multiple replies with a list of them.

@@ -1204,9 +1119,7 @@ handle_event(_, _, State, Data) ->

ServerName specifies the - - server_name() - + server_name() to register for the gen_statem. If the gen_statem is started with start_link/3, no ServerName is provided and @@ -1225,8 +1138,7 @@ handle_event(_, _, State, Data) -> Opts, the gen_statem is allowed to spend Time milliseconds initializing or it terminates and the start function returns - - {error,timeout}. + {error,timeout}.

@@ -1241,8 +1153,8 @@ handle_event(_, _, State, Data) ->

If option {spawn_opt,SpawnOpts} is present in Opts, SpawnOpts is passed - as option list to - erlang:spawn_opt/2, + as option list to + erlang:spawn_opt/2, which is used to spawn the gen_statem process.

@@ -1250,22 +1162,19 @@ handle_event(_, _, State, Data) ->

Using spawn option monitor is not - allowed, it cause this function to fail with reason + allowed, it causes this function to fail with reason badarg.

If the gen_statem is successfully created and initialized, this function returns - - {ok,Pid} - , + {ok,Pid}, where Pid is the pid() of the gen_statem. If a process with the specified ServerName exists already, this function returns - - {error,{already_started,Pid}}, + {error,{already_started,Pid}}, where Pid is the pid() of that process.

@@ -1273,16 +1182,12 @@ handle_event(_, _, State, Data) -> this function returns {error,Reason}. If Module:init/1 returns - - {stop,Reason} - + {stop,Reason} or ignore, the process is terminated and this function returns - - {error,Reason} - + {error,Reason} or ignore, respectively. @@ -1296,9 +1201,7 @@ handle_event(_, _, State, Data) ->

The same as - - stop(ServerRef, normal, infinity). - + stop(ServerRef, normal, infinity).

@@ -1309,15 +1212,11 @@ handle_event(_, _, State, Data) ->

Orders the gen_statem - - ServerRef - + ServerRef to exit with the specified Reason and waits for it to terminate. The gen_statem calls - - Module:terminate/3 - + Module:terminate/3 before exiting.

@@ -1325,9 +1224,7 @@ handle_event(_, _, State, Data) -> with the expected reason. Any other reason than normal, shutdown, or {shutdown,Term} causes an error report to be issued through - - error_logger:format/2 - . + error_logger:format/2. The default Reason is normal.

@@ -1388,9 +1285,7 @@ handle_event(_, _, State, Data) -> where Change={advanced,Extra}, is specified in the appup file. For more information, see - - OTP Design Principles - . + OTP Design Principles.

For an upgrade, OldVsn is Vsn, and @@ -1403,9 +1298,7 @@ handle_event(_, _, State, Data) ->

If you would dare to change - - callback mode - + callback mode during release upgrade/downgrade, the upgrade is no problem, as the new code surely knows what callback mode it needs. However, for a downgrade this function must @@ -1483,8 +1376,7 @@ handle_event(_, _, State, Data) -> return {CallbackMode,State,Data} or {CallbackMode,State,Data,Actions}. CallbackMode selects the - - callback mode + callback mode of the gen_statem. State is the initial state() @@ -1549,9 +1441,7 @@ handle_event(_, _, State, Data) -> One of - - sys:get_status/1,2 - + sys:get_status/1,2 is invoked to get the gen_statem status. Opt is set to the atom normal for this case. @@ -1564,9 +1454,7 @@ handle_event(_, _, State, Data) -> This function is useful for changing the form and appearance of the gen_statem status for these cases. A callback module wishing to change the - - sys:get_status/1,2 - + sys:get_status/1,2 return value and how its status appears in termination error logs exports an instance of format_status/2, which returns a term @@ -1589,9 +1477,7 @@ handle_event(_, _, State, Data) -> changes the details of the current state and status of the gen_statem. There are no restrictions on the form Status can take, but for the - - sys:get_status/1,2 - + sys:get_status/1,2 case (when Opt is normal), the recommended form for the Status value is [{data, [{"State", @@ -1599,9 +1485,7 @@ handle_event(_, _, State, Data) -> the gen_statem state. Following this recommendation is not required, but it makes the callback module status consistent with the rest of the - - sys:get_status/1,2 - + sys:get_status/1,2 return value.

@@ -1642,15 +1526,11 @@ handle_event(_, _, State, Data) -> StateFunctionResult = - - state_function_result() - + state_function_result() HandleEventResult = - - handle_event_result() - + handle_event_result() @@ -1766,9 +1646,7 @@ handle_event(_, _, State, Data) -> shutdown, or {shutdown,Term}, the gen_statem is assumed to terminate because of an error and an error report is issued using - - error_logger:format/2. - + error_logger:format/2.

This function can use @@ -1781,11 +1659,13 @@ handle_event(_, _, State, Data) ->

See Also -

gen_event(3), +

+ gen_event(3), gen_fsm(3), gen_server(3), proc_lib(3), supervisor(3), - sys(3)

+ sys(3). +

-- cgit v1.2.3 From e146a3eec5a2d384260aa8829777c89eaab09cbd Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Thu, 21 Apr 2016 18:36:45 +0200 Subject: erts: Implement max_heap_size process flag The max_heap_size process flag can be used to limit the growth of a process heap by killing it before it becomes too large to handle. It is possible to set the maximum using the `erl +hmax` option, `system_flag(max_heap_size, ...)`, `spawn_opt(Fun, [{max_heap_size, ...}])` and `process_flag(max_heap_size, ...)`. It is possible to configure the behaviour of the process when the maximum heap size is reached. The process may be sent an untrappable exit signal with reason kill and/or send an error_logger message with details on the process state. A new trace event called gc_max_heap_size is also triggered for the garbage_collection trace flag when the heap grows larger than the configured size. If kill and error_logger are disabled, it is still possible to see that the maximum has been reached by doing garbage collection tracing on the process. The heap size is defined as the sum of the heap memory that the process is currently using. This includes all generational heaps, the stack, any messages that are considered to be part of the heap and any extra memory the garbage collector may need during collection. In the current implementation this means that when a process is set using on_heap message queue data mode, the messages that are in the internal message queue are counted towards this value. For off_heap, only matched messages count towards the size of the heap. For mixed, it depends on race conditions within the VM whether a message is part of the heap or not. Below is an example run of the new behaviour: Eshell V8.0 (abort with ^G) 1> f(P),P = spawn_opt(fun() -> receive ok -> ok end end, [{max_heap_size, 512}]). <0.60.0> 2> erlang:trace(P, true, [garbage_collection, procs]). 1 3> [P ! lists:duplicate(M,M) || M <- lists:seq(1,15)],ok. ok 4> =ERROR REPORT==== 26-Apr-2016::16:25:10 === Process: <0.60.0> Context: maximum heap size reached Max heap size: 512 Total heap size: 723 Kill: true Error Logger: true GC Info: [{old_heap_block_size,0}, {heap_block_size,609}, {mbuf_size,145}, {recent_size,0}, {stack_size,9}, {old_heap_size,0}, {heap_size,211}, {bin_vheap_size,0}, {bin_vheap_block_size,46422}, {bin_old_vheap_size,0}, {bin_old_vheap_block_size,46422}] flush(). Shell got {trace,<0.60.0>,gc_start, [{old_heap_block_size,0}, {heap_block_size,233}, {mbuf_size,145}, {recent_size,0}, {stack_size,9}, {old_heap_size,0}, {heap_size,211}, {bin_vheap_size,0}, {bin_vheap_block_size,46422}, {bin_old_vheap_size,0}, {bin_old_vheap_block_size,46422}]} Shell got {trace,<0.60.0>,gc_max_heap_size, [{old_heap_block_size,0}, {heap_block_size,609}, {mbuf_size,145}, {recent_size,0}, {stack_size,9}, {old_heap_size,0}, {heap_size,211}, {bin_vheap_size,0}, {bin_vheap_block_size,46422}, {bin_old_vheap_size,0}, {bin_old_vheap_block_size,46422}]} Shell got {trace,<0.60.0>,exit,killed} --- lib/stdlib/doc/src/proc_lib.xml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index 245580b1ba..f02b1f0651 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -72,6 +72,13 @@ + + + +

See + erlang:process_flag(max_heap_size, MaxHeapSize).

+ + -- cgit v1.2.3 From 9afbe567667d78cd5f2e040bcf33913b169befa1 Mon Sep 17 00:00:00 2001 From: Lukas Larsson Date: Tue, 10 May 2016 09:35:41 +0200 Subject: stdlib: Fix missing anchor in epp docs --- lib/stdlib/doc/src/epp.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index 0802f0e47c..ac87f9c2b6 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -102,6 +102,7 @@ Return the next Erlang form from the opened Erlang source file +

Returns the next Erlang form from the opened Erlang source file. The tuple {eof, Line} is returned at end-of-file. The first -- cgit v1.2.3 From 7241e26a8ac9aa797f046b6150a481563f625476 Mon Sep 17 00:00:00 2001 From: Raimo Niskanen Date: Tue, 10 May 2016 10:23:35 +0200 Subject: Reword 'dispatch' into 'branch depending' --- lib/stdlib/doc/src/gen_statem.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index b1d9799917..0e7d6e53e9 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -136,9 +136,9 @@ erlang:'!' -----> Module:StateName/3 is used as the state function name; see Module:StateName/3. This gathers all code for a specific state - in one function and hence dispatches on state first. - Notice that in this mode - the mandatory callback function + in one function as the gen_statem engine + branches depending on state name. + Notice that in this mode the mandatory callback function Module:terminate/3 makes the state name terminate unusable.

@@ -148,7 +148,7 @@ erlang:'!' -----> Module:StateName/3 is handle_event_function, the state can be any term and the state function name is Module:handle_event/4. - This makes it easy to dispatch on state or on event as you desire. + This makes it easy to branch depending on state or event as you desire. Be careful about which events you handle in which states so that you do not accidentally postpone an event forever creating an infinite busy loop. -- cgit v1.2.3 From bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Wed, 11 May 2016 17:22:23 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 261 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 261 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 87f5335723..76d49e37c2 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,267 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 3.0 + +
Fixed Bugs and Malfunctions + + +

Fix a race bug affecting dets:open_file/2. +

+

+ Own Id: OTP-13260 Aux Id: seq13002

+ + +

Don't search for non-existing Map keys twice

+

For maps:get/2,3 and maps:find/2, + searching for an immediate key, e.g. an atom, in a small + map, the search was performed twice if the key did not + exist.

+

+ Own Id: OTP-13459

+ + +

+ Avoid stray corner-case math errors on Solaris, e.g. an + error is thrown on undeflows in exp() and pow() when it + shouldn't be.

+

+ Own Id: OTP-13531

+ + +

Fix linting of map key variables

+

Map keys cannot be unbound and then used in parallel + matching.

+

Example: #{ K := V } = #{ k := K } = M. This + is illegal if 'K' is not bound.

+

+ Own Id: OTP-13534 Aux Id: ERL-135

+ + +
+ + +
Improvements and New Features + + +

The types of The Abstract Format in the + erl_parse module have been refined.

+

+ Own Id: OTP-10292

+ + +

Undocumented syntax for function specifications, + -spec F/A :: Domain -> Range, has been removed + (without deprecation).

Using the + is_subtype(V, T) syntax for constraints (in + function specifications) is no longer documented, and the + newer syntax V :: T should be used instead. The + Erlang Parser still recognizes the is_subtype + syntax, and will continue to do so for some time.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11879

+ + +

The 'random' module has been deprecated. Use + the 'rand' module instead.

+

+ Own Id: OTP-12502 Aux Id: OTP-12501

+ + +

Background: In record fields with a type declaration + but without an initializer, the Erlang parser inserted + automatically the singleton type 'undefined' to + the list of declared types, if that value was not present + there. That is, the record declaration:

+

+ -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 :: + some_mod:some_typ()}).

+

was translated by the parser to:

+

+ -record(rec, {f1 :: float() | 'undefined', f2 = 42 :: + integer(), f3 :: some_mod:some_typ() | 'undefined'}).

+

The rationale for this was that creation of a "dummy" + #rec{} record should not result in a warning from + dialyzer that, for example, the implicit initialization + of the #rec.f1 field violates its type + declaration.

+

Problems: This seemingly innocent action has some + unforeseen consequences.

+

For starters, there is no way for programmers to + declare that e.g. only floats make sense for the + f1 field of #rec{} records when there is no + "obvious" default initializer for this field. (This also + affects tools like PropEr that use these declarations + produced by the Erlang parser to generate random + instances of records for testing purposes.)

+

It also means that dialyzer does not warn if e.g. an + is_atom/1 test or something more exotic like an + atom_to_list/1 call is performed on the value of + the f1 field.

+

Similarly, there is no way to extend dialyzer to warn + if it finds record constructions where f1 is not + initialized to some float.

+

Last but not least, it is semantically problematic + when the type of the field is an opaque type: creating a + union of an opaque and a structured type is very + problematic for analysis because it fundamentally breaks + the opacity of the term at that point.

+

Change: To solve these problems the parser will not + automatically insert the 'undefined' value + anymore; instead the user has the option to choose the + places where this value makes sense (for the field) and + where it does not and insert the | 'undefined' + there manually.

+

Consequences of this change: This change means that + dialyzer will issue a warning for all places where + records with uninitialized fields are created and those + fields have a declared type that is incompatible with + 'undefined' (e.g. float()). This warning + can be suppressed easily by adding | 'undefined' + to the type of this field. This also adds documentation + that the user really intends to create records where this + field is uninitialized.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12719

+ + +

Remove deprecated functions in the modules + erl_scan and erl_parse.

+

+ Own Id: OTP-12861

+ + +

The pre-processor can now expand the ?FUNCTION_NAME + and ?FUNCTION_ARITY macros.

+

+ Own Id: OTP-13059

+ + +

A new behaviour gen_statem has been + implemented. It has been thoroughly reviewed, is stable + enough to be used by at least two heavy OTP applications, + and is here to stay. But depending on user feedback, we + do not expect but might find it necessary to make minor + not backwards compatible changes into OTP-20.0, so its + state can be designated as "not quite experimental"... +

The gen_statem behaviour is intended to + replace gen_fsm for new code. It has the same + features and add some really useful:

State code is gathered + The state can be any term Events can + be postponed Events can be self + generated A reply can be sent from a later + state There can be multiple sys traceable + replies

The callback model(s) for + gen_statem differs from the one for + gen_fsm, but it is still fairly easy to rewrite + from gen_fsm to gen_statem.

+

+ Own Id: OTP-13065 Aux Id: PR-960

+ + +

+ Optimize binary:split/2 and binary:split/3 with native + BIF implementation.

+

+ Own Id: OTP-13082

+ + +

Background: The types of record fields have since R12B + been put in a separate form by epp:parse_file(), + leaving the record declaration form untyped. The separate + form, however, does not follow the syntax of type + declarations, and parse transforms inspecting + -type() attributes need to know about the special + syntax. Since the compiler stores the return value of + epp:parse_file() as debug information in the + abstract code chunk ("Abst" or + abstract_code), tools too need to know about the + special syntax, if they inspect -type() attributes + in abstract code.

+

Change: No separate type form is created by + epp:parse_file(), but the type information is kept + in the record fields. This means that all parse + transforms and all tools inspecting -record() + declarations need to recognize {typed_record_field, + Field, Type}.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-13148

+ + +

+ Unsized fields of the type bytes in binary + generators are now forbidden. (The other ways of writing + unsized fields, such as binary, are already + forbidden.)

+

+ Own Id: OTP-13152

+ + +

The type map() is built-in, and cannot be + redefined.

+

+ Own Id: OTP-13153

+ + +

Let dets:open_file() exit with a badarg + message if given a raw file name (a binary).

+

+ Own Id: OTP-13229 Aux Id: ERL-55

+ + +

Add filename:basedir/2,3

basedir + returns suitable path(s) for 'user_cache', 'user_config', + 'user_data', 'user_log', 'site_config' and 'site_data'. + On linux and linux like systems the paths will respect + the XDG environment variables.

+

+ Own Id: OTP-13392

+ + +

There are new preprocessor directives + -error(Term) and -warning(Term) to cause a + compilation error or a compilation warning, + respectively.

+

+ Own Id: OTP-13476

+ + +

+ Optimize '++' operator and lists:append/2 + by using a single pass to build a new list while checking + for properness.

+

+ Own Id: OTP-13487

+ + +

+ Add maps:update_with/3,4 and maps:take/2

+

+ Own Id: OTP-13522 Aux Id: PR-1025

+ + +

lists:join/2 has been added. Similar to + string:join/2 but works with arbitrary lists.

+

+ Own Id: OTP-13523

+ + +

Obfuscate asserts to make Dialyzer shut up.

+

+ Own Id: OTP-13524 Aux Id: PR-1002

+ + +
+ +
+
STDLIB 2.8
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 663e847459686604ea051f036a0e4caff18cea6f Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 12 May 2016 12:04:14 +0200 Subject: Revert "Prepare release" This reverts commit bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a. --- lib/stdlib/doc/src/notes.xml | 261 ------------------------------------------- 1 file changed, 261 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 76d49e37c2..87f5335723 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,267 +31,6 @@

This document describes the changes made to the STDLIB application.

-
STDLIB 3.0 - -
Fixed Bugs and Malfunctions - - -

Fix a race bug affecting dets:open_file/2. -

-

- Own Id: OTP-13260 Aux Id: seq13002

- - -

Don't search for non-existing Map keys twice

-

For maps:get/2,3 and maps:find/2, - searching for an immediate key, e.g. an atom, in a small - map, the search was performed twice if the key did not - exist.

-

- Own Id: OTP-13459

- - -

- Avoid stray corner-case math errors on Solaris, e.g. an - error is thrown on undeflows in exp() and pow() when it - shouldn't be.

-

- Own Id: OTP-13531

- - -

Fix linting of map key variables

-

Map keys cannot be unbound and then used in parallel - matching.

-

Example: #{ K := V } = #{ k := K } = M. This - is illegal if 'K' is not bound.

-

- Own Id: OTP-13534 Aux Id: ERL-135

- - -
- - -
Improvements and New Features - - -

The types of The Abstract Format in the - erl_parse module have been refined.

-

- Own Id: OTP-10292

- - -

Undocumented syntax for function specifications, - -spec F/A :: Domain -> Range, has been removed - (without deprecation).

Using the - is_subtype(V, T) syntax for constraints (in - function specifications) is no longer documented, and the - newer syntax V :: T should be used instead. The - Erlang Parser still recognizes the is_subtype - syntax, and will continue to do so for some time.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-11879

- - -

The 'random' module has been deprecated. Use - the 'rand' module instead.

-

- Own Id: OTP-12502 Aux Id: OTP-12501

- - -

Background: In record fields with a type declaration - but without an initializer, the Erlang parser inserted - automatically the singleton type 'undefined' to - the list of declared types, if that value was not present - there. That is, the record declaration:

-

- -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 :: - some_mod:some_typ()}).

-

was translated by the parser to:

-

- -record(rec, {f1 :: float() | 'undefined', f2 = 42 :: - integer(), f3 :: some_mod:some_typ() | 'undefined'}).

-

The rationale for this was that creation of a "dummy" - #rec{} record should not result in a warning from - dialyzer that, for example, the implicit initialization - of the #rec.f1 field violates its type - declaration.

-

Problems: This seemingly innocent action has some - unforeseen consequences.

-

For starters, there is no way for programmers to - declare that e.g. only floats make sense for the - f1 field of #rec{} records when there is no - "obvious" default initializer for this field. (This also - affects tools like PropEr that use these declarations - produced by the Erlang parser to generate random - instances of records for testing purposes.)

-

It also means that dialyzer does not warn if e.g. an - is_atom/1 test or something more exotic like an - atom_to_list/1 call is performed on the value of - the f1 field.

-

Similarly, there is no way to extend dialyzer to warn - if it finds record constructions where f1 is not - initialized to some float.

-

Last but not least, it is semantically problematic - when the type of the field is an opaque type: creating a - union of an opaque and a structured type is very - problematic for analysis because it fundamentally breaks - the opacity of the term at that point.

-

Change: To solve these problems the parser will not - automatically insert the 'undefined' value - anymore; instead the user has the option to choose the - places where this value makes sense (for the field) and - where it does not and insert the | 'undefined' - there manually.

-

Consequences of this change: This change means that - dialyzer will issue a warning for all places where - records with uninitialized fields are created and those - fields have a declared type that is incompatible with - 'undefined' (e.g. float()). This warning - can be suppressed easily by adding | 'undefined' - to the type of this field. This also adds documentation - that the user really intends to create records where this - field is uninitialized.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-12719

- - -

Remove deprecated functions in the modules - erl_scan and erl_parse.

-

- Own Id: OTP-12861

- - -

The pre-processor can now expand the ?FUNCTION_NAME - and ?FUNCTION_ARITY macros.

-

- Own Id: OTP-13059

- - -

A new behaviour gen_statem has been - implemented. It has been thoroughly reviewed, is stable - enough to be used by at least two heavy OTP applications, - and is here to stay. But depending on user feedback, we - do not expect but might find it necessary to make minor - not backwards compatible changes into OTP-20.0, so its - state can be designated as "not quite experimental"... -

The gen_statem behaviour is intended to - replace gen_fsm for new code. It has the same - features and add some really useful:

State code is gathered - The state can be any term Events can - be postponed Events can be self - generated A reply can be sent from a later - state There can be multiple sys traceable - replies

The callback model(s) for - gen_statem differs from the one for - gen_fsm, but it is still fairly easy to rewrite - from gen_fsm to gen_statem.

-

- Own Id: OTP-13065 Aux Id: PR-960

- - -

- Optimize binary:split/2 and binary:split/3 with native - BIF implementation.

-

- Own Id: OTP-13082

- - -

Background: The types of record fields have since R12B - been put in a separate form by epp:parse_file(), - leaving the record declaration form untyped. The separate - form, however, does not follow the syntax of type - declarations, and parse transforms inspecting - -type() attributes need to know about the special - syntax. Since the compiler stores the return value of - epp:parse_file() as debug information in the - abstract code chunk ("Abst" or - abstract_code), tools too need to know about the - special syntax, if they inspect -type() attributes - in abstract code.

-

Change: No separate type form is created by - epp:parse_file(), but the type information is kept - in the record fields. This means that all parse - transforms and all tools inspecting -record() - declarations need to recognize {typed_record_field, - Field, Type}.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-13148

- - -

- Unsized fields of the type bytes in binary - generators are now forbidden. (The other ways of writing - unsized fields, such as binary, are already - forbidden.)

-

- Own Id: OTP-13152

- - -

The type map() is built-in, and cannot be - redefined.

-

- Own Id: OTP-13153

- - -

Let dets:open_file() exit with a badarg - message if given a raw file name (a binary).

-

- Own Id: OTP-13229 Aux Id: ERL-55

- - -

Add filename:basedir/2,3

basedir - returns suitable path(s) for 'user_cache', 'user_config', - 'user_data', 'user_log', 'site_config' and 'site_data'. - On linux and linux like systems the paths will respect - the XDG environment variables.

-

- Own Id: OTP-13392

- - -

There are new preprocessor directives - -error(Term) and -warning(Term) to cause a - compilation error or a compilation warning, - respectively.

-

- Own Id: OTP-13476

- - -

- Optimize '++' operator and lists:append/2 - by using a single pass to build a new list while checking - for properness.

-

- Own Id: OTP-13487

- - -

- Add maps:update_with/3,4 and maps:take/2

-

- Own Id: OTP-13522 Aux Id: PR-1025

- - -

lists:join/2 has been added. Similar to - string:join/2 but works with arbitrary lists.

-

- Own Id: OTP-13523

- - -

Obfuscate asserts to make Dialyzer shut up.

-

- Own Id: OTP-13524 Aux Id: PR-1002

- - -
- -
-
STDLIB 2.8
Fixed Bugs and Malfunctions -- cgit v1.2.3 From 6083b53606707524dbd7780175588530e37f186f Mon Sep 17 00:00:00 2001 From: Sverker Eriksson Date: Thu, 12 May 2016 18:25:08 +0200 Subject: stdlib: Add link to match spec user guide from ets docs. --- lib/stdlib/doc/src/ets.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 2d69c201bc..b32638f04d 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -123,8 +123,9 @@

Some of the functions uses a match specification, match_spec. A brief explanation is given in select/2. For a detailed - description, see the chapter "Match specifications in Erlang" in - ERTS User's Guide.

+ description, see chapter + Match Specifications in Erlang + in ERTS User's Guide.

-- cgit v1.2.3 From b6842ff94eed329463cc9398ba788a61c864d71a Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Tue, 17 May 2016 13:01:47 +0200 Subject: stdlib: Remove no longer needed anchors in documentation --- lib/stdlib/doc/src/digraph.xml | 2 -- lib/stdlib/doc/src/digraph_utils.xml | 7 ------- lib/stdlib/doc/src/erl_anno.xml | 4 ++-- lib/stdlib/doc/src/erl_parse.xml | 12 ++++-------- lib/stdlib/doc/src/ets.xml | 3 +-- lib/stdlib/doc/src/sofs.xml | 3 +-- 6 files changed, 8 insertions(+), 23 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 16dd789caf..1bb8eef247 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -104,14 +104,12 @@ edge() -

vertex() -

diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index 9bddee546f..e481711c50 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -120,13 +120,6 @@ considering all edges undirected.

- - - digraph() -

- A digraph as returned by digraph:new/0,1.

 - - diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml index ddc8b8c765..9f775943c1 100644 --- a/lib/stdlib/doc/src/erl_anno.xml +++ b/lib/stdlib/doc/src/erl_anno.xml @@ -5,7 +5,7 @@
2015 - 2015 + 2016 Ericsson AB, All Rights Reserved @@ -103,7 +103,7 @@ anno() -

A collection of annotations.

+

A collection of annotations.

 diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 13be488c33..32fce16d68 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -45,26 +45,22 @@ abstract_clause() -

- Abstract form of an Erlang clause.

+

Abstract form of an Erlang clause.

 abstract_expr() -

- Abstract form of an Erlang expression.

+

Abstract form of an Erlang expression.

 abstract_form() -

- Abstract form of an Erlang form.

+

Abstract form of an Erlang form.

 abstract_type() -

- Abstract form of an Erlang type.

+

Abstract form of an Erlang type.

 diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 2d69c201bc..0fdcf8282f 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -134,8 +134,7 @@ continuation() -

- Opaque continuation used by +

Opaque continuation used by select/1,3, select_reverse/1,3, diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index cf0855bc85..1e5be367bd 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -399,8 +399,7 @@ fun(S) -> sofs:partition(1, S) end tuple_of(T) -

- A tuple where the elements are of type T.

 +

A tuple where the elements are of type T.

 -- cgit v1.2.3 From c5a18407907b316117c285046c53fb0a1795602e Mon Sep 17 00:00:00 2001 From: Magnus Henoch Date: Fri, 20 May 2016 15:35:26 +0100 Subject: Fix spelling of "atomicity" in ets.xml --- lib/stdlib/doc/src/ets.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index ad7591e214..9fb7d227a3 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -98,10 +98,10 @@ All updates to single objects are guaranteed to be both atomic and isolated. This means that an updating operation towards a single object will either succeed or fail completely without any - effect at all (atomicy). + effect at all (atomicity). Nor can any intermediate results of the update be seen by other processes (isolation). Some functions that update several objects - state that they even guarantee atomicy and isolation for the entire + state that they even guarantee atomicity and isolation for the entire operation. In database terms the isolation level can be seen as "serializable", as if all isolated operations were carried out serially, one after the other in a strict order.

-- cgit v1.2.3 From e020f75c10410a6943cd055bfa072a2641eab7da Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 2 Jun 2016 10:55:26 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 293 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 293 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 87f5335723..8e989042db 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,299 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 3.0 + +
Fixed Bugs and Malfunctions + + +

Fix a race bug affecting dets:open_file/2. +

+

+ Own Id: OTP-13260 Aux Id: seq13002

+ + +

Don't search for non-existing Map keys twice

+

For maps:get/2,3 and maps:find/2, + searching for an immediate key, e.g. an atom, in a small + map, the search was performed twice if the key did not + exist.

+

+ Own Id: OTP-13459

+ + +

+ Avoid stray corner-case math errors on Solaris, e.g. an + error is thrown on undeflows in exp() and pow() when it + shouldn't be.

+

+ Own Id: OTP-13531

+ + +

Fix linting of map key variables

+

Map keys cannot be unbound and then used in parallel + matching.

+

Example: #{ K := V } = #{ k := K } = M. This + is illegal if 'K' is not bound.

+

+ Own Id: OTP-13534 Aux Id: ERL-135

+ + +

+ Fixed a bug in re on openbsd where sometimes re:run would + return an incorrect result.

+

+ Own Id: OTP-13602

+ + +

+ To avoid potential timer bottleneck on supervisor + restart, timer server is no longer used when the + supervisor is unable to restart a child.

+

+ Own Id: OTP-13618 Aux Id: PR-1001

+ + +
+ + +
Improvements and New Features + + +

The types of The Abstract Format in the + erl_parse module have been refined.

+

+ Own Id: OTP-10292

+ + +

Undocumented syntax for function specifications, + -spec F/A :: Domain -> Range, has been removed + (without deprecation).

Using the + is_subtype(V, T) syntax for constraints (in + function specifications) is no longer documented, and the + newer syntax V :: T should be used instead. The + Erlang Parser still recognizes the is_subtype + syntax, and will continue to do so for some time.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11879

+ + +

The 'random' module has been deprecated. Use + the 'rand' module instead.

+

+ Own Id: OTP-12502 Aux Id: OTP-12501

+ + +

Background: In record fields with a type declaration + but without an initializer, the Erlang parser inserted + automatically the singleton type 'undefined' to + the list of declared types, if that value was not present + there. That is, the record declaration:

+

+ -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 :: + some_mod:some_typ()}).

+

was translated by the parser to:

+

+ -record(rec, {f1 :: float() | 'undefined', f2 = 42 :: + integer(), f3 :: some_mod:some_typ() | 'undefined'}).

+

The rationale for this was that creation of a "dummy" + #rec{} record should not result in a warning from + dialyzer that, for example, the implicit initialization + of the #rec.f1 field violates its type + declaration.

+

Problems: This seemingly innocent action has some + unforeseen consequences.

+

For starters, there is no way for programmers to + declare that e.g. only floats make sense for the + f1 field of #rec{} records when there is no + "obvious" default initializer for this field. (This also + affects tools like PropEr that use these declarations + produced by the Erlang parser to generate random + instances of records for testing purposes.)

+

It also means that dialyzer does not warn if e.g. an + is_atom/1 test or something more exotic like an + atom_to_list/1 call is performed on the value of + the f1 field.

+

Similarly, there is no way to extend dialyzer to warn + if it finds record constructions where f1 is not + initialized to some float.

+

Last but not least, it is semantically problematic + when the type of the field is an opaque type: creating a + union of an opaque and a structured type is very + problematic for analysis because it fundamentally breaks + the opacity of the term at that point.

+

Change: To solve these problems the parser will not + automatically insert the 'undefined' value + anymore; instead the user has the option to choose the + places where this value makes sense (for the field) and + where it does not and insert the | 'undefined' + there manually.

+

Consequences of this change: This change means that + dialyzer will issue a warning for all places where + records with uninitialized fields are created and those + fields have a declared type that is incompatible with + 'undefined' (e.g. float()). This warning + can be suppressed easily by adding | 'undefined' + to the type of this field. This also adds documentation + that the user really intends to create records where this + field is uninitialized.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12719

+ + +

Remove deprecated functions in the modules + erl_scan and erl_parse.

+

+ Own Id: OTP-12861

+ + +

The pre-processor can now expand the ?FUNCTION_NAME + and ?FUNCTION_ARITY macros.

+

+ Own Id: OTP-13059

+ + +

A new behaviour gen_statem has been + implemented. It has been thoroughly reviewed, is stable + enough to be used by at least two heavy OTP applications, + and is here to stay. But depending on user feedback, we + do not expect but might find it necessary to make minor + not backwards compatible changes into OTP-20.0, so its + state can be designated as "not quite experimental"... +

The gen_statem behaviour is intended to + replace gen_fsm for new code. It has the same + features and add some really useful:

State code is gathered + The state can be any term Events can + be postponed Events can be self + generated A reply can be sent from a later + state There can be multiple sys traceable + replies

The callback model(s) for + gen_statem differs from the one for + gen_fsm, but it is still fairly easy to rewrite + from gen_fsm to gen_statem.

+

+ Own Id: OTP-13065 Aux Id: PR-960

+ + +

+ Optimize binary:split/2 and binary:split/3 with native + BIF implementation.

+

+ Own Id: OTP-13082

+ + +

Background: The types of record fields have since R12B + been put in a separate form by epp:parse_file(), + leaving the record declaration form untyped. The separate + form, however, does not follow the syntax of type + declarations, and parse transforms inspecting + -type() attributes need to know about the special + syntax. Since the compiler stores the return value of + epp:parse_file() as debug information in the + abstract code chunk ("Abst" or + abstract_code), tools too need to know about the + special syntax, if they inspect -type() attributes + in abstract code.

+

Change: No separate type form is created by + epp:parse_file(), but the type information is kept + in the record fields. This means that all parse + transforms and all tools inspecting -record() + declarations need to recognize {typed_record_field, + Field, Type}.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-13148

+ + +

+ Unsized fields of the type bytes in binary + generators are now forbidden. (The other ways of writing + unsized fields, such as binary, are already + forbidden.)

+

+ Own Id: OTP-13152

+ + +

The type map() is built-in, and cannot be + redefined.

+

+ Own Id: OTP-13153

+ + +

Let dets:open_file() exit with a badarg + message if given a raw file name (a binary).

+

+ Own Id: OTP-13229 Aux Id: ERL-55

+ + +

Add filename:basedir/2,3

basedir + returns suitable path(s) for 'user_cache', 'user_config', + 'user_data', 'user_log', 'site_config' and 'site_data'. + On linux and linux like systems the paths will respect + the XDG environment variables.

+

+ Own Id: OTP-13392

+ + +

There are new preprocessor directives + -error(Term) and -warning(Term) to cause a + compilation error or a compilation warning, + respectively.

+

+ Own Id: OTP-13476

+ + +

+ Optimize '++' operator and lists:append/2 + by using a single pass to build a new list while checking + for properness.

+

+ Own Id: OTP-13487

+ + +

+ Add maps:update_with/3,4 and maps:take/2

+

+ Own Id: OTP-13522 Aux Id: PR-1025

+ + +

lists:join/2 has been added. Similar to + string:join/2 but works with arbitrary lists.

+

+ Own Id: OTP-13523

+ + +

Obfuscate asserts to make Dialyzer shut up.

+

+ Own Id: OTP-13524 Aux Id: PR-1002

+ + +

+ Relax translation of initial calls in proc_lib, + i.e. remove the restriction to only do the translation + for gen_server and gen_fsm. This enables + user defined gen based generic callback modules to + be displayed nicely in c:i() and observer.

+

+ Own Id: OTP-13623

+ + +

+ Lower ETS hash load factor to improve lookup performance + at the cost of less than one word per object.

+

+ Own Id: OTP-13642

+ + +
+ +
+
STDLIB 2.8
Fixed Bugs and Malfunctions -- cgit v1.2.3 From c04cad3ba921deb086d19e2de2526af4854add75 Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Thu, 2 Jun 2016 11:39:07 +0200 Subject: Revert "Prepare release" This reverts commit e020f75c10410a6943cd055bfa072a2641eab7da. --- lib/stdlib/doc/src/notes.xml | 293 ------------------------------------------- 1 file changed, 293 deletions(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 8e989042db..87f5335723 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,299 +31,6 @@

This document describes the changes made to the STDLIB application.

-
STDLIB 3.0 - -
Fixed Bugs and Malfunctions - - -

Fix a race bug affecting dets:open_file/2. -

-

- Own Id: OTP-13260 Aux Id: seq13002

- - -

Don't search for non-existing Map keys twice

-

For maps:get/2,3 and maps:find/2, - searching for an immediate key, e.g. an atom, in a small - map, the search was performed twice if the key did not - exist.

-

- Own Id: OTP-13459

- - -

- Avoid stray corner-case math errors on Solaris, e.g. an - error is thrown on undeflows in exp() and pow() when it - shouldn't be.

-

- Own Id: OTP-13531

- - -

Fix linting of map key variables

-

Map keys cannot be unbound and then used in parallel - matching.

-

Example: #{ K := V } = #{ k := K } = M. This - is illegal if 'K' is not bound.

-

- Own Id: OTP-13534 Aux Id: ERL-135

- - -

- Fixed a bug in re on openbsd where sometimes re:run would - return an incorrect result.

-

- Own Id: OTP-13602

- - -

- To avoid potential timer bottleneck on supervisor - restart, timer server is no longer used when the - supervisor is unable to restart a child.

-

- Own Id: OTP-13618 Aux Id: PR-1001

- - -
- - -
Improvements and New Features - - -

The types of The Abstract Format in the - erl_parse module have been refined.

-

- Own Id: OTP-10292

- - -

Undocumented syntax for function specifications, - -spec F/A :: Domain -> Range, has been removed - (without deprecation).

Using the - is_subtype(V, T) syntax for constraints (in - function specifications) is no longer documented, and the - newer syntax V :: T should be used instead. The - Erlang Parser still recognizes the is_subtype - syntax, and will continue to do so for some time.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-11879

- - -

The 'random' module has been deprecated. Use - the 'rand' module instead.

-

- Own Id: OTP-12502 Aux Id: OTP-12501

- - -

Background: In record fields with a type declaration - but without an initializer, the Erlang parser inserted - automatically the singleton type 'undefined' to - the list of declared types, if that value was not present - there. That is, the record declaration:

-

- -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 :: - some_mod:some_typ()}).

-

was translated by the parser to:

-

- -record(rec, {f1 :: float() | 'undefined', f2 = 42 :: - integer(), f3 :: some_mod:some_typ() | 'undefined'}).

-

The rationale for this was that creation of a "dummy" - #rec{} record should not result in a warning from - dialyzer that, for example, the implicit initialization - of the #rec.f1 field violates its type - declaration.

-

Problems: This seemingly innocent action has some - unforeseen consequences.

-

For starters, there is no way for programmers to - declare that e.g. only floats make sense for the - f1 field of #rec{} records when there is no - "obvious" default initializer for this field. (This also - affects tools like PropEr that use these declarations - produced by the Erlang parser to generate random - instances of records for testing purposes.)

-

It also means that dialyzer does not warn if e.g. an - is_atom/1 test or something more exotic like an - atom_to_list/1 call is performed on the value of - the f1 field.

-

Similarly, there is no way to extend dialyzer to warn - if it finds record constructions where f1 is not - initialized to some float.

-

Last but not least, it is semantically problematic - when the type of the field is an opaque type: creating a - union of an opaque and a structured type is very - problematic for analysis because it fundamentally breaks - the opacity of the term at that point.

-

Change: To solve these problems the parser will not - automatically insert the 'undefined' value - anymore; instead the user has the option to choose the - places where this value makes sense (for the field) and - where it does not and insert the | 'undefined' - there manually.

-

Consequences of this change: This change means that - dialyzer will issue a warning for all places where - records with uninitialized fields are created and those - fields have a declared type that is incompatible with - 'undefined' (e.g. float()). This warning - can be suppressed easily by adding | 'undefined' - to the type of this field. This also adds documentation - that the user really intends to create records where this - field is uninitialized.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-12719

- - -

Remove deprecated functions in the modules - erl_scan and erl_parse.

-

- Own Id: OTP-12861

- - -

The pre-processor can now expand the ?FUNCTION_NAME - and ?FUNCTION_ARITY macros.

-

- Own Id: OTP-13059

- - -

A new behaviour gen_statem has been - implemented. It has been thoroughly reviewed, is stable - enough to be used by at least two heavy OTP applications, - and is here to stay. But depending on user feedback, we - do not expect but might find it necessary to make minor - not backwards compatible changes into OTP-20.0, so its - state can be designated as "not quite experimental"... -

The gen_statem behaviour is intended to - replace gen_fsm for new code. It has the same - features and add some really useful:

State code is gathered - The state can be any term Events can - be postponed Events can be self - generated A reply can be sent from a later - state There can be multiple sys traceable - replies

The callback model(s) for - gen_statem differs from the one for - gen_fsm, but it is still fairly easy to rewrite - from gen_fsm to gen_statem.

-

- Own Id: OTP-13065 Aux Id: PR-960

- - -

- Optimize binary:split/2 and binary:split/3 with native - BIF implementation.

-

- Own Id: OTP-13082

- - -

Background: The types of record fields have since R12B - been put in a separate form by epp:parse_file(), - leaving the record declaration form untyped. The separate - form, however, does not follow the syntax of type - declarations, and parse transforms inspecting - -type() attributes need to know about the special - syntax. Since the compiler stores the return value of - epp:parse_file() as debug information in the - abstract code chunk ("Abst" or - abstract_code), tools too need to know about the - special syntax, if they inspect -type() attributes - in abstract code.

-

Change: No separate type form is created by - epp:parse_file(), but the type information is kept - in the record fields. This means that all parse - transforms and all tools inspecting -record() - declarations need to recognize {typed_record_field, - Field, Type}.

-

- *** POTENTIAL INCOMPATIBILITY ***

-

- Own Id: OTP-13148

- - -

- Unsized fields of the type bytes in binary - generators are now forbidden. (The other ways of writing - unsized fields, such as binary, are already - forbidden.)

-

- Own Id: OTP-13152

- - -

The type map() is built-in, and cannot be - redefined.

-

- Own Id: OTP-13153

- - -

Let dets:open_file() exit with a badarg - message if given a raw file name (a binary).

-

- Own Id: OTP-13229 Aux Id: ERL-55

- - -

Add filename:basedir/2,3

basedir - returns suitable path(s) for 'user_cache', 'user_config', - 'user_data', 'user_log', 'site_config' and 'site_data'. - On linux and linux like systems the paths will respect - the XDG environment variables.

-

- Own Id: OTP-13392

- - -

There are new preprocessor directives - -error(Term) and -warning(Term) to cause a - compilation error or a compilation warning, - respectively.

-

- Own Id: OTP-13476

- - -

- Optimize '++' operator and lists:append/2 - by using a single pass to build a new list while checking - for properness.

-

- Own Id: OTP-13487

- - -

- Add maps:update_with/3,4 and maps:take/2

-

- Own Id: OTP-13522 Aux Id: PR-1025

- - -

lists:join/2 has been added. Similar to - string:join/2 but works with arbitrary lists.

-

- Own Id: OTP-13523

- - -

Obfuscate asserts to make Dialyzer shut up.

-

- Own Id: OTP-13524 Aux Id: PR-1002

- - -

- Relax translation of initial calls in proc_lib, - i.e. remove the restriction to only do the translation - for gen_server and gen_fsm. This enables - user defined gen based generic callback modules to - be displayed nicely in c:i() and observer.

-

- Own Id: OTP-13623

- - -

- Lower ETS hash load factor to improve lookup performance - at the cost of less than one word per object.

-

- Own Id: OTP-13642

- - -
- -
-
STDLIB 2.8
Fixed Bugs and Malfunctions -- cgit v1.2.3 From fb49e45402c0370c030ce3c128b08bccf960bf44 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Thu, 19 May 2016 08:59:45 +0200 Subject: stdlib: Correct types and specs --- lib/stdlib/doc/src/erl_id_trans.xml | 3 ++- lib/stdlib/doc/src/erl_parse.xml | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml index 153bd4148e..649490f8b3 100644 --- a/lib/stdlib/doc/src/erl_id_trans.xml +++ b/lib/stdlib/doc/src/erl_id_trans.xml @@ -49,7 +49,8 @@ parse_transform(Forms, Options) -> Forms Transform Erlang forms - Forms = [erl_parse:abstract_form()] + Forms = [erl_parse:abstract_form() + | erl_parse:form_info()] Options = [compile:option()] diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 32fce16d68..771ccc2dc6 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -72,6 +72,14 @@ + + +

Tuples {error, error_info()} and {warning, + error_info()}, denoting syntactically incorrect forms and + warnings, and {eof, line()}, denoting an end-of-stream + encountered before a complete form had been parsed.

+ + -- cgit v1.2.3 From 68d53c01b0b8e9a007a6a30158c19e34b2d2a34e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= Date: Wed, 18 May 2016 15:53:35 +0200 Subject: Update STDLIB documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Language cleaned up by the technical writers xsipewe and tmanevik from Combitech. Proofreading and corrections by Björn Gustavsson and Hans Bolinder. --- lib/stdlib/doc/src/array.xml | 1003 ++-- lib/stdlib/doc/src/assert_hrl.xml | 169 +- lib/stdlib/doc/src/base64.xml | 49 +- lib/stdlib/doc/src/beam_lib.xml | 528 ++- lib/stdlib/doc/src/binary.xml | 564 +-- lib/stdlib/doc/src/book.xml | 3 +- lib/stdlib/doc/src/c.xml | 168 +- lib/stdlib/doc/src/calendar.xml | 248 +- lib/stdlib/doc/src/dets.xml | 1067 +++-- lib/stdlib/doc/src/dict.xml | 208 +- lib/stdlib/doc/src/digraph.xml | 536 ++- lib/stdlib/doc/src/digraph_utils.xml | 452 +- lib/stdlib/doc/src/epp.xml | 231 +- lib/stdlib/doc/src/erl_anno.xml | 185 +- lib/stdlib/doc/src/erl_eval.xml | 245 +- lib/stdlib/doc/src/erl_expand_records.xml | 20 +- lib/stdlib/doc/src/erl_id_trans.xml | 31 +- lib/stdlib/doc/src/erl_internal.xml | 93 +- lib/stdlib/doc/src/erl_lint.xml | 147 +- lib/stdlib/doc/src/erl_parse.xml | 373 +- lib/stdlib/doc/src/erl_pp.xml | 129 +- lib/stdlib/doc/src/erl_scan.xml | 337 +- lib/stdlib/doc/src/erl_tar.xml | 608 +-- lib/stdlib/doc/src/ets.xml | 2279 +++++---- lib/stdlib/doc/src/file_sorter.xml | 350 +- lib/stdlib/doc/src/filelib.xml | 184 +- lib/stdlib/doc/src/filename.xml | 278 +- lib/stdlib/doc/src/gb_sets.xml | 325 +- lib/stdlib/doc/src/gb_trees.xml | 245 +- lib/stdlib/doc/src/gen_event.xml | 887 ++-- lib/stdlib/doc/src/gen_fsm.xml | 1262 ++--- lib/stdlib/doc/src/gen_server.xml | 1063 +++-- lib/stdlib/doc/src/gen_statem.xml | 4 +- lib/stdlib/doc/src/introduction.xml | 72 + lib/stdlib/doc/src/io.xml | 1138 +++-- lib/stdlib/doc/src/io_lib.xml | 400 +- lib/stdlib/doc/src/io_protocol.xml | 1172 ++--- lib/stdlib/doc/src/lib.xml | 57 +- lib/stdlib/doc/src/lists.xml | 734 +-- lib/stdlib/doc/src/log_mf_h.xml | 46 +- lib/stdlib/doc/src/maps.xml | 667 ++- lib/stdlib/doc/src/math.xml | 76 +- lib/stdlib/doc/src/ms_transform.xml | 958 ++-- lib/stdlib/doc/src/orddict.xml | 220 +- lib/stdlib/doc/src/ordsets.xml | 161 +- lib/stdlib/doc/src/part.xml | 7 +- lib/stdlib/doc/src/pool.xml | 110 +- lib/stdlib/doc/src/proc_lib.xml | 415 +- lib/stdlib/doc/src/proplists.xml | 280 +- lib/stdlib/doc/src/qlc.xml | 1428 +++--- lib/stdlib/doc/src/queue.xml | 354 +- lib/stdlib/doc/src/rand.xml | 290 +- lib/stdlib/doc/src/random.xml | 134 +- lib/stdlib/doc/src/re.xml | 7343 +++++++++++++++-------------- lib/stdlib/doc/src/ref_man.xml | 3 - lib/stdlib/doc/src/sets.xml | 161 +- lib/stdlib/doc/src/shell.xml | 969 ++-- lib/stdlib/doc/src/shell_default.xml | 38 +- lib/stdlib/doc/src/slave.xml | 202 +- lib/stdlib/doc/src/sofs.xml | 1345 +++--- lib/stdlib/doc/src/stdlib_app.xml | 47 +- lib/stdlib/doc/src/string.xml | 416 +- lib/stdlib/doc/src/supervisor.xml | 780 +-- lib/stdlib/doc/src/supervisor_bridge.xml | 164 +- lib/stdlib/doc/src/sys.xml | 831 ++-- lib/stdlib/doc/src/timer.xml | 380 +- lib/stdlib/doc/src/unicode.xml | 428 +- lib/stdlib/doc/src/unicode_usage.xml | 2420 +++++----- lib/stdlib/doc/src/win32reg.xml | 193 +- lib/stdlib/doc/src/zip.xml | 683 +-- 70 files changed, 21472 insertions(+), 17921 deletions(-) create mode 100644 lib/stdlib/doc/src/introduction.xml (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/array.xml b/lib/stdlib/doc/src/array.xml index bff98245bf..db0ab42372 100644 --- a/lib/stdlib/doc/src/array.xml +++ b/lib/stdlib/doc/src/array.xml @@ -1,7 +1,8 @@ + -
+
20072016 Ericsson AB. All Rights Reserved. @@ -21,469 +22,541 @@ -array - - -1 - - - -A -array.xml
-array -Functional, extendible arrays. - -

Functional, extendible arrays. Arrays can have fixed size, or -can grow automatically as needed. A default value is used for entries -that have not been explicitly set.

- -

Arrays uses zero based indexing. This is a deliberate design -choice and differs from other erlang datastructures, e.g. tuples.

- -

Unless specified by the user when the array is created, the default - value is the atom undefined. There is no difference between an - unset entry and an entry which has been explicitly set to the same - value as the default one (cf. reset/2). If you need to -differentiate between unset and set entries, you must make sure that -the default value cannot be confused with the values of set entries.

- -

The array never shrinks automatically; if an index I has been used - successfully to set an entry, all indices in the range [0,I] will - stay accessible unless the array size is explicitly changed by - calling resize/2.

- -

Examples: - 

  %% Create a fixed-size array with entries 0-9 set to 'undefined'
-  A0 = array:new(10).
-  10 = array:size(A0).
- 
-  %% Create an extendible array and set entry 17 to 'true',
-  %% causing the array to grow automatically
-  A1 = array:set(17, true, array:new()).
-  18 = array:size(A1).
- 
-  %% Read back a stored value
-  true = array:get(17, A1).
- 
-  %% Accessing an unset entry returns the default value
-  undefined = array:get(3, A1).
- 
-  %% Accessing an entry beyond the last set entry also returns the
-  %% default value, if the array does not have fixed size
-  undefined = array:get(18, A1).
- 
-  %% "sparse" functions ignore default-valued entries
-  A2 = array:set(4, false, A1).
-  [{4, false}, {17, true}] = array:sparse_to_orddict(A2).
- 
-  %% An extendible array can be made fixed-size later
-  A3 = array:fix(A2).
- 
-  %% A fixed-size array does not grow automatically and does not
-  %% allow accesses beyond the last set entry
-  {'EXIT',{badarg,_}} = (catch array:set(18, true, A3)).
-  {'EXIT',{badarg,_}} = (catch array:get(18, A3)).
 - - - - -

A functional, extendible array. The representation is - not documented and is subject to change without notice. Note that - arrays cannot be directly compared for equality.

- - - - - - - - - - - - - - - - - - - - - - - - - -Get the value used for uninitialized entries. - - - -

Get the value used for uninitialized entries. -

-

See also: new/2.

- - - -Fix the size of the array. - - - -

Fix the size of the array. This prevents it from growing - automatically upon insertion; see also set/3.

-

See also: relax/1.

- - - -Fold the elements of the array using the given function and - initial accumulator value. - -

Fold the elements of the array using the given function and - initial accumulator value. The elements are visited in order from the - lowest index to the highest. If Function is not a function, the - call fails with reason badarg. -

-

See also: foldr/3, map/2, sparse_foldl/3.

- - - -Fold the elements of the array right-to-left using the given - function and initial accumulator value. - - -

Fold the elements of the array right-to-left using the given - function and initial accumulator value. The elements are visited in - order from the highest index to the lowest. If Function is not a - function, the call fails with reason badarg. -

-

See also: foldl/3, map/2.

- - - -Equivalent to from_list(List, undefined). - - - -

Equivalent to from_list(List, undefined).

- - - -Convert a list to an extendible array. - - - -

Convert a list to an extendible array. Default is used as the value - for uninitialized entries of the array. If List is not a proper list, - the call fails with reason badarg. -

-

See also: new/2, to_list/1.

- - - -Equivalent to from_orddict(Orddict, undefined). - - - -

Equivalent to from_orddict(Orddict, undefined).

- - - -Convert an ordered list of pairs {Index, Value} to a - corresponding extendible array. - - - -

Convert an ordered list of pairs {Index, Value} to a - corresponding extendible array. Default is used as the value for - uninitialized entries of the array. If Orddict is not a proper, - ordered list of pairs whose first elements are nonnegative - integers, the call fails with reason badarg. -

-

See also: new/2, to_orddict/1.

- - - -Get the value of entry I. - - - -

Get the value of entry I. If I is not a nonnegative - integer, or if the array has fixed size and I is larger than the - maximum index, the call fails with reason badarg.

- -

If the array does not have fixed size, this function will return the - default value for any index I greater than size(Array)-1.

-

See also: set/3.

- - - -Returns true if X appears to be an array, otherwise false. - - - -

Returns true if X appears to be an array, otherwise false. - Note that the check is only shallow; there is no guarantee that X - is a well-formed array representation even if this function returns - true.

- - - -Check if the array has fixed size. - - - -

Check if the array has fixed size. - Returns true if the array is fixed, otherwise false.

-

See also: fix/1.

- - - -Map the given function onto each element of the array. - - -

Map the given function onto each element of the array. The - elements are visited in order from the lowest index to the highest. - If Function is not a function, the call fails with reason badarg. -

-

See also: foldl/3, foldr/3, sparse_map/2.

- - - -Create a new, extendible array with initial size zero. - - - -

Create a new, extendible array with initial size zero.

-

See also: new/1, new/2.

- - - -Create a new array according to the given options. - - - -

Create a new array according to the given options. By default, -the array is extendible and has initial size zero. Array indices -start at 0.

- -

Options is a single term or a list of terms, selected from the - following: -

- N::integer() >= 0 or {size, N::integer() >= 0} -

Specifies the initial size of the array; this also implies - {fixed, true}. If N is not a nonnegative integer, the call - fails with reason badarg.

 - fixed or {fixed, true} -

Creates a fixed-size array; see also fix/1.

 - {fixed, false} -

Creates an extendible (non fixed-size) array.

 - {default, Value} -

Sets the default value for the array to Value.

 -

-Options are processed in the order they occur in the list, i.e., -later options have higher precedence.

- -

The default value is used as the value of uninitialized entries, and -cannot be changed once the array has been created.

- -

Examples: - 

     array:new(100)

creates a fixed-size array of size 100. - 

     array:new({default,0})

creates an empty, extendible array - whose default value is 0. - 

     array:new([{size,10},{fixed,false},{default,-1}])

creates an - extendible array with initial size 10 whose default value is -1. -

-

See also: fix/1, from_list/2, get/2, new/0, new/2, set/3.

- - - -Create a new array according to the given size and options. - - - -

Create a new array according to the given size and options. If - Size is not a nonnegative integer, the call fails with reason - badarg. By default, the array has fixed size. Note that any size - specifications in Options will override the Size parameter.

- -

If Options is a list, this is simply equivalent to new([{size, - Size} | Options], otherwise it is equivalent to new([{size, Size} | - [Options]]. However, using this function directly is more efficient.

- -

Example: - 

     array:new(100, {default,0})

creates a fixed-size array of size - 100, whose default value is 0. -

-

See also: new/1.

- - - -Make the array resizable. - - - -

Make the array resizable. (Reverses the effects of fix/1.)

-

See also: fix/1.

- - - -Reset entry I to the default value for the array. - - - -

Reset entry I to the default value for the array. - If the value of entry I is the default value the array will be - returned unchanged. Reset will never change size of the array. - Shrinking can be done explicitly by calling resize/2.

- -

If I is not a nonnegative integer, or if the array has fixed size - and I is larger than the maximum index, the call fails with reason - badarg; cf. set/3 -

-

See also: new/2, set/3.

- - - -Change the size of the array to that reported by sparse_size/1. - - - -

Change the size of the array to that reported by sparse_size/1. If the given array has fixed size, the resulting - array will also have fixed size.

-

See also: resize/2, sparse_size/1.

- - - -Change the size of the array. - - - -

Change the size of the array. If Size is not a nonnegative - integer, the call fails with reason badarg. If the given array has - fixed size, the resulting array will also have fixed size.

- - - -Set entry I of the array to Value. - - - -

Set entry I of the array to Value. If I is not a - nonnegative integer, or if the array has fixed size and I is larger - than the maximum index, the call fails with reason badarg.

- -

If the array does not have fixed size, and I is greater than - size(Array)-1, the array will grow to size I+1. -

-

See also: get/2, reset/2.

- - - -Get the number of entries in the array. - - - -

Get the number of entries in the array. Entries are numbered - from 0 to size(Array)-1; hence, this is also the index of the first - entry that is guaranteed to not have been previously set.

-

See also: set/3, sparse_size/1.

- - - -Fold the elements of the array using the given function and - initial accumulator value, skipping default-valued entries. - - -

Fold the elements of the array using the given function and - initial accumulator value, skipping default-valued entries. The - elements are visited in order from the lowest index to the highest. - If Function is not a function, the call fails with reason badarg. -

-

See also: foldl/3, sparse_foldr/3.

- - - -Fold the elements of the array right-to-left using the given - function and initial accumulator value, skipping default-valued - entries. - - -

Fold the elements of the array right-to-left using the given - function and initial accumulator value, skipping default-valued - entries. The elements are visited in order from the highest index to - the lowest. If Function is not a function, the call fails with - reason badarg. -

-

See also: foldr/3, sparse_foldl/3.

- - - -Map the given function onto each element of the array, skipping - default-valued entries. - - -

Map the given function onto each element of the array, skipping - default-valued entries. The elements are visited in order from the - lowest index to the highest. If Function is not a function, the - call fails with reason badarg. -

-

See also: map/2.

- - - -Get the number of entries in the array up until the last - non-default valued entry. - - - -

Get the number of entries in the array up until the last - non-default valued entry. In other words, returns I+1 if I is the - last non-default valued entry in the array, or zero if no such entry - exists.

-

See also: resize/1, size/1.

- - - -Converts the array to a list, skipping default-valued entries. - - - -

Converts the array to a list, skipping default-valued entries. -

-

See also: to_list/1.

- - - -Convert the array to an ordered list of pairs {Index, Value}, - skipping default-valued entries. - - - -

Convert the array to an ordered list of pairs {Index, Value}, - skipping default-valued entries. -

-

See also: to_orddict/1.

- - - -Converts the array to a list. - - - -

Converts the array to a list. -

-

See also: from_list/2, sparse_to_list/1.

- - - -Convert the array to an ordered list of pairs {Index, Value}. - - - -

Convert the array to an ordered list of pairs {Index, Value}. -

-

See also: from_orddict/2, sparse_to_orddict/1.

- - + array + + + 1 + + + + A + array.xml +
+ array + Functional, extendible arrays. + +

Functional, extendible arrays. Arrays can have fixed size, or can grow + automatically as needed. A default value is used for entries that have not + been explicitly set.

+ +

Arrays uses zero-based indexing. This is a deliberate design + choice and differs from other Erlang data structures, for example, + tuples.

+ +

Unless specified by the user when the array is created, the default + value is the atom undefined. There is no difference between an + unset entry and an entry that has been explicitly set to the same value + as the default one (compare + reset/2). If you need to + differentiate between unset and set entries, ensure that the default value + cannot be confused with the values of set entries.

+ +

The array never shrinks automatically. If an index I has been used + to set an entry successfully, all indices in the range [0,I] stay + accessible unless the array size is explicitly changed by calling + resize/2.

+ +

Examples:

+ +

Create a fixed-size array with entries 0-9 set to undefined:

+ + 
+A0 = array:new(10).
+10 = array:size(A0).
+ +

Create an extendible array and set entry 17 to true, causing the + array to grow automatically:

+ + 
+A1 = array:set(17, true, array:new()).
+18 = array:size(A1).
+ +

Read back a stored value:

+ + 
+true = array:get(17, A1).
+ +

Accessing an unset entry returns default value:

+ + 
+undefined = array:get(3, A1)
+ +

Accessing an entry beyond the last set entry also returns the default + value, if the array does not have fixed size:

+ + 
+undefined = array:get(18, A1).
+ +

"Sparse" functions ignore default-valued entries:

+ + 
+A2 = array:set(4, false, A1).
+[{4, false}, {17, true}] = array:sparse_to_orddict(A2).
+ +

An extendible array can be made fixed-size later:

+ + 
+A3 = array:fix(A2).
+ +

A fixed-size array does not grow automatically and does not allow + accesses beyond the last set entry:

+ + 
+{'EXIT',{badarg,_}} = (catch array:set(18, true, A3)).
+{'EXIT',{badarg,_}} = (catch array:get(18, A3)).
+ + + + + + +

A functional, extendible array. The representation is not documented + and is subject to change without notice. Notice that arrays cannot be + directly compared for equality.

+ + + + + + + + + + + + + + + + + + + + + + + + + + Get the value used for uninitialized entries. + +

Gets the value used for uninitialized entries.

+

See also new/2.

+ + + + + + Fix the array size. + +

Fixes the array size. This prevents it from growing automatically + upon insertion.

+

See also set/3 and + relax/1.

+ + + + + + Fold the array elements using the specified function and initial + accumulator value. + +

Folds the array elements using the specified function and initial + accumulator value. The elements are visited in order from the lowest + index to the highest. If Function is not a + function, the call fails with reason badarg.

+

See also foldr/3, + map/2, + sparse_foldl/3.

+ + + + + + Fold the array elements right-to-left using the specified + function and initial accumulator value. + +

Folds the array elements right-to-left using the specified function + and initial accumulator value. The elements are visited in order from + the highest index to the lowest. If Function is + not a function, the call fails with reason badarg.

+

See also foldl/3, + map/2.

+ + + + + + Equivalent to from_list(List, undefined). + +

Equivalent to + from_list(List, undefined).

+ + + + + + Convert a list to an extendible array. + +

Converts a list to an extendible array. Default + is used as the value for uninitialized entries of the array. If + List is not a proper list, the call fails with + reason badarg.

+

See also new/2, + to_list/1.

+ + + + + + Equivalent to from_orddict(Orddict, undefined). + + +

Equivalent to + from_orddict(Orddict, undefined).

+ + + + + + Convert an ordered list of pairs {Index, Value} to a + corresponding extendible array. + +

Converts an ordered list of pairs {Index, Value} + to a corresponding extendible array. Default is + used as the value for uninitialized entries of the array. If + Orddict is not a proper, ordered list of pairs + whose first elements are non-negative integers, the call fails with + reason badarg.

+

See also new/2, + to_orddict/1.

+ + + + + + Get the value of entry I. + +

Gets the value of entry I. If + I is not a non-negative integer, or if the array + has fixed size and I is larger than the maximum + index, the call fails with reason badarg.

+

If the array does not have fixed size, the default value for any + index I greater than + size(Array)-1 is returned.

+

See also set/3.

+ + + + + + Returns true if X is an array, otherwise + false. + +

Returns true if X is an array, otherwise + false. Notice that the check is only shallow, as there is no + guarantee that X is a well-formed array + representation even if this function returns true.

+ + + + + + Check if the array has fixed size. + +

Checks if the array has fixed size. Returns true if the array + is fixed, otherwise false.

+

See also fix/1.

+ + + + + + Map the specified function onto each array element. + +

Maps the specified function onto each array element. The elements are + visited in order from the lowest index to the highest. If + Function is not a function, the call fails with + reason badarg.

+

See also foldl/3, + foldr/3, + sparse_map/2.

+ + + + + + Create a new, extendible array with initial size zero. + + +

Creates a new, extendible array with initial size zero.

+

See also new/1, + new/2.

+ + + + + + Create a new array according to the specified options. + + +

Creates a new array according to the specified otions. By default, + the array is extendible and has initial size zero. Array indices + start at 0.

+

Options is a single term or a list of terms, + selected from the following:

+ + N::integer() >= 0 or {size, N::integer() >= 0} + +

Specifies the initial array size; this also implies + {fixed, true}. If N is not a non-negative integer, the + call fails with reason badarg.

 + fixed or {fixed, true} +

Creates a fixed-size array. See also + fix/1.

 + {fixed, false} +

Creates an extendible (non-fixed-size) array.

 + {default, Value} +

Sets the default value for the array to Value.

+ + +

Options are processed in the order they occur in the list, that is, + later options have higher precedence.

+

The default value is used as the value of uninitialized entries, and + cannot be changed once the array has been created.

+

Examples:

+ 
+array:new(100)
+

creates a fixed-size array of size 100.

+ 
+array:new({default,0})
+

creates an empty, extendible array whose default value is 0. +

+ 
+array:new([{size,10},{fixed,false},{default,-1}])
+

creates an extendible array with initial size 10 whose default value + is -1.

+

See also fix/1, + from_list/2, + get/2, + new/0, + new/2, + set/3.

+ + + + + + Create a new array according to the specified size and options. + + +

Creates a new array according to the specified size and options. If + Size is not a non-negative integer, the call fails + with reason badarg. By default, the array has fixed size. + Notice that any size specifications in Options + override parameter Size.

+

If Options is a list, this is equivalent to + new([{size, Size} | Options], + otherwise it is equivalent to new([{size, Size} | + [Options]]. However, using this function directly is + more efficient.

+

Example:

+ 
+array:new(100, {default,0})
+

creates a fixed-size array of size 100, whose default value is + 0.

+

See also new/1.

+ + + + + + Make the array resizable. + +

Makes the array resizable. (Reverses the effects of + fix/1.)

+

See also fix/1.

+ + + + + + Reset entry I to the default value for the array. + + +

Resets entry I to the default value for the + array. If the value of entry I is the default + value, the array is returned unchanged. Reset never changes the array + size. Shrinking can be done explicitly by calling + resize/2.

+

If I is not a non-negative integer, or if the + array has fixed size and I is larger than the + maximum index, the call fails with reason badarg; compare + set/3

+

See also new/2, + set/3.

+ + + + + + Change the array size to that reported by sparse_size/1. + + +

Changes the array size to that reported by + sparse_size/1. If + the specified array has fixed size, also the resulting array has fixed + size.

+

See also resize/2, + sparse_size/1.

+ + + + + + Change the array size. + +

Change the array size. If Size is not a + non-negative integer, the call fails with reason badarg. If + the specified array has fixed size, also the resulting array has fixed + size.

+ + + + + + Set entry I of the array to Value. + +

Sets entry I of the array to + Value. If I is not a + non-negative integer, or if the array has fixed size and + I is larger than the maximum index, the call + fails with reason badarg.

+

If the array does not have fixed size, and I is + greater than size(Array)-1, the array grows to + size I+1.

+

See also get/2, + reset/2.

+ + + + + + Get the number of entries in the array. + +

Gets the number of entries in the array. Entries are numbered from + 0 to size(Array)-1. Hence, this is also the + index of the first entry that is guaranteed to not have been + previously set.

+

See also set/3, + sparse_size/1.

+ + + + + + Fold the array elements using the specified function and initial + accumulator value, skipping default-valued entries. + +

Folds the array elements using the specified function and initial + accumulator value, skipping default-valued entries. The elements are + visited in order from the lowest index to the highest. If + Function is not a function, the call fails with + reason badarg.

+

See also foldl/3, + sparse_foldr/3.

+ + + + + + Fold the array elements right-to-left using the specified + function and initial accumulator value, skipping default-valued + entries. + +

Folds the array elements right-to-left using the specified + function and initial accumulator value, skipping default-valued + entries. The elements are visited in order from the highest index to + the lowest. If Function is not a function, the + call fails with reason badarg.

+

See also foldr/3, + sparse_foldl/3.

+ + + + + + Map the specified function onto each array element, skipping + default-valued entries. + +

Maps the specified function onto each array element, skipping + default-valued entries. The elements are visited in order from the + lowest index to the highest. If Function is not a + function, the call fails with reason badarg.

+

See also map/2.

+ + + + + + Get the number of entries in the array up until the last + non-default-valued entry. + +

Gets the number of entries in the array up until the last + non-default-valued entry. That is, returns I+1 if I is + the last non-default-valued entry in the array, or zero if no such + entry exists.

+

See also resize/1, + size/1.

+ + + + + + Convert the array to a list, skipping default-valued entries. + + +

Converts the array to a list, skipping default-valued entries.

+

See also to_list/1.

+ + + + + + Convert the array to an ordered list of pairs {Index, + Value}, skipping default-valued entries. + +

Converts the array to an ordered list of pairs {Index, + Value}, skipping default-valued entries.

+

See also + to_orddict/1.

+ + + + + + Convert the array to a list. + +

Converts the array to a list.

+

See also from_list/2, + sparse_to_list/1. +

+ + + + + + Convert the array to an ordered list of pairs {Index, + Value}. + +

Converts the array to an ordered list of pairs {Index, + Value}.

+

See also + from_orddict/2, + sparse_to_orddict/1. +

+ + + diff --git a/lib/stdlib/doc/src/assert_hrl.xml b/lib/stdlib/doc/src/assert_hrl.xml index ef4f928e57..e2dfc2ab9b 100644 --- a/lib/stdlib/doc/src/assert_hrl.xml +++ b/lib/stdlib/doc/src/assert_hrl.xml @@ -28,131 +28,134 @@
- assert.hrl - Assert Macros + assert.hrl.xml + Assert macros.

The include file assert.hrl provides macros for inserting - assertions in your program code.

-

These macros are defined in the Stdlib include file - assert.hrl. Include the following directive in the module - from which the function is called:

- + assertions in your program code.

+ +

Include the following directive in the module from which the function is + called:

+ + -include_lib("stdlib/include/assert.hrl"). -

When an assertion succeeds, the assert macro yields the atom - ok. When an assertion fails, an exception of type error is - instead generated. The associated error term will have the form - {Macro, Info}, where Macro is the name of the macro, for - example assertEqual, and Info will be a list of tagged - values such as [{module, M}, {line, L}, ...] giving more - information about the location and cause of the exception. All entries - in the Info list are optional, and you should not rely - programatically on any of them being present.

- -

If the macro NOASSERT is defined when the assert.hrl - include file is read by the compiler, the macros will be defined as - equivalent to the atom ok. The test will not be performed, and - there will be no cost at runtime.

+ +

When an assertion succeeds, the assert macro yields the atom ok. + When an assertion fails, an exception of type error is generated. + The associated error term has the form {Macro, Info}. Macro + is the macro name, for example, assertEqual. Info is a list + of tagged values, such as [{module, M}, {line, L}, ...], which + gives more information about the location and cause of the exception. All + entries in the Info list are optional; do not rely programatically + on any of them being present.

+ +

If the macro NOASSERT is defined when assert.hrl is read + by the compiler, the macros are defined as equivalent to the atom + ok. The test is not performed and there is no cost at runtime.

For example, using erlc to compile your modules, the following - will disable all assertions:

- + disable all assertions:

+ + erlc -DNOASSERT=true *.erl -

(The value of NOASSERT does not matter, only the fact that it - is defined.)

+ +

The value of NOASSERT does not matter, only the fact that it is + defined.

+

A few other macros also have effect on the enabling or disabling of - assertions:

+ assertions:

+ - If NODEBUG is defined, it implies NOASSERT, unless - DEBUG is also defined, which is assumed to take - precedence. - If ASSERT is defined, it overrides NOASSERT, that - is, the assertions will remain enabled. +

If NODEBUG is defined, it implies NOASSERT, unless + DEBUG is also defined, which is assumed to take precedence.

+ +

If ASSERT is defined, it overrides NOASSERT, that + is, the assertions remain enabled.

 -

If you prefer, you can thus use only DEBUG/NODEBUG as - the main flags to control the behaviour of the assertions (which is - useful if you have other compiler conditionals or debugging macros - controlled by those flags), or you can use ASSERT/NOASSERT - to control only the assert macros.

+

If you prefer, you can thus use only DEBUG/NODEBUG as the + main flags to control the behavior of the assertions (which is useful if + you have other compiler conditionals or debugging macros controlled by + those flags), or you can use ASSERT/NOASSERT to control only + the assert macros.
Macros assert(BoolExpr) -

Tests that BoolExpr completes normally returning - true.

+ +

Tests that BoolExpr completes normally returning + true.

 - assertNot(BoolExpr) -

Tests that BoolExpr completes normally returning - false.

+ +

Tests that BoolExpr completes normally returning + false.

 - assertMatch(GuardedPattern, Expr) -

Tests that Expr completes normally yielding a value - that matches GuardedPattern. For example:

+ +

Tests that Expr completes normally yielding a value that + matches GuardedPattern, for example:

- ?assertMatch({bork, _}, f()) -

Note that a guard when ... can be included:

+?assertMatch({bork, _}, f()) +

Notice that a guard when ... can be included:

- ?assertMatch({bork, X} when X > 0, f()) +?assertMatch({bork, X} when X > 0, f()) - assertNotMatch(GuardedPattern, Expr) -

Tests that Expr completes normally yielding a value - that does not match GuardedPattern.

-

As in assertMatch, GuardedPattern can have a - when part.

+ +

Tests that Expr completes normally yielding a value that does + not match GuardedPattern.

+

As in assertMatch, GuardedPattern can have a + when part.

 - assertEqual(ExpectedValue, Expr) -

Tests that Expr completes normally yielding a value - that is exactly equal to ExpectedValue.

+ +

Tests that Expr completes normally yielding a value that is + exactly equal to ExpectedValue.

 - assertNotEqual(ExpectedValue, Expr) -

Tests that Expr completes normally yielding a value - that is not exactly equal to ExpectedValue.

+ +

Tests that Expr completes normally yielding a value that is + not exactly equal to ExpectedValue.

 - assertException(Class, Term, Expr) -

Tests that Expr completes abnormally with an exception - of type Class and with the associated Term. The - assertion fails if Expr raises a different exception or if it - completes normally returning any value.

-

Note that both Class and Term can be guarded - patterns, as in assertMatch.

+ +

Tests that Expr completes abnormally with an exception of type + Class and with the associated Term. The assertion fails + if Expr raises a different exception or if it completes + normally returning any value.

+

Notice that both Class and Term can be guarded + patterns, as in assertMatch.

 - assertNotException(Class, Term, Expr) -

Tests that Expr does not evaluate abnormally with an - exception of type Class and with the associated Term. - The assertion succeeds if Expr raises a different exception or - if it completes normally returning any value.

-

As in assertException, both Class and Term - can be guarded patterns.

+ +

Tests that Expr does not evaluate abnormally with an + exception of type Class and with the associated Term. + The assertion succeeds if Expr raises a different exception or + if it completes normally returning any value.

+

As in assertException, both Class and Term can + be guarded patterns.

 - assertError(Term, Expr) -

Equivalent to assertException(error, Term, - Expr)

+ +

Equivalent to assertException(error, Term, Expr)

 - assertExit(Term, Expr) -

Equivalent to assertException(exit, Term, Expr)

+ +

Equivalent to assertException(exit, Term, Expr)

 - assertThrow(Term, Expr) -

Equivalent to assertException(throw, Term, Expr)

+ +

Equivalent to assertException(throw, Term, Expr)

 -
- SEE ALSO -

compile(3)

-

erlc(3)

+ See Also +

compile(3), + erlc(3)

diff --git a/lib/stdlib/doc/src/base64.xml b/lib/stdlib/doc/src/base64.xml index 7b82d7dd3d..cfa1ecc006 100644 --- a/lib/stdlib/doc/src/base64.xml +++ b/lib/stdlib/doc/src/base64.xml @@ -27,50 +27,57 @@ 2007-02-22 - base64.sgml + base64.xml
base64 - Implements base 64 encode and decode, see RFC2045. + Provides base64 encode and decode, see + RFC 2045. -

Implements base 64 encode and decode, see RFC2045.

+

Provides base64 encode and decode, see + RFC 2045.

 + -

A binary() with ASCII characters in the range 1 to 255.

+

A binary() with ASCII characters in the range 1 to + 255.

 + - - - - Encodes data into base64. - - - - -

Encodes a plain ASCII string into base64. The result will - be 33% larger than the data.

- - - Decodes a base64 encoded string to data. + Decode a base64 encoded string to data. -

Decodes a base64 encoded string to plain ASCII. See RFC4648. - mime_decode/1 and mime_decode_to_string/1 - strips away illegal characters, while decode/1 and - decode_to_string/1 only strips away whitespace characters.

+

Decodes a base64-encoded string to plain ASCII. See + RFC 4648.

+

mime_decode/1 and mime_decode_to_string/1 strip away + illegal characters, while decode/1 and + decode_to_string/1 only strip away whitespace characters.

+ + + + + + + Encode data into base64. + + + + +

Encodes a plain ASCII string into base64. The result is 33% larger + than the data.

 diff --git a/lib/stdlib/doc/src/beam_lib.xml b/lib/stdlib/doc/src/beam_lib.xml index 7c89c8b43e..d5ec90b060 100644 --- a/lib/stdlib/doc/src/beam_lib.xml +++ b/lib/stdlib/doc/src/beam_lib.xml @@ -4,7 +4,7 @@
- 20002015 + 20002016 Ericsson AB. All Rights Reserved. @@ -29,137 +29,159 @@ PA1
beam_lib - An Interface To the BEAM File Format + An interface to the BEAM file format. -

beam_lib provides an interface to files created by - the BEAM compiler ("BEAM files"). The format used, a variant of +

This module provides an interface to files created by + the BEAM Compiler ("BEAM files"). The format used, a variant of "EA IFF 1985" Standard for Interchange Format Files, divides data into chunks.

+

Chunk data can be returned as binaries or as compound terms. Compound terms are returned when chunks are referenced by names - (atoms) rather than identifiers (strings). The names recognized - and the corresponding identifiers are:

+ (atoms) rather than identifiers (strings). The recognized names + and the corresponding identifiers are as follows:

+ abstract_code ("Abst") + atoms ("Atom") attributes ("Attr") compile_info ("CInf") exports ("ExpT") - labeled_exports ("ExpT") imports ("ImpT") indexed_imports ("ImpT") - locals ("LocT") + labeled_exports ("ExpT") labeled_locals ("LocT") - atoms ("Atom") + locals ("LocT")
Debug Information/Abstract Code -

The option debug_info can be given to the compiler (see - compile(3)) - in order to have debug information in the form of abstract code - (see The Abstract Format - in ERTS User's Guide) stored in the abstract_code chunk. +

Option debug_info can be specified to the Compiler (see + compile(3)) + to have debug information in the form of abstract code (see section + The Abstract Format in the + ERTS User's Guide) stored in the abstract_code chunk. Tools such as Debugger and Xref require the debug information to be included.

+

Source code can be reconstructed from the debug information. - Use encrypted debug information (see below) to prevent this.

+ To prevent this, use encrypted debug information (see below).

 +

The debug information can also be removed from BEAM files - using strip/1, - strip_files/1 and/or - strip_release/1.

+ using strip/1, + strip_files/1, and/or + strip_release/1.

-
- Reconstructing source code -

Here is an example of how to reconstruct source code from - the debug information in a BEAM file Beam:

- - {ok,{_,[{abstract_code,{_,AC}}]}} = beam_lib:chunks(Beam,[abstract_code]). - io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]). -
-
- Encrypted debug information -

The debug information can be encrypted in order to keep - the source code secret, but still being able to use tools such as - Xref or Debugger.

-

To use encrypted debug information, a key must be provided to - the compiler and beam_lib. The key is given as a string and - it is recommended that it contains at least 32 characters and - that both upper and lower case letters as well as digits and - special characters are used.

-

The default type -- and currently the only type -- of crypto - algorithm is des3_cbc, three rounds of DES. The key string - will be scrambled using erlang:md5/1 to generate - the actual keys used for des3_cbc.

- -

As far as we know by the time of writing, it is - infeasible to break des3_cbc encryption without any - knowledge of the key. Therefore, as long as the key is kept - safe and is unguessable, the encrypted debug information - should be safe from intruders.

- -

There are two ways to provide the key:

- - -

Use the compiler option {debug_info,Key}, see - compile(3), - and the function - crypto_key_fun/1 - to register a fun which returns the key whenever - beam_lib needs to decrypt the debug information.

-

If no such fun is registered, beam_lib will instead - search for a .erlang.crypt file, see below.

- - -

Store the key in a text file named .erlang.crypt.

-

In this case, the compiler option encrypt_debug_info - can be used, see - compile(3).

- - + +
+ Reconstruct Source Code +

The following example shows how to reconstruct source code from + the debug information in a BEAM file Beam:

+ + +{ok,{_,[{abstract_code,{_,AC}}]}} = beam_lib:chunks(Beam,[abstract_code]). +io:fwrite("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).
-
- .erlang.crypt -

beam_lib searches for .erlang.crypt in the current - directory and then the home directory for the current user. If - the file is found and contains a key, beam_lib will - implicitly create a crypto key fun and register it.

-

The .erlang.crypt file should contain a single list of - tuples:

- - {debug_info, Mode, Module, Key} -

Mode is the type of crypto algorithm; currently, the only - allowed value thus is des3_cbc. Module is either an - atom, in which case Key will only be used for the module - Module, or [], in which case Key will be - used for all modules. Key is the non-empty key string.

-

The Key in the first tuple where both Mode and - Module matches will be used.

-

Here is an example of an .erlang.crypt file that returns - the same key for all modules:

- + Encrypted Debug Information +

The debug information can be encrypted to keep + the source code secret, but still be able to use tools such as + Debugger or Xref.

+ +

To use encrypted debug information, a key must be provided to + the compiler and beam_lib. The key is specified as a string. + It is recommended that the string contains at least 32 characters and + that both upper and lower case letters as well as digits and + special characters are used.

+ +

The default type (and currently the only type) of crypto + algorithm is des3_cbc, three rounds of DES. The key string + is scrambled using + erlang:md5/1 + to generate the keys used for des3_cbc.

+ + +

As far as we know by the time of writing, it is + infeasible to break des3_cbc encryption without any + knowledge of the key. Therefore, as long as the key is kept + safe and is unguessable, the encrypted debug information + should be safe from intruders.

+ + +

The key can be provided in the following two ways:

+ + + +

Use Compiler option {debug_info,Key}, see + compile(3) + 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.

+ + +

Store the key in a text file named .erlang.crypt.

+

In this case, Compiler option encrypt_debug_info + can be used, see + compile(3). +

+ + +
+ +
+ .erlang.crypt +

beam_lib searches for .erlang.crypt in the current + directory and then the home directory for the current user. If + the file is found and contains a key, beam_lib + implicitly creates a crypto key fun and registers it.

+ +

File .erlang.crypt is to contain a single list of tuples:

+ + +{debug_info, Mode, Module, Key} + +

Mode is the type of crypto algorithm; currently, the only + allowed value is des3_cbc. Module is either an + atom, in which case Key is only used for the module + Module, or [], in which case Key is + used for all modules. Key is the non-empty key string.

+ +

Key in the first tuple where both Mode and + Module match is used.

+ +

The following is an example of an .erlang.crypt file that returns + the same key for all modules:

+ + 7}|pc/DM6Cga*68$Mw]L#&_Gejr]G^"}].]]> -

And here is a slightly more complicated example of an - .erlang.crypt which provides one key for the module - t, and another key for all other modules:

- The following is a slightly more complicated example of an + .erlang.crypt providing one key for module + t and another key for all other modules:

+ + 7}|pc/DM6Cga*68$Mw]L#&_Gejr]G^"}].]]> - -

Do not use any of the keys in these examples. Use your own - keys.

- -
+ + +

Do not use any of the keys in these examples. Use your own keys.

+ +

Each of the functions described below accept either the - module name, the filename, or a binary containing the beam + module name, the filename, or a binary containing the BEAM module.

 @@ -167,7 +189,7 @@

The list of attributes is sorted on Attribute - (in attrib_entry()), and each + (in attrib_entry()) and each attribute name occurs once in the list. The attribute values occur in the same order as in the file. The lists of functions are also sorted.

@@ -186,8 +208,8 @@

It is not checked that the forms conform to the abstract format - indicated by AbstVersion. no_abstract_code means - that the "Abst" chunk is present, but empty.

+ indicated by AbstVersion. no_abstract_code + means that chunk "Abst" is present, but empty.

 @@ -230,78 +252,163 @@

Reads chunk data for all chunks.

 + + + + Create a BEAM module from a list of chunks. + +

Builds a BEAM module (as a binary) from a list of chunks.

+ + + - Read selected chunks from a BEAM file or binary + Read selected chunks from a BEAM file or binary. -

Reads chunk data for selected chunks refs. The order of +

Reads chunk data for selected chunks references. The order of the returned list of chunk data is determined by the order of the list of chunks references.

 + - Read selected chunks from a BEAM file or binary + Read selected chunks from a BEAM file or binary. -

Reads chunk data for selected chunks refs. The order of +

Reads chunk data for selected chunks references. The order of the returned list of chunk data is determined by the order of the list of chunks references.

-

By default, if any requested chunk is missing in Beam, - an error tuple is returned. - However, if the option allow_missing_chunks has been given, - a result will be returned even if chunks are missing. - In the result list, any missing chunks will be represented as +

By default, if any requested chunk is missing in + Beam, an error tuple is returned. + However, if option allow_missing_chunks is specified, + a result is returned even if chunks are missing. + In the result list, any missing chunks are represented as {ChunkRef,missing_chunk}. - Note, however, that if the "Atom" chunk if missing, that is - considered a fatal error and the return value will be an error + Notice however that if chunk "Atom" is missing, that is + considered a fatal error and the return value is an error tuple.

 + - - Creates a BEAM module from a list of chunks + + Unregister the current crypto key fun. -

Builds a BEAM module (as a binary) from a list of chunks.

+

Unregisters the crypto key fun and terminates the process + holding it, started by + crypto_key_fun/1. +

+

Returns either {ok, undefined} if no crypto key fun is + registered, or {ok, Term}, where Term is + the return value from CryptoKeyFun(clear), see + crypto_key_fun/1.

 + - - Read the BEAM file's module version + + Compare two BEAM files. + -

Returns the module version(s). A version is defined by - the module attribute -vsn(Vsn). If this attribute is - not specified, the version defaults to the checksum of - the module. Note that if the version Vsn is not a list, - it is made into one, that is {ok,{Module,[Vsn]}} is - returned. If there are several -vsn module attributes, - the result is the concatenated list of versions. Examples:

- 
-1> beam_lib:version(a). % -vsn(1).
-{ok,{a,[1]}}
-2> beam_lib:version(b). % -vsn([1]).
-{ok,{b,[1]}}
-3> beam_lib:version(c). % -vsn([1]). -vsn(2).
-{ok,{c,[1,2]}}
-4> beam_lib:version(d). % no -vsn attribute
-{ok,{d,[275613208176997377698094100858909383631]}}
+

Compares the contents of two BEAM files. If the module names + are the same, and all chunks except for chunk "CInf" + (the chunk containing the compilation information that is + returned by Module:module_info(compile)) + have the same contents in both files, + ok is returned. Otherwise an error message is returned.

 + - - Read the BEAM file's module version + + Compare the BEAM files in two directories. -

Calculates an MD5 redundancy check for the code of the module - (compilation date and other attributes are not included).

+

Compares the BEAM files in + two directories. Only files with extension ".beam" are + compared. BEAM files that exist only in directory + Dir1 (Dir2) are returned in + Only1 (Only2). + BEAM files that exist in both directories but + are considered different by cmp/2 are returned as + pairs {Filename1, Filename2}, + where Filename1 (Filename2) + exists in directory Dir1 + (Dir2).

 + + + + Register a fun that provides a crypto key. + + + + +

Registers an unary fun + that is called if beam_lib must read an + abstract_code chunk that has been encrypted. The fun + is held in a process that is started by the function.

+

If a fun is already registered when attempting to + register a fun, {error, exists} is returned.

+

The fun must handle the following arguments:

+ +CryptoKeyFun(init) -> ok | {ok, NewCryptoKeyFun} | {error, Term} +

Called when the fun is registered, in the process that holds + the fun. Here the crypto key fun can do any necessary + initializations. If {ok, NewCryptoKeyFun} is returned, + NewCryptoKeyFun is registered instead of + CryptoKeyFun. If {error, Term} is returned, + the registration is aborted and crypto_key_fun/1 + also returns {error, Term}.

+ +CryptoKeyFun({debug_info, Mode, Module, Filename}) -> Key +

Called when the key is needed for module Module + in the file named Filename. Mode is the type of + crypto algorithm; currently, the only possible value is + des3_cbc. The call is to fail (raise an exception) if + no key is available.

+ +CryptoKeyFun(clear) -> term() +

Called before the fun is unregistered. Here any cleaning up + can be done. The return value is not important, but is passed + back to the caller of clear_crypto_key_fun/0 as part + of its return value.

+ + + + + + Compare the BEAM files in two directories. + +

Compares the BEAM files in two directories as + cmp_dirs/2, but the + names of files that exist in only one directory or are different are + presented on standard output.

+ + + + + + Return an English description of a BEAM read error reply. + + +

For a specified error returned by any function in this module, + this function returns a descriptive string + of the error in English. For file errors, function + file:format_error(Posix) + is to be called.

+ + + - Information about a BEAM file + Information about a BEAM file.

Returns a list containing some information about a BEAM file as tuples {Item, Info}:

- {file, Filename} | {binary, Binary} + {file, Filename} | {binary, + Binary}

The name (string) of the BEAM file, or the binary from which the information was extracted.

@@ -310,7 +417,8 @@

The name (atom) of the module.

 - {chunks, [{ChunkId, Pos, Size}]} + {chunks, [{ChunkId, Pos, + Size}]}

For each chunk, the identifier (string) and the position and size of the chunk data, in bytes.

@@ -318,135 +426,75 @@ + - - Compare two BEAM files - - -

Compares the contents of two BEAM files. If the module names - are the same, and all chunks except for the "CInf" chunk - (the chunk containing the compilation information which is - returned by Module:module_info(compile)) - have the same contents in both files, - ok is returned. Otherwise an error message is returned.

- - - - - Compare the BEAM files in two directories - -

The cmp_dirs/2 function compares the BEAM files in - two directories. Only files with extension ".beam" are - compared. BEAM files that exist in directory Dir1 - (Dir2) only are returned in Only1 - (Only2). BEAM files that exist on both directories but - are considered different by cmp/2 are returned as - pairs {Filename1, Filename2} where - Filename1 (Filename2) exists in directory - Dir1 (Dir2).

- - - - - Compare the BEAM files in two directories + + Read the module version of the BEAM file. -

The diff_dirs/2 function compares the BEAM files in - two directories the way cmp_dirs/2 does, but names of - files that exist in only one directory or are different are - presented on standard output.

+

Calculates an MD5 redundancy check for the code of the module + (compilation date and other attributes are not included).

 + - Removes chunks not needed by the loader from a BEAM file + Remove chunks not needed by the loader from a BEAM file. + -

The strip/1 function removes all chunks from a BEAM +

Removes all chunks from a BEAM file except those needed by the loader. In particular, - the debug information (abstract_code chunk) is removed.

+ the debug information (chunk abstract_code) is removed.

 + - Removes chunks not needed by the loader from BEAM files + Removes chunks not needed by the loader from BEAM files. + -

The strip_files/1 function removes all chunks except +

Removes all chunks except those needed by the loader from BEAM files. In particular, - the debug information (abstract_code chunk) is removed. - The returned list contains one element for each given file - name, in the same order as in Files.

+ the debug information (chunk abstract_code) is removed. + The returned list contains one element for each specified filename, + in the same order as in Files.

 + - Removes chunks not needed by the loader from all BEAM files of a release + Remove chunks not needed by the loader from all BEAM files of + a release. -

The strip_release/1 function removes all chunks +

Removes all chunks except those needed by the loader from the BEAM files of a - release. Dir should be the installation root + release. Dir is to be the installation root directory. For example, the current OTP release can be stripped with the call beam_lib:strip_release(code:root_dir()).

 + - - Return an English description of a BEAM read error reply - -

Given the error returned by any function in this module, - the function format_error returns a descriptive string - of the error in English. For file errors, the function - file:format_error(Posix) should be called.

- - - - - Register a fun that provides a crypto key - - - - -

The crypto_key_fun/1 function registers a unary fun - that will be called if beam_lib needs to read an - abstract_code chunk that has been encrypted. The fun - is held in a process that is started by the function.

-

If there already is a fun registered when attempting to - register a fun, {error, exists} is returned.

-

The fun must handle the following arguments:

- - CryptoKeyFun(init) -> ok | {ok, NewCryptoKeyFun} | {error, Term} -

Called when the fun is registered, in the process that holds - the fun. Here the crypto key fun can do any necessary - initializations. If {ok, NewCryptoKeyFun} is returned - then NewCryptoKeyFun will be registered instead of - CryptoKeyFun. If {error, Term} is returned, - the registration is aborted and crypto_key_fun/1 - returns {error, Term} as well.

- - CryptoKeyFun({debug_info, Mode, Module, Filename}) -> Key -

Called when the key is needed for the module Module - in the file named Filename. Mode is the type of - crypto algorithm; currently, the only possible value thus is - des3_cbc. The call should fail (raise an exception) if - there is no key available.

- - CryptoKeyFun(clear) -> term() -

Called before the fun is unregistered. Here any cleaning up - can be done. The return value is not important, but is passed - back to the caller of clear_crypto_key_fun/0 as part - of its return value.

- - - - - Unregister the current crypto key fun + + Read the module version of the BEAM file. -

Unregisters the crypto key fun and terminates the process - holding it, started by crypto_key_fun/1.

-

The clear_crypto_key_fun/1 either returns - {ok, undefined} if there was no crypto key fun - registered, or {ok, Term}, where Term is - the return value from CryptoKeyFun(clear), see - crypto_key_fun/1.

+

Returns the module version or versions. A version is defined by + module attribute -vsn(Vsn). If this attribute is + not specified, the version defaults to the checksum of + the module. Notice that if version Vsn is not a list, + it is made into one, that is {ok,{Module,[Vsn]}} is + returned. If there are many -vsn module attributes, + the result is the concatenated list of versions.

+

Examples:

+ 
+1> beam_lib:version(a). % -vsn(1).
+{ok,{a,[1]}}
+2> beam_lib:version(b). % -vsn([1]).
+{ok,{b,[1]}}
+3> beam_lib:version(c). % -vsn([1]). -vsn(2).
+{ok,{c,[1,2]}}
+4> beam_lib:version(d). % no -vsn attribute
+{ok,{d,[275613208176997377698094100858909383631]}}
 diff --git a/lib/stdlib/doc/src/binary.xml b/lib/stdlib/doc/src/binary.xml index 933157fc34..6a86d6c7ba 100644 --- a/lib/stdlib/doc/src/binary.xml +++ b/lib/stdlib/doc/src/binary.xml @@ -35,285 +35,311 @@ binary.xml
binary - Library for handling binary data + Library for handling binary data.

This module contains functions for manipulating byte-oriented - binaries. Although the majority of functions could be implemented + binaries. Although the majority of functions could be provided using bit-syntax, the functions in this library are highly optimized and are expected to either execute faster or consume - less memory (or both) than a counterpart written in pure Erlang.

+ less memory, or both, than a counterpart written in pure Erlang.

-

The module is implemented according to the EEP (Erlang Enhancement Proposal) 31.

+

The module is provided according to Erlang Enhancement Proposal + (EEP) 31.

-

- The library handles byte-oriented data. Bitstrings that are not - binaries (does not contain whole octets of bits) will result in a badarg - exception being thrown from any of the functions in this - module. -

+

The library handles byte-oriented data. For bitstrings that are not + binaries (does not contain whole octets of bits) a badarg + exception is thrown from any of the functions in this module.

 + -

Opaque data-type representing a compiled - search-pattern. Guaranteed to be a tuple() to allow programs to - distinguish it from non precompiled search patterns.

+

Opaque data type representing a compiled + search pattern. Guaranteed to be a tuple() to allow programs to + distinguish it from non-precompiled search patterns.

 -

A representaion of a part (or range) in a binary. Start is a - zero-based offset into a binary() and Length is the length of - that part. As input to functions in this module, a reverse +

A representaion of a part (or range) in a binary. Start is + a zero-based offset into a binary() and Length is the + length of that part. As input to functions in this module, a reverse part specification is allowed, constructed with a negative - Length, so that the part of the binary begins at Start + - Length and is -Length long. This is useful for referencing the - last N bytes of a binary as {size(Binary), -N}. The functions - in this module always return part()'s with positive Length.

+ Length, so that the part of the binary begins at Start + + Length and is -Length long. This is useful for referencing + the last N bytes of a binary as {size(Binary), -N}. The + functions in this module always return part()s with positive + Length.

 + - Returns the byte at a specific position in a binary + Return the byte at a specific position in a binary. - -

Returns the byte at position Pos (zero-based) in the binary - Subject as an integer. If Pos >= byte_size(Subject), - a badarg - exception is raised.

- +

Returns the byte at position Pos (zero-based) in + binary Subject as an integer. If + Pos >= byte_size(Subject), + a badarg exception is raised.

 + - Convert a binary to a list of integers + Convert a binary to a list of integers. -

The same as bin_to_list(Subject,{0,byte_size(Subject)}).

+

Same as bin_to_list(Subject, {0,byte_size(Subject)}).

 + - Convert a binary to a list of integers + Convert a binary to a list of integers. +

Converts Subject to a list of byte()s, each + representing the value of one byte. part() denotes which part of + the binary() to convert.

-

Converts Subject to a list of byte()s, each representing - the value of one byte. The part() denotes which part of the - binary() to convert. Example:

+

Example:

-1> binary:bin_to_list(<<"erlang">>,{1,3}). +1> binary:bin_to_list(<<"erlang">>, {1,3}). "rla" -%% or [114,108,97] in list notation. - -

If PosLen in any way references outside the binary, a badarg exception is raised.

+%% or [114,108,97] in list notation. + +

If PosLen in any way references outside the binary, + a badarg exception is raised.

 + - Convert a binary to a list of integers + Convert a binary to a list of integers. -

The same as bin_to_list(Subject,{Pos,Len}).

+

Same as bin_to_list(Subject, {Pos, Len}).

 + - Pre-compiles a binary search pattern + Precompile a binary search pattern. -

Builds an internal structure representing a compilation of a - search-pattern, later to be used in the match/3, - matches/3, - split/3 or - replace/4 - functions. The cp() returned is guaranteed to be a - tuple() to allow programs to distinguish it from non - pre-compiled search patterns

- -

When a list of binaries is given, it denotes a set of - alternative binaries to search for. I.e if + search pattern, later to be used in functions + match/3, + matches/3, + split/3, or + replace/4. + The cp() returned is guaranteed to be a + tuple() to allow programs to distinguish it from + non-precompiled search patterns.

+ +

When a list of binaries is specified, it denotes a set of + alternative binaries to search for. For example, if [<<"functional">>,<<"programming">>] - is given as Pattern, this - means "either <<"functional">> or + is specified as Pattern, this + means either <<"functional">> or <<"programming">>". The pattern is a set of - alternatives; when only a single binary is given, the set has - only one element. The order of alternatives in a pattern is not significant.

- -

The list of binaries used for search alternatives shall be flat and proper.

+ alternatives; when only a single binary is specified, the set has + only one element. The order of alternatives in a pattern is + not significant.

-

If Pattern is not a binary or a flat proper list of binaries with length > 0, - a badarg exception will be raised.

+

The list of binaries used for search alternatives must be flat and + proper.

+

If Pattern is not a binary or a flat proper list of + binaries with length > 0, a badarg exception is raised.

 + - Creates a duplicate of a binary + Create a duplicate of a binary. -

The same as copy(Subject, 1).

+

Same as copy(Subject, 1).

 + - Duplicates a binary N times and creates a new + Duplicate a binary N times and create a new. -

Creates a binary with the content of Subject duplicated N times.

+

Creates a binary with the content of Subject + duplicated N times.

-

This function will always create a new binary, even if N = - 1. By using copy/1 on a binary referencing a larger binary, one - might free up the larger binary for garbage collection.

+

This function always creates a new binary, even if N = + 1. By using copy/1 + on a binary referencing a larger binary, one + can free up the larger binary for garbage collection.

By deliberately copying a single binary to avoid referencing - a larger binary, one might, instead of freeing up the larger + a larger binary, one can, instead of freeing up the larger binary for later garbage collection, create much more binary data than needed. Sharing binary data is usually good. Only in special cases, when small parts reference large binaries and the large binaries are no longer used in any process, deliberate - copying might be a good idea.

 + copying can be a good idea.

+ -

If N < 0, a badarg exception is raised.

+

If N < 0, a badarg exception is + raised.

 + - Decode a whole binary into an integer of arbitrary size + Decode a whole binary into an integer of arbitrary size. + -

The same as decode_unsigned(Subject, big).

+

Same as decode_unsigned(Subject, big).

 + - Decode a whole binary into an integer of arbitrary size + Decode a whole binary into an integer of arbitrary size. + +

Converts the binary digit representation, in big endian or little + endian, of a positive integer in Subject to an Erlang + integer().

-

Converts the binary digit representation, in big or little - endian, of a positive integer in Subject to an Erlang integer().

- -

Example:

+

Example:

1> binary:decode_unsigned(<<169,138,199>>,big). -11111111 - +11111111 + - Encodes an unsigned integer into the minimal binary + Encode an unsigned integer into the minimal binary. -

The same as encode_unsigned(Unsigned, big).

+

Same as encode_unsigned(Unsigned, big).

 + - Encodes an unsigned integer into the minimal binary + Encode an unsigned integer into the minimal binary. -

Converts a positive integer to the smallest possible - representation in a binary digit representation, either big + representation in a binary digit representation, either big endian or little endian.

-

Example:

+

Example:

-1> binary:encode_unsigned(11111111,big). -<<169,138,199>> - +1> binary:encode_unsigned(11111111, big). +<<169,138,199>> + - Returns the first byte of a binary + Return the first byte of a binary. - -

Returns the first byte of the binary Subject as an integer. If the - size of Subject is zero, a badarg exception is raised.

- +

Returns the first byte of binary Subject as an + integer. If the size of Subject is zero, a + badarg exception is raised.

 + - Returns the last byte of a binary + Return the last byte of a binary. - -

Returns the last byte of the binary Subject as an integer. If the - size of Subject is zero, a badarg exception is raised.

- +

Returns the last byte of binary Subject as an + integer. If the size of Subject is zero, a + badarg exception is raised.

 + - Convert a list of integers and binaries to a binary + Convert a list of integers and binaries to a binary. -

Works exactly as erlang:list_to_binary/1, added for completeness.

+

Works exactly as + erlang:list_to_binary/1, + added for completeness.

 + - Returns length of longest common prefix for a set of binaries + Return length of longest common prefix for a set of binaries. + -

Returns the length of the longest common prefix of the - binaries in the list Binaries. Example:

+ binaries in list Binaries.

+ +

Example:

-1> binary:longest_common_prefix([<<"erlang">>,<<"ergonomy">>]). +1> binary:longest_common_prefix([<<"erlang">>, <<"ergonomy">>]). 2 -2> binary:longest_common_prefix([<<"erlang">>,<<"perl">>]). -0 - +2> binary:longest_common_prefix([<<"erlang">>, <<"perl">>]). +0 -

If Binaries is not a flat list of binaries, a badarg exception is raised.

+

If Binaries is not a flat list of binaries, a + badarg exception is raised.

 + - Returns length of longest common suffix for a set of binaries + Return length of longest common suffix for a set of binaries. + -

Returns the length of the longest common suffix of the - binaries in the list Binaries. Example:

+ binaries in list Binaries.

+ +

Example:

-1> binary:longest_common_suffix([<<"erlang">>,<<"fang">>]). +1> binary:longest_common_suffix([<<"erlang">>, <<"fang">>]). 3 -2> binary:longest_common_suffix([<<"erlang">>,<<"perl">>]). -0 - - -

If Binaries is not a flat list of binaries, a badarg exception is raised.

+2> binary:longest_common_suffix([<<"erlang">>, <<"perl">>]). +0 +

If Binaries is not a flat list of binaries, a badarg + exception is raised.

 + - Searches for the first match of a pattern in a binary + Search for the first match of a pattern in a binary. -

The same as match(Subject, Pattern, []).

+

Same as match(Subject, Pattern, []). +

+ - Searches for the first match of a pattern in a binary + Search for the first match of a pattern in a binary. +

Searches for the first occurrence of Pattern in + Subject and returns the position and length.

-

Searches for the first occurrence of Pattern in Subject and - returns the position and length.

+

The function returns {Pos, Length} for the binary + in Pattern, starting at the lowest position in + Subject.

-

The function will return {Pos, Length} for the binary - in Pattern starting at the lowest position in - Subject, Example:

+

Example:

-1> binary:match(<<"abcde">>, [<<"bcde">>,<<"cd">>],[]). -{1,4} - +1> binary:match(<<"abcde">>, [<<"bcde">>, <<"cd">>],[]). +{1,4}

Even though <<"cd">> ends before <<"bcde">>, <<"bcde">> @@ -325,41 +351,44 @@ {scope, {Start, Length}} -

Only the given part is searched. Return values still have - offsets from the beginning of Subject. A negative Length is - allowed as described in the DATA TYPES section of this manual.

+

Only the specified part is searched. Return values still have + offsets from the beginning of Subject. A negative + Length is allowed as described in section Data Types in this + manual.

 -

If none of the strings in - Pattern is found, the atom nomatch is returned.

+

If none of the strings in Pattern is found, the + atom nomatch is returned.

-

For a description of Pattern, see - compile_pattern/1.

+

For a description of Pattern, see function + compile_pattern/1. +

-

If {scope, {Start,Length}} is given in the options - such that Start is larger than the size of - Subject, Start + Length is less than zero or - Start + Length is larger than the size of +

If {scope, {Start,Length}} is specified in the options such + that Start > size of Subject, Start + + Length < 0 or Start + Length > size of Subject, a badarg exception is raised.

- + - Searches for all matches of a pattern in a binary + Search for all matches of a pattern in a binary. -

The same as matches(Subject, Pattern, []).

+

Same as matches(Subject, Pattern, []). +

+ - Searches for all matches of a pattern in a binary + Search for all matches of a pattern in a binary. - -

Works like match/2, but the Subject is searched until +

As match/2, + but Subject is searched until exhausted and a list of all non-overlapping parts matching - Pattern is returned (in order).

+ Pattern is returned (in order).

The first and longest match is preferred to a shorter, which is illustrated by the following example:

@@ -367,76 +396,84 @@ 1> binary:matches(<<"abcde">>, [<<"bcde">>,<<"bc">>,<<"de">>],[]). -[{1,4}] - - -

The result shows that <<"bcde">> is selected instead of the - shorter match <<"bc">> (which would have given raise to one - more match,<<"de">>). This corresponds to the behavior of posix - regular expressions (and programs like awk), but is not - consistent with alternative matches in re (and Perl), where +[{1,4}] + +

The result shows that <<"bcde">> is selected instead of + the shorter match <<"bc">> (which would have given raise to + one more match, <<"de">>). + This corresponds to the behavior of + POSIX regular expressions (and programs like awk), but is not + consistent with alternative matches in re (and Perl), where instead lexical ordering in the search pattern selects which string matches.

-

If none of the strings in pattern is found, an empty list is returned.

- -

For a description of Pattern, see compile_pattern/1 and for a - description of available options, see match/3.

+

If none of the strings in a pattern is found, an empty list is + returned.

-

If {scope, {Start,Length}} is given in the options such that - Start is larger than the size of Subject, Start + Length is - less than zero or Start + Length is larger than the size of - Subject, a badarg exception is raised.

+

For a description of Pattern, see + compile_pattern/1. + For a description of available options, see + match/3.

+

If {scope, {Start,Length}} is + specified in the options such that Start > size + of Subject, Start + + Length < 0 or Start + + Length is > size of Subject, + a badarg exception is raised.

 + - Extracts a part of a binary + Extract a part of a binary. +

Extracts the part of binary Subject described by + PosLen.

-

Extracts the part of the binary Subject described by PosLen.

- -

Negative length can be used to extract bytes at the end of a binary:

+

A negative length can be used to extract bytes at the end of a + binary:

1> Bin = <<1,2,3,4,5,6,7,8,9,10>>. -2> binary:part(Bin,{byte_size(Bin), -5}). -<<6,7,8,9,10>> - +2> binary:part(Bin, {byte_size(Bin), -5}). +<<6,7,8,9,10>> -

part/2and part/3 are also available in the - erlang module under the names binary_part/2 and +

part/2 and + part/3 are also available in the + erlang + module under the names binary_part/2 and binary_part/3. Those BIFs are allowed in guard tests.

 -

If PosLen in any way references outside the binary, a badarg exception - is raised.

- +

If PosLen in any way references outside the binary, + a badarg exception is raised.

 + - Extracts a part of a binary + Extract a part of a binary. -

The same as part(Subject, {Pos, Len}).

+

Same as part(Subject, {Pos, + Len}).

 + - Determines the size of the actual binary pointed out by a sub-binary + Determine the size of the binary pointed out by a subbinary. + +

If a binary references a larger binary (often described as + being a subbinary), it can be useful to get the size of the + referenced binary. This function can be used in a program to trigger the + use of copy/1. By copying a + binary, one can dereference the original, possibly large, binary that a + smaller binary is a reference to.

-

If a binary references a larger binary (often described as - being a sub-binary), it can be useful to get the size of the - actual referenced binary. This function can be used in a program - to trigger the use of copy/1. By copying a binary, one might - dereference the original, possibly large, binary which a smaller - binary is a reference to.

- -

Example:

+

Example:

store(Binary, GBSet) -> @@ -447,26 +484,24 @@ store(Binary, GBSet) -> _ -> Binary end, - gb_sets:insert(NewBin,GBSet). - + gb_sets:insert(NewBin,GBSet).

In this example, we chose to copy the binary content before - inserting it in the gb_sets:set() if it references a binary more than - twice the size of the data we're going to keep. Of course - different rules for when copying will apply to different - programs.

+ inserting it in gb_sets:set() if it references a binary more than + twice the data size we want to keep. Of course, + different rules apply when copying to different programs.

-

Binary sharing will occur whenever binaries are taken apart, - this is the fundamental reason why binaries are fast, +

Binary sharing occurs whenever binaries are taken apart. + This is the fundamental reason why binaries are fast, decomposition can always be done with O(1) complexity. In rare circumstances this data sharing is however undesirable, why this - function together with copy/1 might be useful when optimizing + function together with copy/1 can be useful when optimizing for memory use.

Example of binary sharing:

-1> A = binary:copy(<<1>>,100). +1> A = binary:copy(<<1>>, 100). <<1,1,1,1,1 ... 2> byte_size(A). 100 @@ -477,141 +512,138 @@ store(Binary, GBSet) -> 5> byte_size(B). 10 6> binary:referenced_byte_size(B) -100 - +100

Binary data is shared among processes. If another process still references the larger binary, copying the part this - process uses only consumes more memory and will not free up the + process uses only consumes more memory and does not free up the larger binary for garbage collection. Use this kind of intrusive - functions with extreme care, and only if a real problem is - detected.

+ functions with extreme care and only if a real problem is detected.

 - + - Replaces bytes in a binary according to a pattern + Replace bytes in a binary according to a pattern. -

The same as replace(Subject,Pattern,Replacement,[]).

+

Same as replace(Subject, Pattern, Replacement,[]).

 + - Replaces bytes in a binary according to a pattern + Replace bytes in a binary according to a pattern. An integer() =< byte_size(Replacement) -

Constructs a new binary by replacing the parts in - Subject matching Pattern with the content of - Replacement.

+ Subject matching Pattern with + the content of Replacement.

+ +

If the matching subpart of Subject giving raise + to the replacement is to be inserted in the result, option + {insert_replaced, InsPos} inserts the matching part + into Replacement at the specified position (or + positions) before inserting Replacement into + Subject.

-

If the matching sub-part of Subject giving raise to the - replacement is to be inserted in the result, the option - {insert_replaced, InsPos} will insert the matching part into - Replacement at the given position (or positions) before actually - inserting Replacement into the Subject. Example:

+

Example:

-1> binary:replace(<<"abcde">>,<<"b">>,<<"[]">>,[{insert_replaced,1}]). +1> binary:replace(<<"abcde">>,<<"b">>,<<"[]">>, [{insert_replaced,1}]). <<"a[b]cde">> -2> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[]">>, - [global,{insert_replaced,1}]). +2> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[]">>,[global,{insert_replaced,1}]). <<"a[b]c[d]e">> -3> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[]">>, - [global,{insert_replaced,[1,1]}]). +3> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[]">>,[global,{insert_replaced,[1,1]}]). <<"a[bb]c[dd]e">> -4> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[-]">>, - [global,{insert_replaced,[1,2]}]). -<<"a[b-b]c[d-d]e">> - +4> binary:replace(<<"abcde">>,[<<"b">>,<<"d">>],<<"[-]">>,[global,{insert_replaced,[1,2]}]). +<<"a[b-b]c[d-d]e">> -

If any position given in InsPos is greater than the size of the replacement binary, a badarg exception is raised.

+

If any position specified in InsPos > size + of the replacement binary, a badarg exception is raised.

-

The options global and {scope, part()} work as for split/3. The return type is always a binary().

+

Options global and {scope, part()} work as for + split/3. + The return type is always a binary().

-

For a description of Pattern, see compile_pattern/1.

+

For a description of Pattern, see + compile_pattern/1. +

+ - Splits a binary according to a pattern + Split a binary according to a pattern. -

The same as split(Subject, Pattern, []).

+

Same as split(Subject, Pattern, + []).

 + - Splits a binary according to a pattern + Split a binary according to a pattern. +

Splits Subject into a list of binaries based on + Pattern. If option global is not specified, + only the first occurrence of Pattern in + Subject gives rise to a split.

-

Splits Subject into a list of binaries based on Pattern. If - the option global is not given, only the first occurrence of - Pattern in Subject will give rise to a split.

+

The parts of Pattern found in + Subject are not included in the result.

-

The parts of Pattern actually found in Subject are not included in the result.

- -

Example:

+

Example:

1> binary:split(<<1,255,4,0,0,0,2,3>>, [<<0,0,0>>,<<2>>],[]). [<<1,255,4>>, <<2,3>>] 2> binary:split(<<0,1,0,0,4,255,255,9>>, [<<0,0>>, <<255,255>>],[global]). -[<<0,1>>,<<4>>,<<9>>] - +[<<0,1>>,<<4>>,<<9>>]

Summary of options:

- + {scope, part()} - -

Works as in match/3 and - matches/3. Note that +

Works as in match/3 + and matches/3. Notice that this only defines the scope of the search for matching strings, - it does not cut the binary before splitting. The bytes before - and after the scope will be kept in the result. See example - below.

 - + it does not cut the binary before splitting. The bytes before and after + the scope are kept in the result. See the example below.

trim - -

Removes trailing empty parts of the result (as does trim in re:split/3)

 - +

Removes trailing empty parts of the result (as does trim + in re:split/3.

 trim_all -

Removes all empty parts of the result.

 - global - -

Repeats the split until the Subject is - exhausted. Conceptually the global option makes split work on - the positions returned by matches/3, - while it normally - works on the position returned by - match/3.

 - +

Repeats the split until Subject is + exhausted. Conceptually option global makes split work + on the positions returned by + matches/3, while it + normally works on the position returned by + match/3.

Example of the difference between a scope and taking the binary apart before splitting:

-1> binary:split(<<"banana">>,[<<"a">>],[{scope,{2,3}}]). +1> binary:split(<<"banana">>, [<<"a">>],[{scope,{2,3}}]). [<<"ban">>,<<"na">>] -2> binary:split(binary:part(<<"banana">>,{2,3}),[<<"a">>],[]). -[<<"n">>,<<"n">>] - +2> binary:split(binary:part(<<"banana">>,{2,3}), [<<"a">>],[]). +[<<"n">>,<<"n">>]

The return type is always a list of binaries that are all - referencing Subject. This means that the data in Subject is not - actually copied to new binaries and that Subject cannot be - garbage collected until the results of the split are no longer - referenced.

- -

For a description of Pattern, see compile_pattern/1.

+ referencing Subject. This means that the data in + Subject is not copied to new binaries, and that + Subject cannot be garbage collected until the results + of the split are no longer referenced.

+

For a description of Pattern, see + compile_pattern/1. +

diff --git a/lib/stdlib/doc/src/book.xml b/lib/stdlib/doc/src/book.xml index 84ce3f0788..008d7f4319 100644 --- a/lib/stdlib/doc/src/book.xml +++ b/lib/stdlib/doc/src/book.xml @@ -27,7 +27,7 @@ 1997-05-02 1.3 - book.sgml + book.xml
@@ -48,3 +48,4 @@ + diff --git a/lib/stdlib/doc/src/c.xml b/lib/stdlib/doc/src/c.xml index 9b4a9489c0..92ab59c6b0 100644 --- a/lib/stdlib/doc/src/c.xml +++ b/lib/stdlib/doc/src/c.xml @@ -25,270 +25,310 @@ c Joe Armstrong 1 - 96-10-30 + 1996-10-30 B
c - Command Interface Module + Command interface module. -

The c module enables users to enter the short form of +

This module enables users to enter the short form of some commonly used commands.

-

These functions are are intended for interactive use in - the Erlang shell only. The module prefix may be omitted.

+

These functions are intended for interactive use in + the Erlang shell only. The module prefix can be omitted.

 + - Stack backtrace for a process + Stack backtrace for a process.

Stack backtrace for a process. Equivalent to erlang:process_display(Pid, backtrace).

 + - Compile and load code in a file + Compile and load code in a file. -

c/1,2 compiles and then purges and loads the code for - a file. Options defaults to []. Compilation is +

Compiles and then purges and loads the code for a file. + Options defaults to []. Compilation is equivalent to:

compile:file(File, Options ++ [report_errors, report_warnings]) -

Note that purging the code means that any processes +

Notice that purging the code means that any processes lingering in old code for the module are killed without - warning. See code/3 for more information.

+ warning. For more information, see code/3.

 + - Change working directory + Change working directory. -

Changes working directory to Dir, which may be a +

Changes working directory to Dir, which can be a relative name, and then prints the name of the new working directory.

+

Example:

 2> cd("../erlang").
 /home/ron/erlang
 + - Flush any messages sent to the shell + Flush any messages sent to the shell.

Flushes any messages sent to the shell.

 + - Help information + Help information.

Displays help information: all valid shell internal commands, and commands in this module.

 + - Information about the system + System information. -

i/0 displays information about the system, listing +

i/0 displays system information, listing information about all processes. ni/0 does the same, but for all nodes the network.

 + - Information about pid <X.Y.Z> + Information about pid <X.Y.Z>.

Displays information about a process, Equivalent to - process_info(pid(X, Y, Z)), but location transparent.

+ process_info(pid(X, Y, + Z)), but location transparent.

 + - Load or reload module + Load or reload a module.

Purges and loads, or reloads, a module by calling code:purge(Module) followed by code:load_file(Module).

-

Note that purging the code means that any processes +

Notice that purging the code means that any processes lingering in old code for the module are killed without - warning. See code/3 for more information.

+ warning. For more information, see code/3.

 + lc(Files) -> ok - Compile a list of files + Compile a list of files. Files = [File] - File = file:filename() - + File -

Compiles a list of files by calling compile:file(File, [report_errors, report_warnings]) for each File - in Files.

+

Compiles a list of files by calling + compile:file(File, [report_errors, report_warnings]) for each + File in Files.

+

For information about File, see + file:filename(). +

+ - List files in the current directory + List files in the current directory.

Lists files in the current directory.

 + - List files in a directory or a single file + List files in a directory or a single file. -

Lists files in directory Dir or, if Dir is a file, only list it.

+

Lists files in directory Dir or, if Dir + is a file, only lists it.

 + - Which modules are loaded + Which modules are loaded.

Displays information about the loaded modules, including the files from which they have been loaded.

 + - Information about a module + Information about a module.

Displays information about Module.

 + - Memory allocation information + Memory allocation information.

Memory allocation information. Equivalent to - erlang:memory/0 - .

+ erlang:memory/0.

 + - Memory allocation information + Memory allocation information.

Memory allocation information. Equivalent to - erlang:memory/1 - .

+ erlang:memory/1.

 + - Compile and load code in a file on all nodes + Compile and load code in a file on all nodes.

Compiles and then loads the code for a file on all nodes. - Options defaults to []. Compilation is equivalent to:

+ Options defaults to []. + Compilation is equivalent to:

compile:file(File, Options ++ [report_errors, report_warnings]) + - Load module on all nodes + Load module on all nodes.

Loads Module on all nodes.

 + - Convert X,Y,Z to a pid + Convert X,Y,Z to a pid. -

Converts X, Y, Z to the pid - ]]>. This function should only be used when - debugging.

+

Converts X, Y, + Z to pid ]]>. + This function is only to be used when debugging.

 + - Print working directory + Print working directory.

Prints the name of the working directory.

 + - Quit - shorthand for init:stop() + Quit - shorthand for init:stop().

This function is shorthand for init:stop(), that is, it causes the node to stop in a controlled fashion.

 + - Information about registered processes + Information about registered processes.

regs/0 displays information about all registered processes. nregs/0 does the same, but for all nodes in the network.

 + - Print node uptime + Print node uptime. -

Prints the node uptime (as given by - erlang:statistics(wall_clock)), in human-readable form.

+

Prints the node uptime (as specified by + erlang:statistics(wall_clock)) in human-readable form.

 + xm(ModSpec) -> void() - Cross reference check a module + Cross-reference check a module. ModSpec = Module | Filename  Module = atom()  Filename = string() -

This function finds undefined functions, unused functions, +

Finds undefined functions, unused functions, and calls to deprecated functions in a module by calling xref:m/1.

 + y(File) -> YeccRet - Generate an LALR-1 parser + Generate an LALR-1 parser. - File = name() -- see filename(3) - YeccRet = -- see yecc:file/2 + File = name() + YeccRet

Generates an LALR-1 parser. Equivalent to:

yecc:file(File) +

For information about File = name(), see + filename(3). + For information about YeccRet, see + yecc:file/2. +

+ y(File, Options) -> YeccRet - Generate an LALR-1 parser + Generate an LALR-1 parser. - File = name() -- see filename(3) - Options, YeccRet = -- see yecc:file/2 + File = name() + Options, YeccRet

Generates an LALR-1 parser. Equivalent to:

yecc:file(File, Options) +

For information about File = name(), see + filename(3). + For information about Options and YeccRet, see + yecc:file/2. +

See Also -

compile(3), - filename(3), - erlang(3), - yecc(3), - xref(3)

+

filename(3), + compile(3), + erlang(3), + yecc(3), + xref(3)

diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml index 38bf55679e..65b3edcdf6 100644 --- a/lib/stdlib/doc/src/calendar.xml +++ b/lib/stdlib/doc/src/calendar.xml @@ -29,20 +29,21 @@ B
calendar - Local and universal time, day-of-the-week, date and time conversions + Local and universal time, day of the week, date and time + conversions.

This module provides computation of local and universal time, - day-of-the-week, and several time conversion functions.

+ day of the week, and many time conversion functions.

Time is local when it is adjusted in accordance with the current time zone and daylight saving. Time is universal when it reflects the time at longitude zero, without any adjustment for daylight saving. Universal Coordinated Time (UTC) time is also called Greenwich Mean Time (GMT).

The time functions local_time/0 and - universal_time/0 provided in this module both return date - and time. The reason for this is that separate functions for date - and time may result in a date/time combination which is displaced - by 24 hours. This happens if one of the functions is called + universal_time/0 in this module both return date + and time. The is because separate functions for date + and time can result in a date/time combination that is displaced + by 24 hours. This occurs if one of the functions is called before midnight, and the other after midnight. This problem also applies to the Erlang BIFs date/0 and time/0, and their use is strongly discouraged if a reliable date/time stamp @@ -56,22 +57,21 @@

The Gregorian calendar in this module is extended back to year 0. For a given date, the gregorian days is the number of days up to and including the date specified. Similarly, - the gregorian seconds for a given date and time, is - the the number of seconds up to and including the specified date + the gregorian seconds for a specified date and time is + the number of seconds up to and including the specified date and time.

For computing differences between epochs in time, use the functions counting gregorian days or seconds. If epochs are - given as local time, they must be converted to universal time, in - order to get the correct value of the elapsed time between epochs. - Use of the function time_difference/2 is discouraged.

-

There exists different definitions for the week of the year. - The calendar module contains a week of the year implementation - which conforms to the ISO 8601 standard. Since the week number for - a given date can fall on the previous, the current or on the next - year it is important to provide the information which year is it - together with the week number. The function iso_week_number/0 - and iso_week_number/1 returns a tuple of the year and the - week number.

+ specified as local time, they must be converted to universal time + to get the correct value of the elapsed time between epochs. + Use of function time_difference/2 is discouraged.

+

Different definitions exist for the week of the year. + This module contains a week of the year implementation + conforming to the ISO 8601 standard. As the week number for a + specified date can fall on the previous, the current, or on the next + year, it is important to specify both the year and the week number. + Functions iso_week_number/0 and iso_week_number/1 + return a tuple of the year and the week number.

 @@ -86,9 +86,9 @@ -

Year cannot be abbreviated. Example: 93 denotes year - 93, not 1993. Valid range depends on the underlying OS. The - date tuple must denote a valid date.

+

Year cannot be abbreviated. For example, 93 denotes year + 93, not 1993. The valid range depends on the underlying operating + system. The date tuple must denote a valid date.

 @@ -130,186 +130,221 @@ - Compute the number of days from year 0 up to the given date + Compute the number of days from year 0 up to the specified + date. -

This function computes the number of gregorian days starting - with year 0 and ending at the given date.

+

Computes the number of gregorian days starting + with year 0 and ending at the specified date.

 + - Compute the number of seconds from year 0 up to the given date and time + Compute the number of seconds from year 0 up to the specified + date and time. -

This function computes the number of gregorian seconds - starting with year 0 and ending at the given date and time.

+

Computes the number of gregorian seconds starting + with year 0 and ending at the specified date and time.

 + - Compute the day of the week + Compute the day of the week. -

This function computes the day of the week given Year, - Month and Day. The return value denotes the day - of the week as 1: Monday, 2: Tuesday, and so on.

+

Computes the day of the week from the specified + Year, Month, and + Day. Returns the day of the week as + 1: Monday, 2: Tuesday, and so on.

 + - Compute the date given the number of gregorian days + Compute the date from the number of gregorian days. -

This function computes the date given the number of - gregorian days.

+

Computes the date from the specified number of gregorian days.

 + - Compute the date given the number of gregorian days + Compute the date and time from the number of gregorian seconds. + -

This function computes the date and time from the given +

Computes the date and time from the specified number of gregorian seconds.

 + - Check if a year is a leap year + Check if the year is a leap year. -

This function checks if a year is a leap year.

+

Checks if the specified year is a leap year.

 + - Compute the iso week number for the actual date + Compute the ISO week number for the actual date. -

This function returns the tuple {Year, WeekNum} representing - the iso week number for the actual date. For determining the - actual date, the function local_time/0 is used.

+

Returns tuple {Year, WeekNum} representing + the ISO week number for the actual date. To determine the + actual date, use function + local_time/0.

 + - Compute the iso week number for the given date + Compute the ISO week number for the specified date. -

This function returns the tuple {Year, WeekNum} representing - the iso week number for the given date.

+

Returns tuple {Year, WeekNum} representing + the ISO week number for the specified date.

 + - Compute the number of days in a month + Compute the number of days in a month. -

This function computes the number of days in a month.

+

Computes the number of days in a month.

 + - Compute local time + Compute local time. -

This function returns the local time reported by +

Returns the local time reported by the underlying operating system.

 + - Convert from local time to universal time (deprecated) + Convert from local time to universal time (deprecated). + -

This function converts from local time to Universal - Coordinated Time (UTC). DateTime1 must refer to a local +

Converts from local time to Universal Coordinated Time (UTC). + DateTime1 must refer to a local date after Jan 1, 1970.

This function is deprecated. Use - local_time_to_universal_time_dst/1 instead, as it - gives a more correct and complete result. Especially for - the period that does not exist since it gets skipped during + + local_time_to_universal_time_dst/1 + instead, as it gives a more correct and complete result. + Especially for + the period that does not exist, as it is skipped during the switch to daylight saving time, this function still returns a result.

 + - Convert from local time to universal time(s) + Convert from local time to universal time(s). -

This function converts from local time to Universal - Coordinated Time (UTC). DateTime1 must refer to a local +

Converts from local time to Universal Coordinated Time (UTC). + DateTime1 must refer to a local date after Jan 1, 1970.

-

The return value is a list of 0, 1 or 2 possible UTC times:

+

The return value is a list of 0, 1, or 2 possible UTC times:

[]

For a local {Date1, Time1} during the period that is skipped when switching to daylight saving - time, there is no corresponding UTC since the local time - is illegal - it has never happened.

+ time, there is no corresponding UTC, as the local time + is illegal (it has never occured).

 [DstDateTimeUTC, DateTimeUTC]

For a local {Date1, Time1} during the period that is repeated when switching from daylight saving - time, there are two corresponding UTCs. One for the first + time, two corresponding UTCs exist; one for the first instance of the period when daylight saving time is still active, and one for the second instance.

 [DateTimeUTC] -

For all other local times there is only one - corresponding UTC.

+

For all other local times only one corresponding UTC exists.

 + + + + Convert now to date and time. + +

Returns Universal Coordinated Time (UTC) + converted from the return value from + erlang:timestamp/0. +

+ + + - Convert now to local date and time + Convert now to local date and time. -

This function returns local date and time converted from - the return value from - erlang:timestamp/0.

+

Returns local date and time converted from the return value from + erlang:timestamp/0. +

+ - - Convert now to date and time + Convert now to date and time. -

This function returns Universal Coordinated Time (UTC) - converted from the return value from - erlang:timestamp/0.

+

Returns Universal Coordinated Time (UTC) + converted from the return value from + erlang:timestamp/0. +

+ - Compute days and time from seconds + Compute days and time from seconds. -

This function transforms a given number of seconds into days, - hours, minutes, and seconds. The Time part is always - non-negative, but Days is negative if the argument +

Converts a specified number of seconds into days, hours, minutes, + and seconds. Time is always non-negative, but + Days is negative if argument Seconds is.

 + - Compute time from seconds + Compute time from seconds. -

This function computes the time from the given number of - seconds. Seconds must be less than the number of +

Computes the time from the specified number of seconds. + Seconds must be less than the number of seconds per day (86400).

 + - Compute the difference between two times (deprecated) + Compute the difference between two times (deprecated). + -

This function returns the difference between two {Date, Time} tuples. T2 should refer to an epoch later +

Returns the difference between two {Date, Time} tuples. + T2 is to refer to an epoch later than T1.

This function is obsolete. Use the conversion functions for @@ -317,33 +352,38 @@ + - Compute the number of seconds since midnight up to the given time + Compute the number of seconds since midnight up to the + specified time. -

This function computes the number of seconds since midnight +

Returns the number of seconds since midnight up to the specified time.

 + - Compute universal time + Compute universal time. -

This function returns the Universal Coordinated Time (UTC) - reported by the underlying operating system. Local time is - returned if universal time is not available.

+

Returns the Universal Coordinated Time (UTC) + reported by the underlying operating system. Returns local time if + universal time is unavailable.

 + - Convert from universal time to local time + Convert from universal time to local time. -

This function converts from Universal Coordinated Time (UTC) - to local time. DateTime must refer to a date after Jan 1, - 1970.

+

Converts from Universal Coordinated Time (UTC) to local time. + DateTime must refer to a date after Jan 1, 1970. +

+ @@ -362,31 +402,31 @@ Leap Years

The notion that every fourth year is a leap year is not completely true. By the Gregorian rule, a year Y is a leap year if - either of the following rules is valid:

+ one of the following rules is valid:

-

Y is divisible by 4, but not by 100; or

+

Y is divisible by 4, but not by 100.

Y is divisible by 400.

 -

Accordingly, 1996 is a leap year, 1900 is not, but 2000 is.

+

Hence, 1996 is a leap year, 1900 is not, but 2000 is.

Date and Time Source

Local time is obtained from the Erlang BIF localtime/0. Universal time is computed from the BIF universaltime/0.

-

The following facts apply:

+

The following fapply:

- there are 86400 seconds in a day - there are 365 days in an ordinary year - there are 366 days in a leap year - there are 1461 days in a 4 year period - there are 36524 days in a 100 year period - there are 146097 days in a 400 year period - there are 719528 days between Jan 1, 0 and Jan 1, 1970. + There are 86400 seconds in a day. + There are 365 days in an ordinary year. + There are 366 days in a leap year. + There are 1461 days in a 4 year period. + There are 36524 days in a 100 year period. + There are 146097 days in a 400 year period. + There are 719528 days between Jan 1, 0 and Jan 1, 1970.
diff --git a/lib/stdlib/doc/src/dets.xml b/lib/stdlib/doc/src/dets.xml index 177c2ba508..3b134d00b7 100644 --- a/lib/stdlib/doc/src/dets.xml +++ b/lib/stdlib/doc/src/dets.xml @@ -26,82 +26,100 @@ Claes Wikström Claes Wikström - nobody - no + + 2001-06-06 B - dets.sgml + dets.xml
dets - A Disk Based Term Storage + A disk-based term storage. -

The module dets provides a term storage on file. The +

This module provides a term storage on file. The stored terms, in this module called objects, are tuples such that one element is defined to be the key. A Dets table is a collection of objects with the key at the same position stored on a file.

-

Dets is used by the Mnesia application, and is provided as is - for users who are interested in an efficient storage of Erlang - terms on disk only. Many applications just need to store some + +

This module is used by the Mnesia application, and is provided + "as is" for users who are interested in efficient storage of Erlang + terms on disk only. Many applications only need to store some terms in a file. Mnesia adds transactions, queries, and distribution. The size of Dets files cannot exceed 2 GB. If larger - tables are needed, Mnesia's table fragmentation can be used.

-

There are three types of Dets tables: set, bag and - duplicate_bag. A table of type set has at most one object - with a given key. If an object with a key already present in the - table is inserted, the existing object is overwritten by the new - object. A table of type bag has zero or more different - objects with a given key. A table of type duplicate_bag - has zero or more possibly matching objects with a given key.

+ tables are needed, table fragmentation in Mnesia can be used.

+ +

Three types of Dets tables exist:

+ + +

set. A table of this type has at most one object with a + given key. If an object with a key already present in the + table is inserted, the existing object is overwritten by the new + object.

+ +

bag. A table of this type has zero or more different + objects with a given key.

+ +

duplicate_bag. A table of this type has zero or more + possibly matching objects with a given key.

+ + +

Dets tables must be opened before they can be updated or read, - and when finished they must be properly closed. If a table has not - been properly closed, Dets will automatically repair the table. + and when finished they must be properly closed. If a table is not + properly closed, Dets automatically repairs the table. This can take a substantial time if the table is large. A Dets table is closed when the process which opened the table - terminates. If several Erlang processes (users) open the same Dets - table, they will share the table. The table is properly closed + terminates. If many Erlang processes (users) open the same Dets + table, they share the table. The table is properly closed when all users have either terminated or closed the table. Dets - tables are not properly closed if the Erlang runtime system is - terminated abnormally.

+ tables are not properly closed if the Erlang runtime system + terminates abnormally.

+ -

A ^C command abnormally terminates an Erlang runtime +

A ^C command abnormally terminates an Erlang runtime system in a Unix environment with a break-handler.

 -

Since all operations performed by Dets are disk operations, it + +

As all operations performed by Dets are disk operations, it is important to realize that a single look-up operation involves a - series of disk seek and read operations. For this reason, the Dets - functions are much slower than the corresponding Ets functions, + series of disk seek and read operations. The Dets functions + are therefore much slower than the corresponding + ets(3) functions, although Dets exports a similar interface.

+

Dets organizes data as a linear hash list and the hash list grows gracefully as more data is inserted into the table. Space management on the file is performed by what is called a buddy system. The current implementation keeps the entire buddy system in RAM, which implies that if the table gets heavily fragmented, quite some memory can be used up. The only way to defragment a - table is to close it and then open it again with the repair - option set to force.

-

It is worth noting that the ordered_set type present in Ets is - not yet implemented by Dets, neither is the limited support for - concurrent updates which makes a sequence of first and - next calls safe to use on fixed Ets tables. Both these - features will be implemented by Dets in a future release of - Erlang/OTP. Until then, the Mnesia application (or some user - implemented method for locking) has to be used to implement safe - concurrency. Currently, no library of Erlang/OTP has support for - ordered disk based term storage.

+ table is to close it and then open it again with option repair + set to force.

+ +

Notice that type ordered_set in Ets is not yet + provided by Dets, neither is the limited support for + concurrent updates that makes a sequence of first and + next calls safe to use on fixed ETS tables. Both these + features will be provided by Dets in a future release of + Erlang/OTP. Until then, the Mnesia application (or some + user-implemented method for locking) must be used to implement safe + concurrency. Currently, no Erlang/OTP library has support for + ordered disk-based term storage.

+

Two versions of the format used for storing objects on file are supported by Dets. The first version, 8, is the format always used - for tables created by OTP R7 and earlier. The second version, 9, - is the default version of tables created by OTP R8 (and later OTP - releases). OTP R8 can create version 8 tables, and convert version - 8 tables to version 9, and vice versa, upon request. -

+ for tables created by Erlang/OTP R7 and earlier. The second version, 9, + is the default version of tables created by Erlang/OTP R8 (and later + releases). Erlang/OTP R8 can create version 8 tables, and convert version + 8 tables to version 9, and conversely, upon request.

All Dets functions return {error, Reason} if an error - occurs (first/1 and next/2 are exceptions, they exit - the process with the error tuple). If given badly formed - arguments, all functions exit the process with a badarg + occurs (first/1 and + next/2 are exceptions, they + exit the process with the error tuple). If badly formed arguments are + specified, all functions exit the process with a badarg message.

 + @@ -130,10 +148,11 @@ -

Match specifications, see the match specification - documentation in the ERTS User's Guide and ms_transform(3).

+

Match specifications, see section + + Match Specification in Erlang in ERTS User's Guide and the + ms_transform(3) + module.

 @@ -146,15 +165,15 @@

Opaque continuation used by - match_object/1 and - match_object/3.

+ match_object/1 and + match_object/3.

 -

See ets:match/2 for a - description of patterns.

+

For a description of patterns, see + ets:match/2.

 @@ -175,67 +194,69 @@ + - Return a list of the names of all open Dets tables on this node. + Return a list of the names of all open Dets tables on + this node. -

Returns a list of the names of all open tables on this - node.

+

Returns a list of the names of all open tables on this node.

 + - Return a chunk of objects stored in a Dets table. + Return a chunk of objects stored in a Dets table. +

Returns a list of objects stored in a table. The exact representation of the returned objects is not public. The - lists of data can be used for initializing a table by giving - the value bchunk to the format option of the + lists of data can be used for initializing a table by specifying + value bchunk to option format of function init_table/3 - function. The Mnesia application uses this + The Mnesia application uses this function for copying open tables.

Unless the table is protected using safe_fixtable/2, - calls to bchunk/2 may not work as expected if + calls to bchunk/2 do possibly not work as expected if concurrent updates are made to the table.

The first time bchunk/2 is called, an initial continuation, the atom start, must be provided.

-

The bchunk/2 function returns a tuple +

bchunk/2 returns a tuple {Continuation2, Data}, where Data is a list of objects. Continuation2 is another continuation - which is - to be passed on to a subsequent call to bchunk/2. With - a series of calls to bchunk/2 it is possible to extract - all objects of the table. -

+ that is to be passed on to a subsequent call to bchunk/2. With + a series of calls to bchunk/2, all table objects can be + extracted.

bchunk/2 returns '$end_of_table' when all - objects have been returned, or {error, Reason} - if an error occurs. -

+ objects are returned, or {error, Reason} + if an error occurs.

 + Close a Dets table.

Closes a table. Only processes that have opened a table are - allowed to close it. -

+ allowed to close it.

All open tables must be closed before the system is - stopped. If an attempt is made to open a table which has not - been properly closed, Dets automatically tries to repair the - table.

+ stopped. If an attempt is made to open a table that is not + properly closed, Dets automatically tries to repair it.

 + - Delete all objects with a given key from a Dets table. + Delete all objects with a specified key from a Dets + table. -

Deletes all objects with the key Key from - the table Name.

+

Deletes all objects with key Key from + table Name.

 + Delete all objects from a Dets table. @@ -245,264 +266,275 @@ is equivalent to match_delete(T, '_').

 + - Delete a given object from a Dets table. + Delete a specified object from a Dets table. -

Deletes all instances of a given object from a table. If a - table is of type bag or duplicate_bag, the - delete/2 function cannot be used to delete only some of - the objects with a given key. This function makes this - possible.

+

Deletes all instances of a specified object from a table. If a + table is of type bag or duplicate_bag, this + function can be used to delete only some of + the objects with a specified key.

 + Return the first key stored in a Dets table. -

Returns the first key stored in the table Name - according to the table's internal order, or +

Returns the first key stored in table Name + according to the internal order of the table, or '$end_of_table' if the table is empty.

Unless the table is protected using safe_fixtable/2, subsequent calls to next/2 - may not work as expected if + do possibly not work as expected if concurrent updates are made to the table.

-

Should an error occur, the process is exited with an error - tuple {error, Reason}. The reason for not returning the - error tuple is that it cannot be distinguished from a key.

+

If an error occurs, the process is exited with an error + tuple {error, Reason}. The error tuple is not returned, + as it cannot be distinguished from a key.

There are two reasons why first/1 and next/2 - should not be used: they are not very efficient, and they - prevent the use of the key '$end_of_table' since this - atom is used to indicate the end of the table. If possible, - the match, match_object, and select - functions should be used for traversing tables.

+ are not to be used: they are not efficient, and they + prevent the use of key '$end_of_table', as this atom + is used to indicate the end of the table. If possible, use functions + match, + match_object, and + select + for traversing tables.

 + Fold a function over a Dets table.

Calls Function on successive elements of - the table Name together with an extra argument - AccIn. The - order in which the elements of the table are traversed is - unspecified. Function must return a new - accumulator which is passed to the next call. - Acc0 is returned if - the table is empty.

+ table Name together with an extra argument + AccIn. The table elements are traversed in unspecified + order. Function must return a new + accumulator that is passed to the next call. + Acc0 is returned if the table is empty.

 + - Replace the objects of a Dets table with the objects of an Ets table. + Replace the objects of a Dets table with the objects + of an ETS table. -

Deletes all objects of the table Name and then - inserts all the objects of the Ets table EtsTab. - The order in which the objects are inserted is not specified. - Since ets:safe_fixtable/2 is called the Ets table must - be public or owned by the calling process.

+

Deletes all objects of table Name and then + inserts all the objects of the ETS table + EtsTab. The objects are inserted in unspecified + order. As ets:safe_fixtable/2 is called, the ETS table + must be public or owned by the calling process.

 + Return information about a Dets table. -

Returns information about the table Name - as a list of tuples:

+

Returns information about table Name + as a list of tuples:

-

{file_size, integer() >= 0}, the size of the file in - bytes.

+

{file_size, integer() >= 0}} - The file size, in + bytes.

 -

{filename, file:name()}, - the name of the file where objects are stored.

+

{filename, + file:name()} - The name of the file + where objects are stored.

 -

{keypos, keypos() - }, the position of the key.

+

{keypos, + keypos()} - The key position.

 -

{size, integer() >= 0}, the number of objects stored - in the table.

+

{size, integer() >= 0} - The number of objects + stored in the table.

 -

{type, type() - }, the type of the table.

+

{type, + type()} - The table type.

 + - Return the information associated with a given item for a Dets table. + Return the information associated with a specified item for + a Dets table.

Returns the information associated with Item - for the table Name. + for table Name. In addition to the {Item, Value} - pairs defined for info/1, the following items are - allowed:

+ pairs defined for info/1, + the following items are allowed:

-

{access, access() - }, the access mode.

+

{access, + access()} - The access mode.

{auto_save, - auto_save()}, the auto save interval.

+ auto_save()} - The autosave interval.

 -

{bchunk_format, binary()}, an opaque binary +

{bchunk_format, binary()} - An opaque binary describing the format of the objects returned by bchunk/2. The binary can be used as argument to is_compatible_chunk_format/2. Only available for version 9 tables.

 -

{hash, Hash}. Describes which BIF is - used to calculate the hash values of the objects stored in - the Dets table. Possible values of Hash are hash, - which implies that the erlang:hash/2 BIF is used, - phash, which implies that the erlang:phash/2 - BIF is used, and phash2, which implies that the - erlang:phash2/1 BIF is used.

+

{hash, Hash} - Describes which BIF is + used to calculate the hash values of the objects stored in the + dets table. Possible values of Hash:

+ + +

hash - Implies that the erlang:hash/2 BIF + is used.

+ + +

phash - Implies that the erlang:phash/2 BIF + is used.

+ + +

phash2 - Implies that the erlang:phash2/1 BIF + is used.

+ + -

{memory, integer() >= 0}, the size of the file in - bytes. The same value is associated with the item - file_size.

+

{memory, integer() >= 0} - The file size, in bytes. + The same value is associated with item file_size.

 -

{no_keys, integer >= 0()}, the number of different +

{no_keys, integer >= 0()} - The number of different keys stored in the table. Only available for version 9 tables.

 -

{no_objects, integer >= 0()}, the number of objects +

{no_objects, integer >= 0()} - The number of objects stored in the table.

 -

{no_slots, {Min, Used, Max}}, - the number of - slots of the table. Min is the minimum number of +

{no_slots, {Min, Used, Max}} - The + number of slots of the table. Min is the minimum number of slots, Used is the number of currently used slots, and Max is the maximum number of slots. Only available for version 9 tables.

 -

{owner, pid()}, the pid of the process that +

{owner, pid()} - The pid of the process that handles requests to the Dets table.

 -

{ram_file, boolean()}, whether the table is +

{ram_file, boolean()} - Whether the table is kept in RAM.

 -

{safe_fixed_monotonic_time, SafeFixed}. If the table - is fixed, SafeFixed is a tuple {FixedAtTime, [{Pid,RefCount}]}. - FixedAtTime is the time when +

{safe_fixed_monotonic_time, SafeFixed} - If the table + is fixed, SafeFixed is a tuple + {FixedAtTime, [{Pid,RefCount}]}. + FixedAtTime is the time when the table was first fixed, and Pid is the pid of the process that fixes the table RefCount times. - There may be any number of processes in the list. If the - table is not fixed, SafeFixed is the atom false.

-

FixedAtTime will correspond to the result - returned by - erlang:monotonic_time/0 - at the time of fixation. The usage of safe_fixed_monotonic_time is - time warp - safe.

+ There can be any number of processes in the list. If the table + is not fixed, SafeFixed is the atom false.

+

FixedAtTime corresponds to the result returned by + + erlang:monotonic_time/0 at the time of fixation. + The use of safe_fixed_monotonic_time is + + time warp safe.

 -

- {safe_fixed, SafeFixed}. The same as - {safe_fixed_monotonic_time, SafeFixed} with the exception - of the format and value of FixedAtTime. -

-

- FixedAtTime will correspond to the result returned by - erlang:timestamp/0 - at the time of fixation. Note that when the system is using - single or multi - time warp - modes this might produce strange results. This - since the usage of safe_fixed is not - time warp - safe. Time warp safe code need to use - safe_fixed_monotonic_time instead.

+

{safe_fixed, SafeFixed} - The same as + {safe_fixed_monotonic_time, SafeFixed} except + the format and value of FixedAtTime.

+

FixedAtTime corresponds to the result returned by + + erlang:timestamp/0 at the time of fixation. + Notice that when the system uses single or multi + time warp + modes, this can produce strange results. This is + because the use of safe_fixed is not + + time warp safe. Time warp safe code must use + safe_fixed_monotonic_time instead.

 -

{version, integer()}, the version of the format of +

{version, integer()} - The version of the format of the table.

 + Replace all objects of a Dets table. -

Replaces the existing objects of the table Name +

Replaces the existing objects of table Name with objects created by calling the input function InitFun, see below. The reason for using this function rather than - calling insert/2 is that of efficiency. It should be - noted that the input functions are called by the process that + calling insert/2 is that of efficiency. Notice + that the input functions are called by the process that handles requests to the Dets table, not by the calling process.

-

When called with the argument read the function - InitFun is assumed to return - end_of_input when - there is no more input, or {Objects, Fun}, where +

When called with argument read, function + InitFun is assumed to return end_of_input + when there is no more input, or {Objects, Fun}, where Objects is a list of objects and Fun is a new - input function. Any other value Value is returned as an error - {error, {init_fun, Value}}. Each input function will be - called exactly once, and should an error occur, the last - function is called with the argument close, the reply + input function. Any other value Value is returned as an error + {error, {init_fun, Value}}. Each input function is + called exactly once, and if an error occurs, the last + function is called with argument close, the reply of which is ignored.

-

If the type of the table is set and there is more - than one object with a given key, one of the objects is +

If the table type is set and more + than one object exists with a given key, one of the objects is chosen. This is not necessarily the last object with the given key in the sequence of objects returned by the input - functions. Duplicate keys should be avoided, or the file - will be unnecessarily fragmented. This holds also for duplicated + functions. Avoid duplicate keys, otherwise the file becomes + unnecessarily fragmented. This holds also for duplicated objects stored in tables of type bag.

It is important that the table has a sufficient number of - slots for the objects. If not, the hash list will start to - grow when init_table/2 returns which will significantly - slow down access to the table for a period of time. The - minimum number of slots is set by the open_file/2 - option min_no_slots and returned by the info/2 - item no_slots. See also the min_no_slots option - below. -

-

The Options argument is a list of - {Key, Val} - tuples where the following values are allowed:

+ slots for the objects. If not, the hash list starts to + grow when init_table/2 returns, which significantly + slows down access to the table for a period of time. The + minimum number of slots is set by the open_file/2 option + min_no_slots and returned by the info/2 + item no_slots. See also option min_no_slots below.

+

Argument Options is a list of {Key, Val} + tuples, where the following values are allowed:

-

{min_no_slots, no_slots()}. Specifies the - estimated number of different keys that will be stored - in the table. The open_file option with the same - name is ignored unless the table is created, and in that +

{min_no_slots, no_slots()} - Specifies the + estimated number of different keys to be stored + in the table. The open_file/2 option with the same + name is ignored, unless the table is created, in which case performance can be enhanced by supplying an estimate when initializing the table.

 -

{format, Format}. Specifies the format of the - objects returned by the function InitFun. If +

{format, Format} - Specifies the format of the + objects returned by function InitFun. If Format is term (the default), - InitFun is assumed to return a list of tuples. If - Format is bchunk, InitFun is + InitFun is assumed to return a list of tuples. + If Format is bchunk, InitFun is assumed to return Data as returned by bchunk/2. - This option overrides the - min_no_slots option.

+ This option overrides option min_no_slots.

 + Insert one or more objects into a Dets table. @@ -513,46 +545,50 @@ the old object will be replaced.

 + Insert one or more objects into a Dets table. -

Inserts one or more objects into the table Name. +

Inserts one or more objects into table Name. If there already exists some object with a key matching the key - of any of the given objects the table is not updated and - false is returned, otherwise the objects are inserted + of any of the specified objects, the table is not updated and + false is returned. Otherwise the objects are inserted and true returned.

 + - Test compatibility of a table's chunk data. + Test compatibility of chunk data of a table.

Returns true if it would be possible to initialize - the table Name, using - init_table/3 - with the - option {format, bchunk}, with objects read with + table Name, using + init_table/3 with + option {format, bchunk}, with objects read with bchunk/2 from some - table T such that calling + table T, such that calling info(T, bchunk_format) returns BchunkFormat.

 + Test for a Dets table. -

Returns true if the file Filename - is a Dets table, false otherwise.

+

Returns true if file Filename + is a Dets table, otherwise false.

 + - Return all objects with a given key stored in a Dets table. + Return all objects with a specified key stored in a + Dets table. -

Returns a list of all objects with the key Key - stored in the table Name. For example:

+

Returns a list of all objects with key Key + stored in table Name, for example:

 2> dets:open_file(abc, [{type, bag}]).
 {ok,abc}
@@ -561,394 +597,419 @@ ok
 4> dets:insert(abc, {1,3,4}).
 ok
 5> dets:lookup(abc, 1).
-[{1,2,3},{1,3,4}]
-

If the table is of type set, the function returns +[{1,2,3},{1,3,4}] +

If the table type is set, the function returns either the empty list or a list with one object, as there cannot be more than one object with a given key. If the table - is of type bag or duplicate_bag, the function + type is bag or duplicate_bag, the function returns a list of arbitrary length.

-

Note that the order of objects returned is unspecified. In +

Notice that the order of objects returned is unspecified. In particular, the order in which objects were inserted is not reflected.

 + - Match a chunk of objects stored in a Dets table and return a list of variable bindings. + Match a chunk of objects stored in a Dets table and + return a list of variable bindings.

Matches some objects stored in a table and returns a - non-empty list of the bindings that match a given pattern in + non-empty list of the bindings matching a specified pattern in some unspecified order. The table, the pattern, and the number of objects that are matched are all defined by - Continuation, which has been returned by a prior - call to match/1 or match/3.

-

When all objects of the table have been matched, + Continuation, which has been returned by a + previous call to match/1 or match/3.

+

When all table objects are matched, '$end_of_table' is returned.

 + - Match the objects stored in a Dets table and return a list of variable bindings. + Match the objects stored in a Dets table and return a + list of variable bindings. -

Returns for each object of the table Name that - matches Pattern a list of bindings in some unspecified - order. See ets:match/2 for a - description of patterns. If the keypos'th element of - Pattern is unbound, all objects of the table are +

Returns for each object of table Name that + matches Pattern a list of bindings in some + unspecified order. For a description of patterns, see + ets:match/2. + If the keypos'th element of + Pattern is unbound, all table objects are matched. If the keypos'th element is bound, only the - objects with the right key are matched.

+ objects with the correct key are matched.

 + - Match the first chunk of objects stored in a Dets table and return a list of variable bindings. + Match the first chunk of objects stored in a Dets table + and return a list of variable bindings. -

Matches some or all objects of the table Name and +

Matches some or all objects of table Name and returns a non-empty list of the bindings that match Pattern in some unspecified order. - See ets:match/2 for a - description of patterns.

+ For a description of patterns, see + ets:match/2.

A tuple of the bindings and a continuation is returned, unless the table is empty, in which case '$end_of_table' is returned. The continuation is to be used when matching further objects by calling match/1.

If the keypos'th element of Pattern is bound, - all objects of the table are matched. If the keypos'th element is - unbound, all objects of the table are matched, N + all table objects are matched. If the keypos'th element is + unbound, all table objects are matched, N objects at a time, until at least one object matches or the - end of the table has been reached. The default, indicated by - giving N the value default, - is to let the number - of objects vary depending on the sizes of the objects. If - Name is a version 9 table, all objects with the same - key are always matched at the same time which implies that - more than N objects may sometimes be matched. -

-

The table should always be protected using - safe_fixtable/2 before calling match/3, or - errors may occur when calling match/1.

+ end of the table is reached. The default, indicated by + giving N the value default, is to let + the number of objects vary depending on the sizes of the objects. If + Name is a version 9 table, all objects with the + same key are always matched at the same time, which implies that + more than N objects can sometimes be matched.

+

The table is always to be protected using + safe_fixtable/2 + before calling match/3, otherwise + errors can occur when calling match/1.

 + - Delete all objects that match a given pattern from a Dets table. + Delete all objects that match a given pattern from a + Dets table. -

Deletes all objects that match Pattern from the - table Name. - See ets:match/2 for a - description of patterns.

+

Deletes all objects that match Pattern from + table Name. For a description of patterns, + see ets:match/2.

If the keypos'th element of Pattern is bound, - only the objects with the right key are matched.

+ only the objects with the correct key are matched.

 + - Match a chunk of objects stored in a Dets table and return a list of objects. + Match a chunk of objects stored in a Dets table and + return a list of objects.

Returns a non-empty list of some objects stored in a table that match a given pattern in some unspecified order. The table, the pattern, and the number of objects that are matched are all defined by Continuation, which has been - returned by a prior call to match_object/1 or + returned by a previous call to match_object/1 or match_object/3.

-

When all objects of the table have been matched, +

When all table objects are matched, '$end_of_table' is returned.

 + - Match the objects stored in a Dets table and return a list of objects. + Match the objects stored in a Dets table and return + a list of objects. -

Returns a list of all objects of the table Name that +

Returns a list of all objects of table Name that match Pattern in some unspecified order. - See ets:match/2 for a - description of patterns. -

+ For a description of patterns, see + ets:match/2.

If the keypos'th element of Pattern is - unbound, all objects of the table are matched. If the + unbound, all table objects are matched. If the keypos'th element of Pattern is bound, only the - objects with the right key are matched.

+ objects with the correct key are matched.

Using the match_object functions for traversing all - objects of a table is more efficient than calling + table objects is more efficient than calling first/1 and next/2 or slot/2.

 + - Match the first chunk of objects stored in a Dets table and return a list of objects. + Match the first chunk of objects stored in a Dets table + and return a list of objects. -

Matches some or all objects stored in the table Name +

Matches some or all objects stored in table Name and returns a non-empty list of the objects that match Pattern in some unspecified order. - See ets:match/2 for a - description of patterns.

+ For a description of patterns, see + ets:match/2.

A list of objects and a continuation is returned, unless the table is empty, in which case '$end_of_table' is returned. The continuation is to be used when matching - further objects by calling match_object/1.

-

If the keypos'th element of Pattern is bound, all - objects of the table are matched. If the keypos'th element is - unbound, all objects of the table are matched, N + further objects by calling + match_object/1.

+

If the keypos'th element of Pattern is bound, + all table objects are matched. If the keypos'th element is + unbound, all table objects are matched, N objects at a time, until at least one object matches or the - end of the table has been reached. The default, indicated by - giving N the value default, is to let the number + end of the table is reached. The default, indicated by + giving N the value default, + is to let the number of objects vary depending on the sizes of the objects. If - Name is a version 9 table, all matching objects with - the same key are always returned in the same reply which - implies that more than N objects may sometimes be returned. -

-

The table should always be protected using - safe_fixtable/2 before calling match_object/3, - or errors may occur when calling match_object/1.

+ Name is a version 9 table, all matching objects + with the same key are always returned in the same reply, which implies + that more than N objects can sometimes be returned.

+

The table is always to be protected using + safe_fixtable/2 + before calling match_object/3, otherwise + errors can occur when calling match_object/1.

 + Test for occurrence of a key in a Dets table. -

Works like lookup/2, but does not return the - objects. The function returns true if one or more - elements of the table has the key Key, false - otherwise.

+

Works like lookup/2, + but does not return the objects. Returns true if one or more + table elements has key Key, otherwise + false.

 + Return the next key in a Dets table. -

Returns the key following Key1 in the table - Name according to the table's internal order, or - '$end_of_table' if there is no next key.

-

Should an error occur, the process is exited with an error +

Returns either the key following Key1 in table + Name according to the internal order of the + table, or '$end_of_table' if there is no next key.

+

If an error occurs, the process is exited with an error tuple {error, Reason}.

-

Use first/1 to find - the first key in the table.

+

To find the first key in the table, use + first/1.

 + Open an existing Dets table. -

Opens an existing table. If the table has not been properly - closed, it will be repaired. The returned reference is to be - used as the name of the table. This function is most useful - for debugging purposes.

+

Opens an existing table. If the table is not properly closed, + it is repaired. The returned reference is to be used as the table + name. This function is most useful for debugging purposes.

 + Open a Dets table.

Opens a table. An empty Dets table is created if no file exists.

-

The atom Name is the name of the table. The table +

The atom Name is the table name. The table name must be provided in all subsequent operations on the table. The name can be used by other processes as well, and - several process can share one table. -

+ many processes can share one table.

If two processes open the same table by giving the same - name and arguments, then the table will have two users. If one - user closes the table, it still remains open until the second - user closes the table.

-

The Args argument is a list of {Key, Val} - tuples where the following values are allowed:

+ name and arguments, the table has two users. If one + user closes the table, it remains open until the second + user closes it.

+

Argument Args is a list of {Key, Val} + tuples, where the following values are allowed:

{access, - access()}. It is possible to open - existing tables in read-only mode. A table which is opened + access()} - Existing tables can be + opened in read-only mode. A table that is opened in read-only mode is not subjected to the automatic file reparation algorithm if it is later opened after a crash. - The default value is read_write.

+ Defaults to read_write.

{auto_save, - auto_save()}, the auto save + auto_save()} - The autosave interval. If the interval is an integer Time, the table is flushed to disk whenever it is not accessed for Time milliseconds. A table that has been flushed - will require no reparation when reopened after an + requires no reparation when reopened after an uncontrolled emulator halt. If the interval is the atom - infinity, auto save is disabled. The default value - is 180000 (3 minutes).

+ infinity, autosave is disabled. Defaults to + 180000 (3 minutes).

{estimated_no_objects, - no_slots()}. Equivalent to the - min_no_slots option.

+ no_slots()} - Equivalent to option + min_no_slots.

{file, - file:name()}, the name of the file to be - opened. The default value is the name of the table.

+ file:name()} - The name of the file to be + opened. Defaults to the table name.

{max_no_slots, - no_slots()}, the maximum number - of slots that will be used. The default value as well as - the maximal value is 32 M. Note that a higher value may - increase the fragmentation of the table, and conversely, - that a smaller value may decrease the fragmentation, at + no_slots()} - The maximum number + of slots to be used. Defaults to 32 M, which is the + maximal value. Notice that a higher value can + increase the table fragmentation, and + a smaller value can decrease the fragmentation, at the expense of execution time. Only available for version 9 tables.

{min_no_slots, - no_slots()}. Application + no_slots()} - Application performance can be enhanced with this flag by specifying, when the table is created, the estimated number of - different keys that will be stored in the table. The - default value as well as the minimum value is 256.

+ different keys to be stored in the table. Defaults to 256, + which is the minimum value.

{keypos, - keypos()}, the position of the - element of each object to be used as key. The default - value is 1. The ability to explicitly state the key + keypos()} - The position of the + element of each object to be used as key. Defaults to 1. + The ability to explicitly state the key position is most convenient when we want to store Erlang records in which the first position of the record is the name of the record type.

 -

{ram_file, boolean()}, whether the table is to - be kept in RAM. Keeping the table in RAM may sound like an +

{ram_file, boolean()} - Whether the table is to + be kept in RAM. Keeping the table in RAM can sound like an anomaly, but can enhance the performance of applications - which open a table, insert a set of objects, and then + that open a table, insert a set of objects, and then close the table. When the table is closed, its contents - are written to the disk file. The default value is - false.

+ are written to the disk file. Defaults to false.

 -

{repair, Value}. Value can be either +

{repair, Value} - Value can be either a boolean() or the atom force. The flag - specifies whether the Dets server should invoke the - automatic file reparation algorithm. The default is - true. If false is specified, there is no - attempt to repair the file and {error, {needs_repair, - FileName}} is returned if the table needs to be - repaired.

-

The value force means that a reparation will - take place even if the table has been properly closed. + specifies if the Dets server is to invoke the + automatic file reparation algorithm. Defaults to + true. If false is specified, no attempt is + made to repair the file, and {error, {needs_repair, + FileName}} is returned if the table must be repaired.

+

Value force means that a reparation + is made even if the table is properly closed. This is how to convert tables created by older versions of STDLIB. An example is tables hashed with the deprecated - erlang:hash/2 BIF. Tables created with Dets from a - STDLIB version of 1.8.2 and later use the - erlang:phash/2 function or the - erlang:phash2/1 function, which is preferred.

-

The repair option is ignored if the table is - already open.

+ erlang:hash/2 BIF. Tables created with Dets from + STDLIB version 1.8.2 or later use function + erlang:phash/2 or function erlang:phash2/1, + which is preferred.

+

Option repair is ignored if the table is already open.

 -

{type, type()}, - the type of the table. The default value is set.

+

{type, + type()} - The table type. Defaults to + set.

{version, - version()}, the version of the format - used for the table. The default value is 9. Tables - on the format used before OTP R8 can be created by giving - the value 8. A version 8 table can be converted to - a version 9 table by giving the options {version,9} + version()} - The version of the format + used for the table. Defaults to 9. Tables on the format + used before Erlang/OTP R8 can be created by specifying value + 8. A version 8 table can be converted to a version 9 + table by specifying options {version,9} and {repair,force}.

 + Return the name of the Dets table handled by a pid. -

Returns the name of the table given the pid of a process +

Returns the table name given the pid of a process that handles requests to a table, or undefined if there is no such table.

This function is meant to be used for debugging only.

 + - Repair a continuation from select/1 or select/3. + Repair a continuation from select/1 or select/3. +

This function can be used to restore an opaque continuation - returned by select/3 or select/1 if the + returned by + select/3 or + select/1 if the continuation has passed through external term format (been sent between nodes or stored on disk).

The reason for this function is that continuation terms - contain compiled match specifications and therefore will be + contain compiled match specifications and therefore are invalidated if converted to external term format. Given that the original match specification is kept intact, the continuation can be restored, meaning it can once again be used in subsequent select/1 calls even though it has been stored on disk or on another node.

-

See also ets(3) for further explanations and - examples. -

+

For more information and examples, see the + ets(3) module.

-

This function is very rarely needed in application code. It - is used by Mnesia to implement distributed select/3 +

This function is rarely needed in application code. It is used by + application Mnesia to provide distributed select/3 and select/1 sequences. A normal application would either use Mnesia or keep the continuation from being converted to external format.

The reason for not having an external representation of - compiled match specifications is performance. It may be + compiled match specifications is performance. It can be subject to change in future releases, while this interface - will remain for backward compatibility.

+ remains for backward compatibility.

 + Fix a Dets table for safe traversal. -

If Fix is true, the table +

If Fix is true, table Name is fixed (once more) by the calling process, otherwise the table is released. The table is also released when a fixing process - terminates. -

-

If several processes fix a table, the table will remain + terminates.

+

If many processes fix a table, the table remains fixed until all processes have released it or terminated. A reference counter is kept on a per process basis, and N consecutive fixes require N releases to release the table.

It is not guaranteed that calls to first/1, - next/2, select and match functions work as expected - even if the table has been fixed; the limited support for - concurrency implemented in Ets has not yet been implemented - in Dets. Fixing a table currently only disables resizing of + next/2, or select and match functions work as expected + even if the table is fixed; the limited support for + concurrency provided by the + ets(3) module is not yet + provided by Dets. + Fixing a table currently only disables resizing of the hash list of the table.

If objects have been added while the table was fixed, the - hash list will start to grow when the table is released which - will significantly slow down access to the table for a period + hash list starts to grow when the table is released, which + significantly slows down access to the table for a period of time.

 + - Apply a match specification to some objects stored in a Dets table. + Apply a match specification to some objects stored in a + Dets table.

Applies a match specification to some objects stored in a table and returns a non-empty list of the results. The table, the match specification, and the number of objects that are matched are all defined by Continuation, - which has been returned by a prior call to select/1 - or select/3.

+ which is returned by a previous call to + select/1 or + select/3.

When all objects of the table have been matched, '$end_of_table' is returned.

 + - Apply a match specification to all objects stored in a Dets table. + Apply a match specification to all objects stored in a + Dets table. -

Returns the results of applying the match specification - MatchSpec to all or some objects stored in the table - Name. The order of the objects is not specified. See - the ERTS User's Guide for a description of match - specifications.

+

Returns the results of applying match specification + MatchSpec to all or some objects stored in table + Name. The order of the objects is not specified. + For a description of match specifications, see the + ERTS User's Guide.

If the keypos'th element of MatchSpec is unbound, the match specification is applied to all objects of the table. If the keypos'th element is bound, the match - specification is applied to the objects with the right key(s) + specification is applied to the objects with the correct key(s) only.

Using the select functions for traversing all objects of a table is more efficient than calling @@ -956,116 +1017,138 @@ ok

+ - Apply a match specification to the first chunk of objects stored in a Dets table. + Apply a match specification to the first chunk of objects + stored in a Dets table. -

Returns the results of applying the match specification - MatchSpec to some or all objects stored in the table - Name. The order of the objects is not specified. See - the ERTS User's Guide for a description of match - specifications.

+

Returns the results of applying match specification + MatchSpec to some or all objects stored in table + Name. The order of the objects is not specified. + For a description of match specifications, see the + ERTS User's Guide.

A tuple of the results of applying the match specification and a continuation is returned, unless the table is empty, in which case '$end_of_table' is returned. The - continuation is to be used when matching further objects by - calling select/1.

-

If the keypos'th element of MatchSpec is bound, the - match specification is applied to all objects of the table - with the right key(s). If the keypos'th element of + continuation is to be used when matching more objects by calling + select/1.

+

If the keypos'th element of MatchSpec is bound, + the match specification is applied to all objects of the table + with the correct key(s). If the keypos'th element of MatchSpec is unbound, the match specification is - applied to all objects of the table, N objects at a - time, until at least one object matches or the end of the - table has been reached. The default, indicated by giving - N the value default, is to let the number of - objects vary depending on the sizes of the objects. If - Name is a version 9 table, all objects with the same - key are always handled at the same time which implies that the - match specification may be applied to more than N objects. -

-

The table should always be protected using - safe_fixtable/2 before calling select/3, or - errors may occur when calling select/1.

+ applied to all objects of the table, N objects at + a time, until at least one object matches or the end of the + table is reached. The default, indicated by giving + N the value default, is to let the number + of objects vary depending on the sizes of the objects. If + Name is a version 9 table, all objects with the + same key are always handled at the same time, which implies that the + match specification can be applied to more than N + objects.

+

The table is always to be protected using + safe_fixtable/2 + before calling select/3, otherwise + errors can occur when calling select/1.

 + - Delete all objects that match a given pattern from a Dets table. + Delete all objects that match a given pattern from a + Dets table. -

Deletes each object from the table Name such that - applying the match specification MatchSpec to the - object returns the value true. See the ERTS - User's Guide for a description of match - specifications. Returns the number of deleted objects.

+

Deletes each object from table Name such that + applying match specification MatchSpec to the + object returns value true. + For a description of match specifications, see the + ERTS User's Guide. + Returns the number of deleted objects.

If the keypos'th element of MatchSpec is bound, the match specification is applied to the objects - with the right key(s) only.

+ with the correct key(s) only.

 + - Return the list of objects associated with a slot of a Dets table. + Return the list of objects associated with a slot of a + Dets table.

The objects of a table are distributed among slots, - starting with slot 0 and ending with slot n. This - function returns the list of objects associated with slot - I. If I is greater than n + starting with slot 0 and ending with slot n. + Returns the list of objects associated with slot + I. If I > n, '$end_of_table' is returned.

 + - Ensure that all updates made to a Dets table are written to disk. + Ensure that all updates made to a Dets table are written + to disk. -

Ensures that all updates made to the table Name are - written to disk. This also applies to tables which have been - opened with the ram_file flag set to true. In - this case, the contents of the RAM file are flushed to - disk.

-

Note that the space management data structures kept in RAM, - the buddy system, is also written to the disk. This may take +

Ensures that all updates made to table Name are + written to disk. This also applies to tables that have been + opened with flag ram_file set to true. In + this case, the contents of the RAM file are flushed to disk.

+

Notice that the space management data structures kept in RAM, + the buddy system, is also written to the disk. This can take some time if the table is fragmented.

 + Return a QLC query handle. -

Returns a QLC (Query List - Comprehension) query handle. The module qlc - implements a query language aimed mainly at Mnesia but Ets - tables, Dets tables, and lists are also recognized by qlc - as sources of data. Calling dets:table/1,2 is the - means to make the Dets table Name usable to qlc.

-

When there are only simple restrictions on the key position - qlc uses dets:lookup/2 to look up the keys, but when - that is not possible the whole table is traversed. The - option traverse determines how this is done:

+

Returns a Query List + Comprehension (QLC) query handle. The + qlc(3) module + provides a query language aimed mainly for Mnesia, but + ETS tables, Dets tables, and lists are also recognized + by qlc as sources of data. Calling + dets:table/1,2 is the + means to make Dets table Name usable to + qlc.

+

When there are only simple restrictions on the key position, + qlc uses + dets:lookup/2 + to look up the keys. When + that is not possible, the whole table is traversed. + Option traverse determines how this is done:

-

first_next. The table is traversed one key at - a time by calling dets:first/1 and - dets:next/2.

+

first_next - The table is traversed one key at + a time by calling dets:first/1 and dets:next/2.

 -

select. The table is traversed by calling - dets:select/3 and dets:select/1. The option - n_objects determines the number of objects +

select - The table is traversed by calling + dets:select/3 and + dets:select/1. + Option n_objects determines the number of objects returned (the third argument of select/3). The match specification (the second argument of - select/3) is assembled by qlc: simple filters are - translated into equivalent match specifications while - more complicated filters have to be applied to all - objects returned by select/3 given a match - specification that matches all objects.

+ select/3) is assembled by qlc:

+ + +

Simple filters are translated into equivalent match + specifications.

+ + +

More complicated filters must be applied to all + objects returned by select/3 given a match + specification that matches all objects.

+ +

{select, - match_spec()}. As for select + match_spec()} - As for select, the table is traversed by calling dets:select/3 and dets:select/1. The difference is that the - match specification is explicitly given. This is how to + match specification is specified explicitly. This is how to state match specifications that cannot easily be expressed within the syntax provided by qlc.

 @@ -1076,70 +1159,79 @@ ok 1> dets:open_file(t, []), ok = dets:insert(t, [{1,a},{2,b},{3,c},{4,d}]), MS = ets:fun2ms(fun({X,Y}) when (X > 1) or (X < 5) -> {Y} end), -QH1 = dets:table(t, [{traverse, {select, MS}}]). +QH1 = dets:table(t, [{traverse, {select, MS}}]).

An example with implicit match specification:

-2> QH2 = qlc:q([{Y} || {X,Y} <- dets:table(t), (X > 1) or (X < 5)]).
-

The latter example is in fact equivalent to the former which - can be verified using the function qlc:info/1:

+2> QH2 = qlc:q([{Y} || {X,Y} <- dets:table(t), (X > 1) or (X < 5)]). +

The latter example is equivalent to the former, which + can be verified using function qlc:info/1:

 3> qlc:info(QH1) =:= qlc:info(QH2).
-true
-

qlc:info/1 returns information about a query handle, - and in this case identical information is returned for the +true +

qlc:info/1 returns information about a query handle. + In this case identical information is returned for the two query handles.

 + - Insert all objects of a Dets table into an Ets table. + Insert all objects of a Dets table into an ETS + table. -

Inserts the objects of the Dets table Name into the - Ets table EtsTab. The order in which the objects are - inserted is not specified. The existing objects of the Ets +

Inserts the objects of the Dets table Name + into the ETS table EtsTab. The order in + which the objects are + inserted is not specified. The existing objects of the ETS table are kept unless overwritten.

 + - Apply a function to all or some objects stored in a Dets table. + Apply a function to all or some objects stored in a Dets + table. -

Applies Fun to each object stored in the table - Name in some unspecified order. Different actions are +

Applies Fun to each object stored in table + Name in some unspecified order. Different + actions are taken depending on the return value of Fun. The following Fun return values are allowed:

continue

Continue to perform the traversal. For example, the - following function can be used to print out the contents + following function can be used to print the contents of a table:

-fun(X) -> io:format("~p~n", [X]), continue end.
+fun(X) -> io:format("~p~n", [X]), continue end. {continue, Val} -

Continue the traversal and accumulate Val. The - following function is supplied in order to collect all - objects of a table in a list:

+

Continue the traversal and accumulate Val. + The following function is supplied to collect all + objects of a table in a list:

-fun(X) -> {continue, X} end.
+fun(X) -> {continue, X} end. {done, Value} -

Terminate the traversal and return [Value | Acc].

+

Terminate the traversal and return + [Value | Acc].

 -

Any other value OtherValue returned by Fun terminates the - traversal and is immediately returned. -

+

Any other value OtherValue returned by + Fun terminates the + traversal and is returned immediately.

 + - Update a counter object stored in a Dets table. + Update a counter object stored in a Dets table. + -

Updates the object with key Key stored in the +

Updates the object with key Key stored in table Name of type set by adding Incr to the element at the Pos:th position. @@ -1148,7 +1240,7 @@ fun(X) -> {continue, X} end. following the key is updated.

This functions provides a way of updating a counter, without having to look up an object, update the object by - incrementing an element and insert the resulting object into + incrementing an element, and insert the resulting object into the table again.

 @@ -1156,8 +1248,9 @@ fun(X) -> {continue, X} end.
See Also -

ets(3), - mnesia(3), - qlc(3)

+

ets(3), + mnesia(3), + qlc(3)

 + diff --git a/lib/stdlib/doc/src/dict.xml b/lib/stdlib/doc/src/dict.xml index 20bab99a9c..c926ff1b5b 100644 --- a/lib/stdlib/doc/src/dict.xml +++ b/lib/stdlib/doc/src/dict.xml @@ -29,12 +29,13 @@ B
dict - Key-Value Dictionary + Key-value dictionary. -

Dict implements a Key - Value dictionary. +

This module provides a Key-Value dictionary. The representation of a dictionary is not defined.

-

This module provides exactly the same interface as the module - orddict. One difference is that while this module +

This module provides the same interface as the + orddict(3) module. + One difference is that while this module considers two keys as different if they do not match (=:=), orddict considers two keys as different if and only if they do not compare equal (==).

@@ -43,211 +44,241 @@ -

Dictionary as returned by new/0.

 +

Dictionary as returned by + new/0.

+ + - Append a value to keys in a dictionary + Append a value to keys in a dictionary. -

This function appends a new Value to the current list +

Appends a new Value to the current list of values associated with Key.

+

See also section Notes.

 + - Append new values to keys in a dictionary + Append new values to keys in a dictionary. -

This function appends a list of values ValList to +

Appends a list of values ValList to the current list of values associated with Key. An exception is generated if the initial value associated with Key is not a list of values.

+

See also section Notes.

 + - Erase a key from a dictionary + Erase a key from a dictionary. -

This function erases all items with a given key from a - dictionary.

+

Erases all items with a given key from a dictionary.

 + - Look-up values in a dictionary + Look up values in a dictionary. -

This function returns the value associated with Key - in the dictionary Dict. fetch assumes that - the Key is present in the dictionary and an exception +

Returns the value associated with Key + in dictionary Dict. This function assumes that + Key is present in dictionary Dict, + and an exception is generated if Key is not in the dictionary.

+

See also section Notes.

 + - Return all keys in a dictionary + Return all keys in a dictionary. -

This function returns a list of all keys in the dictionary.

+

Returns a list of all keys in dictionary Dict.

 + - Choose elements which satisfy a predicate + Select elements that satisfy a predicate.

Dict2 is a dictionary of all keys and values in - Dict1 for which Pred(Key, Value) is true.

+ Dict1 for which + Pred(Key, Value) is + true.

 + - Search for a key in a dictionary + Search for a key in a dictionary. -

This function searches for a key in a dictionary. Returns - {ok, Value} where Value is the value associated - with Key, or error if the key is not present in - the dictionary.

+

Searches for a key in dictionary Dict. Returns + {ok, Value}, where Value is + the value associated with Key, or error + if the key is not present in the dictionary.

+

See also section Notes.

 + - Fold a function over a dictionary + Fold a function over a dictionary.

Calls Fun on successive keys and values of - Dict together with an extra argument Acc + dictionary Dict together with an extra argument + Acc (short for accumulator). Fun must return a new - accumulator which is passed to the next call. Acc0 is - returned if the dict is empty. The evaluation order is + accumulator that is passed to the next call. Acc0 + is returned if the dictionary is empty. The evaluation order is undefined.

 + - Convert a list of pairs to a dictionary + Convert a list of pairs to a dictionary. -

This function converts the Key - Value list - List to a dictionary.

+

Converts the Key-Value list + List to dictionary Dict.

 + + + + Return true if the dictionary is empty. + +

Returns true if dictionary Dict has no + elements, otherwise false.

+ + + - Test if a key is in a dictionary + Test if a key is in a dictionary. -

This function tests if Key is contained in - the dictionary Dict.

+

Tests if Key is contained in + dictionary Dict.

 + - Map a function over a dictionary + Map a function over a dictionary. -

map calls Fun on successive keys and values - of Dict1 to return a new value for each key. - The evaluation order is undefined.

+

Calls Fun on successive keys and values + of dictionary Dict1 to return a new value for + each key. The evaluation order is undefined.

 + - Merge two dictionaries + Merge two dictionaries. -

merge merges two dictionaries, Dict1 and - Dict2, to create a new dictionary. All the Key - - Value pairs from both dictionaries are included in - the new dictionary. If a key occurs in both dictionaries then - Fun is called with the key and both values to return a - new value. merge could be defined as:

+

Merges two dictionaries, Dict1 and + Dict2, to create a new dictionary. All the + Key-Value pairs from both + dictionaries are included in the new dictionary. If a key occurs + in both dictionaries, Fun is called with the + key and both values to return a new value. + merge can be defined as follows, but is faster:

merge(Fun, D1, D2) -> fold(fun (K, V1, D) -> update(K, fun (V2) -> Fun(K, V1, V2) end, V1, D) end, D2, D1). -

but is faster.

 + - Create a dictionary + Create a dictionary. -

This function creates a new dictionary.

+

Creates a new dictionary.

 + - Return the number of elements in a dictionary + Return the number of elements in a dictionary. -

Returns the number of elements in a Dict.

- - - - - Return true if the dictionary is empty - -

Returns true if Dict has no elements, false otherwise.

+

Returns the number of elements in dictionary + Dict.

 + - Store a value in a dictionary + Store a value in a dictionary. -

This function stores a Key - Value pair in a - dictionary. If the Key already exists in Dict1, +

Stores a Key-Value pair in + dictionary Dict2. If Key already exists in + Dict1, the associated value is replaced by Value.

 + - Convert a dictionary to a list of pairs + Convert a dictionary to a list of pairs. -

This function converts the dictionary to a list - representation.

+

Converts dictionary Dict to a list representation.

 + - Update a value in a dictionary + Update a value in a dictionary. -

Update a value in a dictionary by calling Fun on - the value to get a new value. An exception is generated if +

Updates a value in a dictionary by calling Fun on + the value to get a new value. An exception is generated if Key is not present in the dictionary.

 + - Update a value in a dictionary + Update a value in a dictionary. -

Update a value in a dictionary by calling Fun on - the value to get a new value. If Key is not present - in the dictionary then Initial will be stored as - the first value. For example append/3 could be defined - as:

+

Updates a value in a dictionary by calling Fun on + the value to get a new value. If Key is not + present in the dictionary, Initial is stored as + the first value. For example, append/3 can be defined as:

append(Key, Val, D) -> update(Key, fun (Old) -> Old ++ [Val] end, [Val], D). + - Increment a value in a dictionary + Increment a value in a dictionary. -

Add Increment to the value associated with Key - and store this value. If Key is not present in - the dictionary then Increment will be stored as - the first value.

-

This could be defined as:

+

Adds Increment to the value associated with + Key and stores this value. + If Key is not present in the dictionary, + Increment is stored as the first value.

+

This can be defined as follows, but is faster:

update_counter(Key, Incr, D) -> update(Key, fun (Old) -> Old + Incr end, Incr, D). -

but is faster.
Notes -

The functions append and append_list are included - so we can store keyed values in a list accumulator. For + +

Functions append and append_list are included + so that keyed values can be stored in a list accumulator, for example:

 > D0 = dict:new(),
@@ -256,19 +287,18 @@ update_counter(Key, Incr, D) ->
   D3 = dict:append(files, f2, D2),
   D4 = dict:append(files, f3, D3),
   dict:fetch(files, D4).
-[f1,f2,f3]
+[f1,f2,f3]

This saves the trouble of first fetching a keyed value, appending a new value to the list of stored values, and storing - the result. -

-

The function fetch should be used if the key is known to - be in the dictionary, otherwise find.

+ the result.

+

Function fetch is to be used if the key is known to + be in the dictionary, otherwise function find.

See Also -

gb_trees(3), - orddict(3)

+

gb_trees(3), + orddict(3)

 diff --git a/lib/stdlib/doc/src/digraph.xml b/lib/stdlib/doc/src/digraph.xml index 1bb8eef247..5332d7aba5 100644 --- a/lib/stdlib/doc/src/digraph.xml +++ b/lib/stdlib/doc/src/digraph.xml @@ -30,64 +30,92 @@ 2001-08-27 C - digraph.sgml + digraph.xml
digraph - Directed Graphs + Directed graphs. -

The digraph module implements a version of labeled - directed graphs. What makes the graphs implemented here +

This module provides a version of labeled + directed graphs. What makes the graphs provided here non-proper directed graphs is that multiple edges between vertices are allowed. However, the customary definition of - directed graphs will be used in the text that follows. -

-

A directed graph (or just - "digraph") is a pair (V, E) of a finite set V of - vertices and a finite set E of - directed edges (or just "edges"). - The set of - edges E is a subset of V × V (the Cartesian - product of V with itself). In this module, V is allowed to be - empty; the so obtained unique digraph is called the - empty digraph. - Both vertices and edges are represented by unique Erlang terms. -

-

Digraphs can be annotated with additional information. Such - information may be attached to the vertices and to the edges of - the digraph. A digraph which has been annotated is called a - labeled digraph, and the information attached to a - vertex or an edge is called a - label. Labels are Erlang terms. -

-

An edge e = (v, w) is said to - emanate from vertex v and - to be incident on vertex w. - The out-degree of a vertex - is the number of edges emanating from that vertex. - The in-degree of a vertex - is the number of edges incident on that vertex. - If there is an edge emanating from v and incident on w, then w is - said to be an - out-neighbour of v, and v is said to be an - in-neighbour of w. - A path P from v[1] to v[k] - in a digraph (V, E) is a non-empty sequence - v[1], v[2], ..., v[k] of vertices in V such that - there is an edge (v[i],v[i+1]) in E for - 1 <= i < k. - The length of the path P is k-1. - P is simple if all - vertices are distinct, except that the first and the last vertices - may be the same. - P is a cycle if the length - of P is not zero and v[1] = v[k]. - A loop is a cycle of length one. - A simple cycle is a path - that is both a cycle and simple. - An acyclic digraph - is a digraph that has no cycles. -

+ directed graphs is used here.

+ + + +

A directed graph (or just + "digraph") is a pair (V, E) of a finite set V of + vertices and a finite set E of + directed edges (or just "edges"). + The set of edges E is a subset of V × V (the + Cartesian product of V with itself).

+

In this module, V is allowed to be empty. The so obtained unique + digraph is called the + empty digraph. Both + vertices and edges are represented by unique Erlang terms.

+ + +

Digraphs can be annotated with more information. Such information + can be attached to the vertices and to the edges of the digraph. An + annotated digraph is called a labeled digraph, and the + information attached to a vertex or an edge is called a + label. Labels are Erlang + terms.

+ + +

An edge e = (v, w) is said to + emanate from vertex v and to + be incident on vertex w.

+ + +

The out-degree of a vertex + is the number of edges emanating from that vertex.

+ + +

The in-degree of a vertex + is the number of edges incident on that vertex.

+ + +

If an edge is emanating from v and incident on w, then w is + said to be an + out-neighbor of v, and v is said to be an + in-neighbor of w.

+ + +

A path P from v[1] to v[k] + in a digraph (V, E) is a non-empty sequence + v[1], v[2], ..., v[k] of vertices in V such that + there is an edge (v[i],v[i+1]) in E for + 1 <= i < k.

+ + +

The length of path P is + k-1.

+ + +

Path P is simple if all + vertices are distinct, except that the first and the last vertices + can be the same.

+ + +

Path P is a cycle if the + length of P is not zero and v[1] = v[k].

+ + +

A loop is a cycle of length + one.

+ + +

A simple cycle is a path + that is both a cycle and simple.

+ + +

An acyclic digraph + is a digraph without cycles.

+ + + @@ -100,7 +128,8 @@ -

A digraph as returned by new/0,1.

 +

A digraph as returned by + new/0,1.

 edge() @@ -112,6 +141,7 @@ vertex() + @@ -120,291 +150,313 @@ Add an edge to a digraph. -

add_edge/5 creates (or modifies) the edge E - of the digraph G, using Label as the (new) - label of the edge. The +

add_edge/5 creates (or modifies) edge E + of digraph G, using Label as + the (new) label of the edge. The edge is emanating from - V1 and incident - on V2. Returns E. -

-

add_edge(G, V1, V2, Label) is - equivalent to + V1 and + incident + on V2. Returns E.

+

add_edge(G, V1, V2, Label) + is equivalent to add_edge(G, E, V1, V2, Label), where E is a created edge. The created edge is - represented by the term ['$e' | N], where N - is an integer >= 0. -

-

add_edge(G, V1, V2) is equivalent to + represented by term ['$e' | N], where N + is an integer >= 0.

+

add_edge(G, V1, V2) + is equivalent to add_edge(G, V1, V2, []). -

-

If the edge would create a cycle in - an acyclic digraph, - then {error, {bad_edge, Path}} is returned. If - either of V1 or V2 is not a vertex of the - digraph G, then +

+

If the edge would create a cycle in + an acyclic digraph, + {error, {bad_edge, Path}} is returned. + If either of V1 or V2 is not + a vertex of digraph G, {error, {bad_vertex, V}} is returned, V = V1 or - V = V2. -

+ V = V2.

 + Add or modify a vertex of a digraph. -

add_vertex/3 creates (or modifies) the vertex V - of the digraph G, using Label as the (new) +

add_vertex/3 creates (or modifies) vertex + V of digraph G, using + Label as the (new) label of the - vertex. Returns V. -

-

add_vertex(G, V) is equivalent to - add_vertex(G, V, []). -

+ vertex. Returns V.

+

add_vertex(G, V) is equivalent + to add_vertex(G, V, []). +

add_vertex/1 creates a vertex using the empty list as label, and returns the created vertex. The created vertex - is represented by the term ['$v' | N], - where N is an integer >= 0. -

+ is represented by term ['$v' | N], + where N is an integer >= 0.

 + Delete an edge from a digraph. -

Deletes the edge E from the digraph G. -

+

Deletes edge E from digraph + G.

 + Delete edges from a digraph. -

Deletes the edges in the list Edges from the digraph - G. -

+

Deletes the edges in list Edges from digraph + G.

 + Delete paths from a digraph. -

Deletes edges from the digraph G until there are no - paths from the vertex - V1 to the vertex V2. -

-

A sketch of the procedure employed: Find an arbitrary - simple path - v[1], v[2], ..., v[k] from V1 to - V2 in G. Remove all edges of - G emanating from v[i] - and incident to v[i+1] for - 1 <= i < k (including multiple - edges). Repeat until there is no path between V1 and - V2. -

+

Deletes edges from digraph G until there are no + paths from vertex + V1 to vertex V2.

+

A sketch of the procedure employed:

+ + +

Find an arbitrary + simple path + v[1], v[2], ..., v[k] from V1 + to V2 in G.

+ + +

Remove all edges of G + emanating from v[i] and + incident to v[i+1] for + 1 <= i < k (including multiple + edges).

+ + +

Repeat until there is no path between V1 + and V2.

+ + + Delete a vertex from a digraph. -

Deletes the vertex V from the digraph G. Any - edges emanating from - V or incident - on V are also deleted. -

+

Deletes vertex V from digraph + G. Any edges + emanating from + V or + incident + on V are also deleted.

 + Delete vertices from a digraph. -

Deletes the vertices in the list Vertices from the - digraph G. -

+

Deletes the vertices in list Vertices from + digraph G.

 + Delete a digraph. -

Deletes the digraph G. This call is important - because digraphs are implemented with ETS. There is - no garbage collection of ETS tables. The digraph - will, however, be deleted if the process that created the - digraph terminates. -

+

Deletes digraph G. This call is important + as digraphs are implemented with ETS. There is + no garbage collection of ETS tables. However, the digraph + is deleted if the process that created the digraph terminates.

 + - Return the vertices and the label of an edge of a digraph. + Return the vertices and the label of an edge of a digraph. + -

Returns {E, V1, V2, Label} where - Label is the label - of the edge - E emanating from - V1 and incident on - V2 of the digraph G. - If there is no edge E of the - digraph G, then false is returned. -

+

Returns + {E, V1, V2, Label}, + where Label is the + label of edge + E emanating + from V1 and + incident on + V2 of digraph G. + If no edge E of + digraph G exists, false is returned.

 + Return all edges of a digraph. -

Returns a list of all edges of the digraph G, in - some unspecified order. -

+

Returns a list of all edges of digraph G, in + some unspecified order.

 + - Return the edges emanating from or incident on a vertex of a digraph. + Return the edges emanating from or incident on a vertex of + a digraph. -

Returns a list of all - edges emanating from - or incident on V - of the digraph G, in some unspecified order.

+

Returns a list of all + edges emanating from or + incident onV + of digraph G, in some unspecified order.

 + Find one cycle in a digraph. -

If there is - a simple cycle of - length two or more through the vertex - V, then the cycle is returned as a list - [V, ..., V] of vertices, otherwise if there - is a loop through - V, then the loop is returned as a list [V]. If - there are no cycles through V, then false is - returned. -

-

get_path/3 is used for finding a simple cycle - through V. -

+

If a simple cycle of + length two or more exists through vertex V, the + cycle is returned as a list + [V, ..., V] of vertices. + If a loop through + V exists, the loop is returned as a list + [V]. If no cycles through + V exist, false is returned.

+

get_path/3 is used + for finding a simple cycle through V.

 + Find one path in a digraph. -

Tries to find - a simple path from - the vertex V1 to the vertex - V2 of the digraph G. Returns the path as a - list [V1, ..., V2] of vertices, or - false if no simple path from V1 to V2 - of length one or more exists. -

-

The digraph G is traversed in a depth-first manner, - and the first path found is returned. -

+

Tries to find + a simple path from vertex + V1 to vertex V2 of digraph + G. Returns the path as a list + [V1, ..., V2] of vertices, + or false if no simple path from V1 to + V2 of length one or more exists.

+

Digraph G is traversed in a depth-first manner, + and the first found path is returned.

 + Find one short cycle in a digraph. -

Tries to find an as short as - possible simple cycle through - the vertex V of the digraph G. Returns the cycle - as a list [V, ..., V] of vertices, or +

Tries to find an as short as possible + simple cycle through + vertex V of digraph G. Returns the cycle + as a list [V, ..., V] + of vertices, or false if no simple cycle through V exists. - Note that a loop through - V is returned as the list [V, V]. -

-

get_short_path/3 is used for finding a simple cycle - through V. -

+ Notice that a loop through + V is returned as list + [V, V].

+

get_short_path/3 + is used for finding a simple cycle through V.

 + Find one short path in a digraph. -

Tries to find an as short as - possible simple path from - the vertex V1 to the vertex V2 of the digraph G. - Returns the path as a list [V1, ..., V2] of - vertices, or false if no simple path from V1 - to V2 of length one or more exists. -

-

The digraph G is traversed in a breadth-first - manner, and the first path found is returned. -

+

Tries to find an as short as possible + simple path from vertex + V1 to vertex V2 of digraph + G. Returns the path as a list + [V1, ..., V2] of + vertices, or false if no simple path from + V1 + to V2 of length one or more exists.

+

Digraph G is traversed in a breadth-first + manner, and the first found path is returned.

 + Return the in-degree of a vertex of a digraph. -

Returns the in-degree of the vertex - V of the digraph G. -

+

Returns the in-degree of + vertex V of digraph G.

 + - Return all edges incident on a vertex of a digraph. + Return all edges incident on a vertex of a digraph. -

Returns a list of all - edges incident on - V of the digraph G, in some unspecified order. -

+

Returns a list of all + edges incident on + V of digraph G, + in some unspecified order.

 + - Return all in-neighbours of a vertex of a digraph. + Return all in-neighbors of a vertex of a digraph. -

Returns a list of - all in-neighbours of - V of the digraph G, in some unspecified order. -

+

Returns a list of + all in-neighbors of + V of digraph G, + in some unspecified order.

 + Return information about a digraph. -

Returns a list of {Tag, Value} pairs describing the - digraph G. The following pairs are returned: -

+

Returns a list of {Tag, Value} pairs describing + digraph G. The following pairs are returned:

-

{cyclicity, Cyclicity}, where Cyclicity +

{cyclicity, Cyclicity}, where + Cyclicity is cyclic or acyclic, according to the options given to new.

 -

{memory, NoWords}, where NoWords is - the number of words allocated to the ETS tables.

+

{memory, NoWords}, where + NoWords is + the number of words allocated to the ETS tables.

 -

{protection, Protection}, where Protection +

{protection, Protection}, where + Protection is protected or private, according to the options given to new.

 + - Return a protected empty digraph, where cycles are allowed. + Return a protected empty digraph, where cycles are allowed. + -

Equivalent to new([]). -

+

Equivalent to new([]).

 + Create a new empty digraph. @@ -413,97 +465,103 @@ -

Returns - an empty digraph with - properties according to the options in Type:

+

Returns + an empty digraph with + properties according to the options in Type:

cyclic - Allow cycles in the - digraph (default). +

Allows cycles in the + digraph (default).

 acyclic - The digraph is to be kept acyclic. +

The digraph is to be kept + acyclic.

 protected - Other processes can read the digraph (default). +

Other processes can read the digraph (default).

 private - The digraph can be read and modified by the creating - process only. +

The digraph can be read and modified by the creating + process only.

 -

If an unrecognized type option T is given or Type - is not a proper list, there will be a badarg exception. -

+

If an unrecognized type option T is specified or + Type + is not a proper list, a badarg exception is raised.

 + - Return the number of edges of the a digraph. + Return the number of edges of a digraph. -

Returns the number of edges of the digraph G. -

+

Returns the number of edges of digraph G.

 + Return the number of vertices of a digraph. -

Returns the number of vertices of the digraph G. -

+

Returns the number of vertices of digraph G.

 + Return the out-degree of a vertex of a digraph. -

Returns the out-degree of the vertex - V of the digraph G. -

+

Returns the out-degree of + vertex V of digraph G.

 + - Return all edges emanating from a vertex of a digraph. + Return all edges emanating from a vertex of a digraph. + -

Returns a list of all - edges emanating from - V of the digraph G, in some unspecified order. -

+

Returns a list of all + edges emanating from + V of digraph G, + in some unspecified order.

 + - Return all out-neighbours of a vertex of a digraph. + Return all out-neighbors of a vertex of a digraph.

Returns a list of - all out-neighbours of - V of the digraph G, in some unspecified order. -

+ all out-neighbors of + V of digraph G, + in some unspecified order.

 + Return the label of a vertex of a digraph. -

Returns {V, Label} where Label is the +

Returns {V, Label}, + where Label is the label of the vertex - V of the digraph G, or false if there - is no vertex V of the digraph G. -

+ V of digraph G, + or false if no vertex V + of digraph G exists.

 + Return all vertices of a digraph. -

Returns a list of all vertices of the digraph G, in - some unspecified order. -

+

Returns a list of all vertices of digraph G, in + some unspecified order.
See Also -

digraph_utils(3), - ets(3)

+

digraph_utils(3), + ets(3)

 diff --git a/lib/stdlib/doc/src/digraph_utils.xml b/lib/stdlib/doc/src/digraph_utils.xml index e481711c50..cb316e5b93 100644 --- a/lib/stdlib/doc/src/digraph_utils.xml +++ b/lib/stdlib/doc/src/digraph_utils.xml @@ -24,100 +24,132 @@ digraph_utils Hans Bolinder - nobody + - nobody - no + + 2001-08-27 PA1 - digraph_utils.sgml + digraph_utils.xml
digraph_utils - Algorithms for Directed Graphs + Algorithms for directed graphs. -

The digraph_utils module implements some algorithms - based on depth-first traversal of directed graphs. See the - digraph module for basic functions on directed graphs. -

-

A directed graph (or - just "digraph") is a pair (V, E) of a finite set V of - vertices and a finite set E - of directed edges (or just - "edges"). The set of edges E is a subset of V × V - (the Cartesian product of V with itself). -

-

Digraphs can be annotated with additional information. Such - information may be attached to the vertices and to the edges of - the digraph. A digraph which has been annotated is called a - labeled digraph, and the information attached to a - vertex or an edge is called a - label.

-

An edge e = (v, w) is said - to emanate from vertex v and - to be incident on vertex w. - If there is an edge emanating from v and incident on w, then w is - said to be - an out-neighbour of v, - and v is said to be - an in-neighbour of w. - A path P from v[1] to v[k] in a - digraph (V, E) is a non-empty sequence - v[1], v[2], ..., v[k] of vertices in V such that - there is an edge (v[i],v[i+1]) in E for - 1 <= i < k. - The length of the path P is k-1. - P is a cycle if the length of P - is not zero and v[1] = v[k]. - A loop is a cycle of length one. - An acyclic digraph is - a digraph that has no cycles. -

+

This module provides algorithms based on depth-first traversal of + directed graphs. For basic functions on directed graphs, see the + digraph(3) module.

-

A depth-first - traversal of a directed digraph can be viewed as a process - that visits all vertices of the digraph. Initially, all vertices - are marked as unvisited. The traversal starts with an - arbitrarily chosen vertex, which is marked as visited, and - follows an edge to an unmarked vertex, marking that vertex. The - search then proceeds from that vertex in the same fashion, until - there is no edge leading to an unvisited vertex. At that point - the process backtracks, and the traversal continues as long as - there are unexamined edges. If there remain unvisited vertices - when all edges from the first vertex have been examined, some - hitherto unvisited vertex is chosen, and the process is - repeated. -

-

A partial ordering of - a set S is a transitive, antisymmetric and reflexive relation - between the objects of S. The problem - of topological sorting is to - find a total - ordering of S that is a superset of the partial ordering. A - digraph G = (V, E) is equivalent to a relation E - on V (we neglect the fact that the version of directed graphs - implemented in the digraph module allows multiple edges - between vertices). If the digraph has no cycles of length two or - more, then the reflexive and transitive closure of E is a - partial ordering. -

-

A subgraph G' of G is a - digraph whose vertices and edges form subsets of the vertices - and edges of G. G' is maximal with respect to a - property P if all other subgraphs that include the vertices of - G' do not have the property P. A strongly connected - component is a maximal subgraph such that there is a path - between each pair of vertices. A connected component is a - maximal subgraph such that there is a path between each pair of - vertices, considering all edges undirected. An arborescence is an acyclic - digraph with a vertex V, the root, such that there is a unique - path from V to every other vertex of G. A tree is an acyclic non-empty digraph - such that there is a unique path between every pair of vertices, - considering all edges undirected.

+ + +

A directed graph (or just + "digraph") is a pair (V, E) of a finite set V of + vertices and a finite set E of + directed edges (or just "edges"). + The set of edges E is a subset of V × V (the + Cartesian product of V with itself).

+ + +

Digraphs can be annotated with more information. Such information + can be attached to the vertices and to the edges of the digraph. An + annotated digraph is called a labeled digraph, and the + information attached to a vertex or an edge is called a + label.

+ + +

An edge e = (v, w) is said to + emanate from vertex v and to + be incident on vertex w.

+ + +

If an edge is emanating from v and incident on w, then w is + said to be an + out-neighbor of v, and v is said to be an + in-neighbor of w.

+ + +

A path P from v[1] to v[k] + in a digraph (V, E) is a non-empty sequence + v[1], v[2], ..., v[k] of vertices in V such that + there is an edge (v[i],v[i+1]) in E for + 1 <= i < k.

+ + +

The length of path P is + k-1.

+ + +

Path P is a cycle if the + length of P is not zero and v[1] = v[k].

+ + +

A loop is a cycle of length + one.

+ + +

An acyclic digraph + is a digraph without cycles.

+ + +

A depth-first + traversal of a directed digraph can be viewed as a process + that visits all vertices of the digraph. Initially, all vertices + are marked as unvisited. The traversal starts with an + arbitrarily chosen vertex, which is marked as visited, and + follows an edge to an unmarked vertex, marking that vertex. The + search then proceeds from that vertex in the same fashion, until + there is no edge leading to an unvisited vertex. At that point + the process backtracks, and the traversal continues as long as + there are unexamined edges. If unvisited vertices remain + when all edges from the first vertex have been examined, some + so far unvisited vertex is chosen, and the process is repeated.

+ + +

A partial ordering + of a set S is a transitive, antisymmetric, and reflexive relation + between the objects of S.

+ + +

The problem of + topological sorting is to find + a total ordering of S that is a superset of the partial ordering. A + digraph G = (V, E) is equivalent to a relation E + on V (we neglect that the version of directed graphs + provided by the digraph module allows multiple edges + between vertices). If the digraph has no cycles of length two or + more, the reflexive and transitive closure of E is a + partial ordering.

+ + +

A subgraph G' of G is a + digraph whose vertices and edges form subsets of the vertices + and edges of G.

+ + +

G' is maximal with respect to a property P if all other + subgraphs that include the vertices of G' do not have property P.

+ + +

A strongly connected + component is a maximal subgraph such that there is a path + between each pair of vertices.

+ + +

A connected component + is a maximal subgraph such that there is a path between each pair of + vertices, considering all edges undirected.

+ + +

An arborescence is an + acyclic digraph with a vertex V, the + root, such that there is a unique + path from V to every other vertex of G.

+ + +

A tree is an acyclic non-empty + digraph such that there is a unique path between every pair of + vertices, considering all edges undirected.

+ + @@ -125,237 +157,253 @@ Check if a digraph is an arborescence. -

Returns {yes, Root} if Root is - the root of the arborescence - Digraph, no otherwise. -

+

Returns {yes, Root} if Root + is the root of the arborescence + Digraph, otherwise no.

 + Return the components of a digraph. -

Returns a list - of connected components. - Each component is represented by its +

Returns a list + of connected components.. + Each component is represented by its vertices. The order of the vertices and the order of the - components are arbitrary. Each vertex of the digraph - Digraph occurs in exactly one component. -

+ components are arbitrary. Each vertex of digraph + Digraph occurs in exactly one component.

 + Return a condensed graph of a digraph. -

Creates a digraph where the vertices are - the strongly connected - components of Digraph as returned by - strong_components/1. If X and Y are two different strongly - connected components, and there exist vertices x and y in X - and Y respectively such that there is an - edge emanating from x - and incident on y, then - an edge emanating from X and incident on Y is created. -

+

Creates a digraph where the vertices are + the strongly connected + components of Digraph as returned by + + strong_components/1. + If X and Y are two different strongly + connected components, and vertices x and y exist in X + and Y, respectively, such that there is an + edge emanating from x + and incident on y, then + an edge emanating from X and incident on Y is created.

The created digraph has the same type as Digraph. - All vertices and edges have the - default label []. -

-

Each and every cycle is - included in some strongly connected component, which implies - that there always exists - a topological ordering of the - created digraph.

+ All vertices and edges have the + default label [].

+

Each cycle is + included in some strongly connected component, which implies that + a topological ordering of the + created digraph always exists.

 + Return the cyclic strong components of a digraph. -

Returns a list of strongly - connected components. - Each strongly component is represented +

Returns a list of strongly + connected components. Each strongly component is represented by its vertices. The order of the vertices and the order of the components are arbitrary. Only vertices that are included in some cycle in - Digraph are returned, otherwise the returned list is - equal to that returned by strong_components/1. -

+ Digraph are returned, otherwise the returned + list is equal to that returned by + + strong_components/1.

 + Check if a digraph is acyclic. -

Returns true if and only if the digraph - Digraph is acyclic.

+

Returns true if and only if digraph + Digraph is + acyclic.

 + Check if a digraph is an arborescence. -

Returns true if and only if the digraph +

Returns true if and only if digraph Digraph is an arborescence.

 + Check if a digraph is a tree. -

Returns true if and only if the digraph +

Returns true if and only if digraph Digraph is - a tree.

+ a tree.

 + - Return the vertices of a digraph included in some loop. + Return the vertices of a digraph included in some loop. + -

Returns a list of all vertices of Digraph that are - included in some loop.

+

Returns a list of all vertices of Digraph that + are included in some loop.

 + - Return the vertices of a digraph in post-order. + Return the vertices of a digraph in postorder. -

Returns all vertices of the digraph Digraph. The - order is given by - a depth-first - traversal of the digraph, collecting visited +

Returns all vertices of digraph Digraph. + The order is given by + a depth-first + traversal of the digraph, collecting visited vertices in postorder. More precisely, the vertices visited while searching from an arbitrarily chosen vertex are collected in postorder, and all those collected vertices are - placed before the subsequently visited vertices. -

+ placed before the subsequently visited vertices.

 + - Return the vertices of a digraph in pre-order. + Return the vertices of a digraph in preorder. -

Returns all vertices of the digraph Digraph. The - order is given by - a depth-first - traversal of the digraph, collecting visited - vertices in pre-order.

+

Returns all vertices of digraph Digraph. + The order is given by + a depth-first + traversal of the digraph, collecting visited + vertices in preorder.

 + - Return the vertices reachable from some vertices of a digraph. + Return the vertices reachable from some vertices of a digraph. +

Returns an unsorted list of digraph vertices such that for - each vertex in the list, there is - a path in Digraph from some + each vertex in the list, there is a + path in Digraph + from some vertex of Vertices to the vertex. In particular, - since paths may have length zero, the vertices of - Vertices are included in the returned list. -

+ as paths can have length zero, the vertices of + Vertices are included in the returned list.

 + - Return the neighbours reachable from some vertices of a digraph. + Return the neighbors reachable from some vertices of a + digraph.

Returns an unsorted list of digraph vertices such that for - each vertex in the list, there is - a path in Digraph of length + each vertex in the list, there is a + path in Digraph + of length one or more from some vertex of Vertices to the - vertex. As a consequence, only those vertices - of Vertices that are included in - some cycle are returned. -

+ vertex. As a consequence, only those vertices + of Vertices that are included in + some cycle are returned.

 + - Return the vertices that reach some vertices of a digraph. + Return the vertices that reach some vertices of a digraph. +

Returns an unsorted list of digraph vertices such that for - each vertex in the list, there is - a path from the vertex to some - vertex of Vertices. In particular, since paths may have - length zero, the vertices of Vertices are included in - the returned list. -

+ each vertex in the list, there is + a path from the vertex to some + vertex of Vertices. In particular, as paths + can have length zero, the vertices of Vertices + are included in the returned list.

 + - Return the neighbours that reach some vertices of a digraph. + Return the neighbors that reach some vertices of a digraph. +

Returns an unsorted list of digraph vertices such that for - each vertex in the list, there is - a path of length one or more - from the vertex to some vertex of Vertices. As a consequence, - only those vertices of Vertices that are included in - some cycle are returned. -

+ each vertex in the list, there is + a path of length one or more + from the vertex to some vertex of Vertices. + Therefore only those vertices of Vertices + that are included + in some cycle are returned.

 + Return the strong components of a digraph. -

Returns a list of strongly - connected components. - Each strongly component is represented +

Returns a list of strongly + connected components. + Each strongly component is represented by its vertices. The order of the vertices and the order of - the components are arbitrary. Each vertex of the digraph + the components are arbitrary. Each vertex of digraph Digraph occurs in exactly one strong component. -

+

+ Return a subgraph of a digraph. -

Creates a maximal subgraph of Digraph having +

Creates a maximal subgraph + of Digraph having as vertices those vertices of Digraph that are - mentioned in Vertices. -

-

If the value of the option type is inherit, - which is the default, then the type of Digraph is used + mentioned in Vertices.

+

If the value of option type is inherit, which is + the default, the type of Digraph is used for the subgraph as well. Otherwise the option value of type - is used as argument to digraph:new/1. -

-

If the value of the option keep_labels is true, - which is the default, then - the labels of vertices and edges - of Digraph are used for the subgraph as well. If the value - is false, then the default label, [], is used - for the subgraph's vertices and edges. -

-

subgraph(Digraph, Vertices) is equivalent to - subgraph(Digraph, Vertices, []). -

-

There will be a badarg exception if any of the arguments - are invalid. -

+ is used as argument to + digraph:new/1.

+

If the value of option keep_labels is true, + which is the default, + the labels of vertices and edges + of Digraph are used for the subgraph as well. If + the value is false, default label [] is used + for the vertices and edges of the subgroup.

+

subgraph(Digraph, Vertices) is + equivalent to + subgraph(Digraph, Vertices, []).

+

If any of the arguments are invalid, a badarg exception is + raised.

 + - Return a topological sorting of the vertices of a digraph. + Return a topological sorting of the vertices of a digraph. + -

Returns a topological - ordering of the vertices of the digraph - Digraph if such an ordering exists, false - otherwise. For each vertex in the returned list, there are - no out-neighbours - that occur earlier in the list.

+

Returns a topological + ordering of the vertices of digraph + Digraph if such an ordering exists, otherwise + false. For each vertex in the returned list, + no out-neighbors + occur earlier in the list.
See Also -

digraph(3)

+

digraph(3)

 diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml index ac87f9c2b6..1dc0161398 100644 --- a/lib/stdlib/doc/src/epp.xml +++ b/lib/stdlib/doc/src/epp.xml @@ -28,214 +28,241 @@ 1 Kenneth Lundin - 97-01-31 + 1997-01-31 B - epp.sgml + epp.xml
epp - An Erlang Code Preprocessor + An Erlang code preprocessor. -

The Erlang code preprocessor includes functions which are used - by compile to preprocess macros and include files before - the actual parsing takes place.

+

The Erlang code preprocessor includes functions that are used by the + compile + module to preprocess macros and include files before + the parsing takes place.

+

The Erlang source file encoding is selected by a comment in one of the first two lines of the source file. The - first string that matches the regular expression + first string matching the regular expression coding\s*[:=]\s*([-a-zA-Z0-9])+ selects the encoding. If - the matching string is not a valid encoding it is ignored. The - valid encodings are Latin-1 and UTF-8 where the - case of the characters can be chosen freely. Examples:

- 
+      the matching string is not a valid encoding, it is ignored. The
+      valid encodings are Latin-1 and UTF-8, where the
+      case of the characters can be chosen freely.

+
+    
Examples:

+
+    
 %% coding: utf-8

-      
+
+    
 %% For this file we have chosen encoding = Latin-1

-      
+
+    
 %% -*- coding: latin-1 -*-

   
+
   
     
       
     
     
       
-      
Handle to the epp server.

+      
Handle to the epp server.

     
     
       
     
   
+
   
     
-      
-      Open a file for preprocessing
+      
+      Close the preprocessing of the file associated with Epp.
+      
       
-        
Opens a file for preprocessing.

-	
If extra is given in
-	Options, the return value will be
-	{ok, Epp, Extra} instead
-	of {ok, Epp}.

+        
Closes the preprocessing of a file.

       
     
+
     
-      
-      Open a file for preprocessing
+      
+      Return the default encoding of Erlang source files.
       
-        
Equivalent to epp:open([{name, FileName}, {includes, IncludePath}]).

+        
Returns the default encoding of Erlang source files.

       
     
+
     
-      
-      Open a file for preprocessing
+      
+      Return a string representation of an encoding.
       
-        
Equivalent to epp:open([{name, FileName}, {includes, IncludePath},
-	{macros, PredefMacros}]).

+        
Returns a string representation of an encoding. The string
+          is recognized by
+          read_encoding/1,2,
+          
+          read_encoding_from_binary/1,2, and
+          set_encoding/1,2
+          as a valid encoding.

       
     
+
     
-      
-      Close the preprocessing of the file associated with Epp
+      
+      Format an error descriptor.
       
-        
Closes the preprocessing of a file.

+        
Takes an ErrorDescriptor and returns
+          a string that
+          describes the error or warning. This function is usually
+          called implicitly when processing an ErrorInfo
+          structure (see section
+          Error Information).

       
     
+
     
-      
-      Return the next Erlang form from the opened Erlang source file
-      
+      
+      Open a file for preprocessing.
       
-        
Returns the next Erlang form from the opened Erlang source file.
-          The tuple {eof, Line} is returned at end-of-file. The first
-          form corresponds to an implicit attribute -file(File,1)., where
-          File is the name of the file.

+        
Opens a file for preprocessing.

+        
If extra is specified in
+          Options, the return value is
+          {ok, Epp, Extra} instead
+          of {ok, Epp}.

       
     
+
     
-      
-      Preprocess and parse an Erlang source file
+      
+      Open a file for preprocessing.
       
-        
Preprocesses and parses an Erlang source file.
-	Note that the tuple {eof, Line} returned
-	at end-of-file is included as a "form".

-	
If extra is given in
-	Options, the return value will be
-	{ok, [Form], Extra} instead
-	of {ok, [Form]}.

+        
Equivalent to
+          epp:open([{name, FileName}, {includes, IncludePath}]).

       
     
+
     
-      
-      Preprocess and parse an Erlang source file
+      
+      Open a file for preprocessing.
       
-        
Equivalent to epp:parse_file(FileName, [{includes, IncludePath},
-	{macros, PredefMacros}]).

+        
Equivalent to epp:open([{name, FileName}, {includes, IncludePath},
+          {macros, PredefMacros}]).

       
     
+
     
-      
-      Return the default encoding of Erlang source files
+      
+      Return the next Erlang form from the opened Erlang source file.
+      
+      
       
-        
Returns the default encoding of Erlang source files.

+        
Returns the next Erlang form from the opened Erlang source file.
+          Tuple {eof, Line} is returned at the end of the
+          file. The first form corresponds to an implicit attribute
+          -file(File,1)., where File is the file name.

       
     
+
     
-      
-      Return a string representation of an encoding
+      
+      Preprocess and parse an Erlang source file.
       
-        
Returns a string representation of an encoding. The string
-        is recognized by read_encoding/1,2,
-        read_encoding_from_binary/1,2, and
-        set_encoding/1,2 as a valid encoding.

+        
Preprocesses and parses an Erlang source file.
+          Notice that tuple {eof, Line} returned at the
+          end of the file is included as a "form".

+        
If extra is specified in
+         Options, the return value is
+         {ok, [Form], Extra} instead
+         of {ok, [Form]}.

+      
+    
+
+    
+      
+      Preprocess and parse an Erlang source file.
+      
+        
Equivalent to epp:parse_file(FileName, [{includes, IncludePath},
+          {macros, PredefMacros}]).

       
     
+
     
       
       
-      Read the encoding from a file
+      Read the encoding from a file.
       
         
Read the encoding from
           a file. Returns the read encoding, or none if no
-          valid encoding was found.

-        
The option in_comment_only is true by
+          valid encoding is found.

+        
Option in_comment_only is true by
           default, which is correct for Erlang source files. If set to
-          false the encoding string does not necessarily have to
+          false, the encoding string does not necessarily have to
           occur in a comment.

       
     
+
     
       
       
-      Read the encoding from a binary
+      Read the encoding from a binary.
       
         
Read the encoding from
           a binary. Returns the read encoding, or none if no
-          valid encoding was found.

-        
The option in_comment_only is true by
+          valid encoding is found.

+        
Option in_comment_only is true by
           default, which is correct for Erlang source files. If set to
-          false the encoding string does not necessarily have to
+          false, the encoding string does not necessarily have to
           occur in a comment.

       
     
+
     
       
-      Read and set the encoding of an IO device
+      Read and set the encoding of an I/O device.
       
         
Reads the encoding from
-          an IO device and sets the encoding of the device
-          accordingly. The position of the IO device referenced by
+          an I/O device and sets the encoding of the device
+          accordingly. The position of the I/O device referenced by
           File is not affected. If no valid
-          encoding can be read from the IO device the encoding of the
-          IO device is set to the default encoding.

+          encoding can be read from the I/O device, the encoding of the
+          I/O device is set to the default encoding.

         
Returns the read encoding, or none if no valid
-          encoding was found.

+          encoding is found.

       
     
+
     
       
-      Read and set the encoding of an IO device
+      Read and set the encoding of an I/O device.
       
         
Reads the encoding from
-          an IO device and sets the encoding of the device
-          accordingly. The position of the IO device referenced by
+          an I/O device and sets the encoding of the device
+          accordingly. The position of the I/O device referenced by
           File is not affected. If no valid
-          encoding can be read from the IO device the encoding of the
-          IO device is set to the
-	  encoding given by
-	  Default.

+          encoding can be read from the I/O device, the encoding of the
+          I/O device is set to the
+          encoding specified by
+          Default.

         
Returns the read encoding, or none if no valid
-          encoding was found.

-      
-    
-    
-      
-      Format an error descriptor
-      
-        
Takes an ErrorDescriptor and returns
-          a string which
-          describes the error or warning. This function is usually
-          called implicitly when processing an ErrorInfo
-          structure (see below).

+          encoding is found.

       
     
   
 
   

     Error Information
-    
The ErrorInfo mentioned above is the standard
-      ErrorInfo structure which is returned from all IO
-      modules. It has the following format:
-      

+    
+    
ErrorInfo is the standard ErrorInfo structure that is
+      returned from all I/O modules. The format is as follows:

     
-    {ErrorLine, Module, ErrorDescriptor}    
-    
A string which describes the error is obtained with the following call:
-      

+{ErrorLine, Module, ErrorDescriptor}
+    
A string describing the error is obtained with the following call:

     
-    Module:format_error(ErrorDescriptor)    
+Module:format_error(ErrorDescriptor)
   

 
   

     See Also
-    
erl_parse(3)

+    
erl_parse(3)

   

 
 
diff --git a/lib/stdlib/doc/src/erl_anno.xml b/lib/stdlib/doc/src/erl_anno.xml
index 9f775943c1..f316f63d98 100644
--- a/lib/stdlib/doc/src/erl_anno.xml
+++ b/lib/stdlib/doc/src/erl_anno.xml
@@ -35,69 +35,75 @@
     erl_anno.xml
erl_anno - - - Abstract Datatype for the Annotations of the Erlang Compiler + Abstract datatype for the annotations of the Erlang Compiler. -

This module implements an abstract type that is used by the +

This module provides an abstract type that is used by the Erlang Compiler and its helper modules for holding data such as column, line number, and text. The data type is a collection of annotations as described in the following.

+

The Erlang Token Scanner returns tokens with a subset of the following annotations, depending on the options:

+ column

The column where the token begins.

 location

The line and column where the token begins, or - just the line if the column unknown.

- + just the line if the column is unknown.

text

The token's text.

 -

From the above the following annotation is derived:

+ +

From this, the following annotation is derived:

+ line

The line where the token begins.

 -

Furthermore, the following annotations are supported by - this module, and used by various modules:

+ +

This module also supports the following annotations, + which are used by various modules:

+ file

A filename.

 generated

A Boolean indicating if the abstract code is - compiler generated. The Erlang Compiler does not emit warnings - for such code.

- + compiler-generated. The Erlang Compiler does not emit warnings + for such code.

record

A Boolean indicating if the origin of the abstract - code is a record. Used by Dialyzer to assign types to tuple - elements.

+ code is a record. Used by + Dialyzer + to assign types to tuple elements.

 +

The functions - column(), - end_location(), - line(), - location(), and - text() + column(), + end_location(), + line(), + location(), and + text() in the erl_scan module can be used for inspecting annotations in tokens.

+

The functions - map_anno(), - fold_anno(), - mapfold_anno(), - new_anno(), - anno_from_term(), and + anno_from_term(), - anno_to_term() in the erl_parse module can be - used for manipulating annotations in abstract code. -

+ anno_to_term(), + fold_anno(), + map_anno(), + + mapfold_anno(), + and new_anno(), + in the erl_parse module can be + used for manipulating annotations in abstract code.

 @@ -118,9 +124,6 @@ - -

To be changed to a non-negative integer in Erlang/OTP 19.0.

- @@ -133,177 +136,169 @@ - Return the column + Return the column. -

Returns the column of the annotations Anno. -

+

Returns the column of the annotations Anno.

 + - Return the end location of the text + Return the end location of the text.

Returns the end location of the text of the annotations Anno. If there is no text, - undefined is returned. -

+ undefined is returned.

 + - Return the filename + Return the filename.

Returns the filename of the annotations Anno. - If there is no filename, undefined is returned. -

+ If there is no filename, undefined is returned.

 + - Return annotations given a term + Return annotations given a term. -

Returns annotations with the representation Term. -

- -

See also to_term(). -

+

Returns annotations with representation Term.

+

See also to_term().

 + - Return the generated Boolean + Return the generated Boolean. -

Returns true if the annotations Anno - has been marked as generated. The default is to return - false. -

+

Returns true if annotations Anno + is marked as generated. The default is to return + false.

 + - Test for a collection of annotations + Test for a collection of annotations.

Returns true if Term is a collection of - annotations, false otherwise.

+ annotations, otherwise false.

 + - Return the line + Return the line. -

Returns the line of the annotations Anno. -

+

Returns the line of the annotations Anno.

 + - Return the location + Return the location. -

Returns the location of the annotations Anno. -

+

Returns the location of the annotations Anno.

 + - Create a new collection of annotations + Create a new collection of annotations.

Creates a new collection of annotations given a location.

 + - Modify the filename + Modify the filename. -

Modifies the filename of the annotations Anno. -

+

Modifies the filename of the annotations Anno.

 + - Modify the generated marker + Modify the generated marker. -

Modifies the generated marker of the annotations - Anno. +

Modifies the generated marker of the annotations Anno.

+ - Modify the line + Modify the line. -

Modifies the line of the annotations Anno. -

+

Modifies the line of the annotations Anno.

 + - Modify the location + Modify the location. -

Modifies the location of the annotations Anno. -

+

Modifies the location of the annotations Anno.

 + - Modify the record marker + Modify the record marker. -

Modifies the record marker of the annotations Anno. -

+

Modifies the record marker of the annotations Anno.

 + - Modify the text + Modify the text. -

Modifies the text of the annotations Anno. -

+

Modifies the text of the annotations Anno.

 + - Return the text + Return the text.

Returns the text of the annotations Anno. - If there is no text, undefined is returned. -

+ If there is no text, undefined is returned.

 + - Return the term representing a collection of - annotations + Return the term representing a collection of annotations. + -

Returns the term representing the annotations Anno. -

-

See also from_term(). -

+

Returns the term representing the annotations Anno.

+

See also from_term().

 +
See Also -

erl_scan(3), - erl_parse(3) -

+

erl_parse(3), + erl_scan(3)

 diff --git a/lib/stdlib/doc/src/erl_eval.xml b/lib/stdlib/doc/src/erl_eval.xml index d60b04b510..1c0f7f062f 100644 --- a/lib/stdlib/doc/src/erl_eval.xml +++ b/lib/stdlib/doc/src/erl_eval.xml @@ -28,19 +28,19 @@ 1 Bjarne Däcker - 97-01-21 + 1997-01-21 B - erl_eval.sgml + erl_eval.xml
erl_eval - The Erlang Meta Interpreter + The Erlang meta interpreter.

This module provides an interpreter for Erlang expressions. The expressions are in the abstract syntax as returned by erl_parse, - the Erlang parser, or - io.

+ the Erlang parser, or io.

 + @@ -73,9 +73,9 @@ -

Further described - below.

- +

Further described in section + + Local Function Handler in this module

 @@ -85,152 +85,164 @@ -

Further described - below.

- +

Further described in section + + Non-Local Function Handler in this module.

 + - - - - Evaluate expressions + + Add a binding. -

Evaluates Expressions with the set of bindings - Bindings, where Expressions - is a sequence of - expressions (in abstract syntax) of a type which may be - returned by - io:parse_erl_exprs/2. See below for an - explanation of how and when to use the arguments - LocalFunctionHandler and - NonLocalFunctionHandler. -

-

Returns {value, Value, NewBindings} -

+

Adds binding Name=Value + to BindingStruct. + Returns an updated binding structure.

 + + + + Return bindings. + +

Returns the binding of Name + in BindingStruct.

+ + + + + + Return bindings. + +

Returns the list of bindings contained in the binding + structure.

+ + + + + + Delete a binding. + +

Removes the binding of Name + in BindingStruct. + Returns an updated binding structure.

+ + + - Evaluate expression + Evaluate expression.

Evaluates Expression with the set of bindings - Bindings. Expression - is an expression in - abstract syntax. See below for an explanation of - how and when to use the arguments + Bindings. Expression is an + expression in abstract syntax. + For an explanation of when and how to use arguments LocalFunctionHandler and - NonLocalFunctionHandler. -

-

Returns {value, Value, - NewBindings} by default. But if the - ReturnFormat is value only - the Value is returned.

+ NonLocalFunctionHandler, see sections + + Local Function Handler and + + Non-Local Function Handler in this module.

+

Returns {value, Value, NewBindings} + by default. If ReturnFormat is value, + only Value is returned.

 + - Evaluate a list of expressions + Evaluate a list of expressions.

Evaluates a list of expressions in parallel, using the same initial bindings for each expression. Attempts are made to - merge the bindings returned from each evaluation. This - function is useful in the LocalFunctionHandler. See below. -

+ merge the bindings returned from each evaluation. This + function is useful in LocalFunctionHandler, see section + + Local Function Handler in this module.

Returns {ValueList, NewBindings}.

+ - - Return a bindings structure - -

Returns an empty binding structure.

- - - - - Return bindings - -

Returns the list of bindings contained in the binding - structure.

- - - - - Return bindings - -

Returns the binding of Name - in BindingStruct.

- - - - - Add a binding + + + + Evaluate expressions. -

Adds the binding Name = Value - to BindingStruct. - Returns an updated binding structure.

+

Evaluates Expressions with the set of bindings + Bindings, where Expressions + is a sequence of expressions (in abstract syntax) of a type that can + be returned by + io:parse_erl_exprs/2. + For an explanation of when and how to use arguments + LocalFunctionHandler and + NonLocalFunctionHandler, see sections + + Local Function Handler and + + Non-Local Function Handler in this module.

+

Returns {value, Value, NewBindings} +

+ - - Delete a binding + + Return a bindings structure. -

Removes the binding of Name - in BindingStruct. - Returns an updated binding structure.

+

Returns an empty binding structure.
+ Local Function Handler -

- During evaluation of a function, no calls can be made to local +

During evaluation of a function, no calls can be made to local functions. An undefined function error would be generated. However, the optional argument - LocalFunctionHandler may be used to define a function - which is called when there is a call to a local function. The + LocalFunctionHandler can be used to define a function + that is called when there is a call to a local function. The argument can have the following formats:

{value,Func} -

This defines a local function handler which is called with:

+

This defines a local function handler that is called with:

-Func(Name, Arguments) +Func(Name, Arguments)

Name is the name of the local function (an atom) and Arguments is a list of the evaluated arguments. The function handler returns the value of the - local function. In this case, it is not possible to access - the current bindings. To signal an error, the function - handler just calls exit/1 with a suitable exit value.

+ local function. In this case, the current bindings cannot be + accessed. To signal an error, the function + handler calls exit/1 with a suitable exit value.

 {eval,Func} -

This defines a local function handler which is called with:

+

This defines a local function handler that is called with:

-Func(Name, Arguments, Bindings) +Func(Name, Arguments, Bindings)

Name is the name of the local function (an atom), Arguments is a list of the unevaluated arguments, and Bindings are the current variable bindings. The function handler returns:

-{value,Value,NewBindings} +{value,Value,NewBindings}

Value is the value of the local function and NewBindings are the updated variable bindings. In this case, the function handler must itself evaluate all the function arguments and manage the bindings. To signal an - error, the function handler just calls exit/1 with a + error, the function handler calls exit/1 with a suitable exit value.

 none @@ -241,55 +253,66 @@ Func(Name, Arguments, Bindings)
- Non-local Function Handler -

- The optional argument NonlocalFunctionHandler may be - used to define a function which is called in the following - cases: a functional object (fun) is called; a built-in function - is called; a function is called using the M:F syntax, where M - and F are atoms or expressions; an operator Op/A is called - (this is handled as a call to the function erlang:Op/A). - Exceptions are calls to erlang:apply/2,3; neither of the - function handlers will be called for such calls. + + Non-Local Function Handler +

The optional argument NonLocalFunctionHandler can be + used to define a function that is called in the following + cases:

+ +

A functional object (fun) is called.

 +

A built-in function is called.

 +

A function is called using the M:F syntax, where M + and F are atoms or expressions.

 +

An operator Op/A is called (this is handled as a call to + function erlang:Op/A).

 + +

Exceptions are calls to erlang:apply/2,3; neither of the + function handlers are called for such calls. The argument can have the following formats:

{value,Func} -

This defines an nonlocal function handler which is called with:

+

This defines a non-local function handler that is called with:

-Func(FuncSpec, Arguments) +Func(FuncSpec, Arguments)

FuncSpec is the name of the function on the form {Module,Function} or a fun, and Arguments is a list of the evaluated arguments. The function handler returns the value of the function. To - signal an error, the function handler just calls + signal an error, the function handler calls exit/1 with a suitable exit value.

 none -

There is no nonlocal function handler.

+

There is no non-local function handler.

For calls such as erlang:apply(Fun, Args) or - erlang:apply(Module, Function, Args) the call of the + erlang:apply(Module, Function, Args), the call of the non-local function handler corresponding to the call to - erlang:apply/2,3 itself--Func({erlang, apply}, [Fun, Args]) or Func({erlang, apply}, [Module, Function, Args])--will never take place. The non-local function - handler will however be called with the evaluated - arguments of the call to erlang:apply/2,3: Func(Fun, Args) or Func({Module, Function}, Args) (assuming + erlang:apply/2,3 itself + (Func({erlang, apply}, [Fun, Args]) or + Func({erlang, apply}, [Module, Function, Args])) + never takes place.

+

The non-local function handler is however called with the + evaluated arguments of the call to + erlang:apply/2,3: Func(Fun, Args) or + Func({Module, Function}, Args) (assuming that {Module, Function} is not {erlang, apply}).

-

Calls to functions defined by evaluating fun expressions +

Calls to functions defined by evaluating fun expressions "fun ... end" are also hidden from non-local function - handlers.

 -

The nonlocal function handler argument is probably not used as + handlers.

+ +

The non-local function handler argument is probably not used as frequently as the local function handler argument. A possible use is to call exit/1 on calls to functions that for some reason are not allowed to be called.

- Bugs -

Undocumented functions in erl_eval should not be used.

+ Known Limitation +

Undocumented functions in this module are not to be used.

 diff --git a/lib/stdlib/doc/src/erl_expand_records.xml b/lib/stdlib/doc/src/erl_expand_records.xml index 93e464c733..7e4aa2db37 100644 --- a/lib/stdlib/doc/src/erl_expand_records.xml +++ b/lib/stdlib/doc/src/erl_expand_records.xml @@ -26,33 +26,35 @@ erl_expand_records Hans Bolinder - nobody + - nobody - no + + 2005-12-23 PA1 - erl_expand_records.sgml + erl_expand_records.xml
erl_expand_records - Expands Records in a Module + Expands records in a module. +

This module expands records in a module.

 + - Expand all records in a module + Expand all records in a module.

Expands all records in a module. The returned module has no - references to records, neither attributes nor code.

+ references to records, attributes, or code.
See Also -

The abstract format - documentation in ERTS User's Guide

+

Section The Abstract Format + in ERTS User's Guide.

diff --git a/lib/stdlib/doc/src/erl_id_trans.xml b/lib/stdlib/doc/src/erl_id_trans.xml index 649490f8b3..16952a9582 100644 --- a/lib/stdlib/doc/src/erl_id_trans.xml +++ b/lib/stdlib/doc/src/erl_id_trans.xml @@ -30,31 +30,32 @@ 1 Bjarne Däcker - 97-01-21 + 1997-01-21 B - erl_id_trans.sgml + erl_id_trans.xml
erl_id_trans - An Identity Parse Transform + An identity parse transform.

This module performs an identity parse transformation of Erlang code. - It is included as an example for users who may wish to write their own - parse transformers. If the option {parse_transform,Module} is passed - to the compiler, a user written function parse_transform/2 - is called by the compiler before the code is checked for - errors.

+ It is included as an example for users who wants to write their own + parse transformers. If option {parse_transform,Module} is passed + to the compiler, a user-written function parse_transform/2 + is called by the compiler before the code is checked for errors.

 + parse_transform(Forms, Options) -> Forms - Transform Erlang forms + Transform Erlang forms. Forms = [erl_parse:abstract_form() | erl_parse:form_info()] Options = [compile:option()] -

Performs an identity transformation on Erlang forms, as an example.

+

Performs an identity transformation on Erlang forms, as an example. +

@@ -63,17 +64,17 @@ Parse Transformations

Parse transformations are used if a programmer wants to use Erlang syntax, but with different semantics. The original Erlang - code is then transformed into other Erlang code. -

+ code is then transformed into other Erlang code.

-

Programmers are strongly advised not to engage in parse transformations and no support is offered for problems encountered.

+

Programmers are strongly advised not to engage in parse + transformations. No support is offered for problems encountered.
See Also -

erl_parse(3), - compile(3).

+

erl_parse(3), + compile(3)

 diff --git a/lib/stdlib/doc/src/erl_internal.xml b/lib/stdlib/doc/src/erl_internal.xml index 940f8c5b40..cf49df0972 100644 --- a/lib/stdlib/doc/src/erl_internal.xml +++ b/lib/stdlib/doc/src/erl_internal.xml @@ -30,91 +30,100 @@ 1 Bjarne Däcker - 97-01-21 + 1997-01-21 B - erl_internal.sgml + erl_internal.xml
erl_internal - Internal Erlang Definitions + Internal Erlang definitions. -

This module defines Erlang BIFs, guard tests and operators. +

This module defines Erlang BIFs, guard tests, and operators. This module is only of interest to programmers who manipulate Erlang code.

 + - - Test for an Erlang BIF + + Test for an arithmetic operator. -

Returns true if Name/Arity is an Erlang BIF - which is automatically recognized by the compiler, otherwise - false.

+

Returns true if OpName/Arity + is an arithmetic operator, otherwise false.

 + - - Test for an Erlang BIF allowed in guards + + Test for an Erlang BIF. -

Returns true if Name/Arity is an Erlang BIF - which is allowed in guards, otherwise false.

+

Returns true if Name/Arity + is an Erlang BIF that is automatically recognized by the compiler, + otherwise false.

 + - - Test for a valid type test + + Test for a Boolean operator. -

Returns true if Name/Arity is a valid Erlang - type test, otherwise false.

+

Returns true if OpName/Arity + is a Boolean operator, otherwise false.

 + - - Test for an arithmetic operator + + Test for a comparison operator. -

Returns true if OpName/Arity is an arithmetic - operator, otherwise false.

+

Returns true if OpName/Arity + is a comparison operator, otherwise false.

 + - - Test for a Boolean operator + + Test for an Erlang BIF allowed in guards. -

Returns true if OpName/Arity is a Boolean - operator, otherwise false.

+

Returns true if Name/Arity is + an Erlang BIF that is allowed in guards, otherwise false.

 + - - Test for a comparison operator + + Test for a list operator. -

Returns true if OpName/Arity is a comparison - operator, otherwise false.

+

Returns true if OpName/Arity + is a list operator, otherwise false.

 + - - Test for a list operator + + Return operator type. -

Returns true if OpName/Arity is a list - operator, otherwise false.

+

Returns the Type of operator that + OpName/Arity belongs to, + or generates a function_clause error if it is not an + operator.

 + - Test for a send operator + Test for a send operator. -

Returns true if OpName/Arity is a send - operator, otherwise false.

+

Returns true if OpName/Arity + is a send operator, otherwise false.

 + - - Return operator type + + Test for a valid type test. -

Returns the Type of operator that OpName/Arity - belongs to, - or generates a function_clause error if it is not an - operator at all.

+

Returns true if Name/Arity is + a valid Erlang type test, otherwise false.

 diff --git a/lib/stdlib/doc/src/erl_lint.xml b/lib/stdlib/doc/src/erl_lint.xml index 3747b0f3c3..77cb7a9916 100644 --- a/lib/stdlib/doc/src/erl_lint.xml +++ b/lib/stdlib/doc/src/erl_lint.xml @@ -28,39 +28,45 @@ 1 Bjarne Däcker - 97-01-27 + 1997-01-27 B - erl_lint.sgml + erl_lint.xml
erl_lint - The Erlang Code Linter + The Erlang code linter.

This module is used to check Erlang code for illegal syntax and - other bugs. It also warns against coding practices which are - not recommended.

+ other bugs. It also warns against coding practices that are + not recommended.

+

The errors detected include:

+ - redefined and undefined functions - unbound and unsafe variables - illegal record usage. + Redefined and undefined functions + Unbound and unsafe variables + Illegal record use -

Warnings include:

+ +

The warnings detected include:

+ - unused functions and imports - unused variables - variables imported into matches - variables exported from - if/case/receive - variables shadowed in lambdas and list - comprehensions. + Unused functions and imports + Unused variables + Variables imported into matches + Variables exported from + if/case/receive + Variables shadowed in funs and list comprehensions +

Some of the warnings are optional, and can be turned on by - giving the appropriate option, described below.

+ specifying the appropriate option, described below.

+

The functions in this module are invoked automatically by the - Erlang compiler and there is no reason to invoke these + Erlang compiler. There is no reason to invoke these functions separately unless you have written your own Erlang compiler.

 + @@ -69,86 +75,87 @@ + + + + Format an error descriptor. + +

Takes an ErrorDescriptor and returns a string + that describes the error or warning. This function is usually + called implicitly when processing an ErrorInfo structure + (see section + Error Information).

+ + + + + + Test for a guard test. + +

Tests if Expr is a legal guard test. + Expr is an Erlang term representing the abstract + form for the expression. + erl_parse:parse_exprs(Tokens) + can be used to generate a list of Expr.

+ + + - Check a module for errors + Check a module for errors. -

This function checks all the forms in a module for errors. - It returns: -

+

Checks all the forms in a module for errors. It returns:

{ok,Warnings} -

There were no errors in the module.

+

There are no errors in the module.

 {error,Errors,Warnings} -

There were errors in the module.

+

There are errors in the module.

 -

Since this module is of interest only to the maintainers of - the compiler, and to avoid having the same description in - two places to avoid the usual maintenance nightmare, the +

As this module is of interest only to the maintainers of the + compiler, and to avoid the same description in two places, the elements of Options that control the warnings are - only described in compile(3). -

-

The AbsForms of a module which comes from a file - that is read through epp, the Erlang pre-processor, - can come from many files. This means that any references to - errors must include the file name (see epp(3), or parser erl_parse(3)). - The warnings and errors returned have the following format: -

+ only described in the + + compile(3) module.

+

AbsForms of a module, which comes from a file + that is read through epp, the Erlang preprocessor, can come + from many files. This means that any references to errors must + include the filename, see the + epp(3) module or parser (see the + erl_parse(3) module). + The returned errors and warnings have the following format:

- [{FileName2,[ErrorInfo]}] -

The errors and warnings are listed in the order in which - they are encountered in the forms. This means that the - errors from one file may be split into different entries in - the list of errors.

- - - - - Test for a guard test - -

This function tests if Expr is a legal guard test. - Expr is an Erlang term representing the abstract form - for the expression. erl_parse:parse_exprs(Tokens) can - be used to generate a list of Expr.

- - - - - Format an error descriptor - -

Takes an ErrorDescriptor and returns a string which - describes the error or warning. This function is usually - called implicitly when processing an ErrorInfo - structure (see below).

+[{FileName2,[ErrorInfo]}] +

The errors and warnings are listed in the order in which they are + encountered in the forms. The errors from one file can therefore be + split into different entries in the list of errors.
+ Error Information -

The ErrorInfo mentioned above is the standard - ErrorInfo structure which is returned from all IO - modules. It has the following format: -

+

ErrorInfo is the standard ErrorInfo structure that is + returned from all I/O modules. The format is as follows:

- {ErrorLine, Module, ErrorDescriptor} -

A string which describes the error is obtained with the following call: -

+{ErrorLine, Module, ErrorDescriptor} +

A string describing the error is obtained with the following call:

- Module:format_error(ErrorDescriptor) +Module:format_error(ErrorDescriptor)
See Also -

erl_parse(3), - epp(3)

+

epp(3), + erl_parse(3)

 diff --git a/lib/stdlib/doc/src/erl_parse.xml b/lib/stdlib/doc/src/erl_parse.xml index 771ccc2dc6..647f36883c 100644 --- a/lib/stdlib/doc/src/erl_parse.xml +++ b/lib/stdlib/doc/src/erl_parse.xml @@ -28,20 +28,22 @@ 1 Bjarne Däcker - 97-01-24 + 1997-01-24 B - erl_parse.sgml + erl_parse.xml
erl_parse - The Erlang Parser + The Erlang parser. -

This module is the basic Erlang parser which converts tokens into - the abstract form of either forms (i.e., top-level constructs), +

This module is the basic Erlang parser that converts tokens into + the abstract form of either forms (that is, top-level constructs), expressions, or terms. The Abstract Format is described in the ERTS User's Guide. - Note that a token list must end with the dot token in order - to be acceptable to the parse functions (see erl_scan(3)).

+ Notice that a token list must end with the dot token to be + acceptable to the parse functions (see the + erl_scan(3)) module.

 + abstract_clause() @@ -84,258 +86,257 @@ + - - - Parse an Erlang form - -

This function parses Tokens as if it were - a form. It returns:

- - {ok, AbsForm} - -

The parsing was successful. AbsForm is the - abstract form of the parsed form.

- - {error, ErrorInfo} - -

An error occurred.

- - - - - - - Parse Erlang expressions - -

This function parses Tokens as if it were - a list of expressions. It returns:

- - {ok, ExprList} - -

The parsing was successful. ExprList is a - list of the abstract forms of the parsed expressions.

- - {error, ErrorInfo} - -

An error occurred.

- - - - - - - Parse an Erlang term - -

This function parses Tokens as if it were - a term. It returns:

- - {ok, Term} - -

The parsing was successful. Term is - the Erlang term corresponding to the token list.

- - {error, ErrorInfo} - -

An error occurred.

- - - - - - format_error(ErrorDescriptor) -> Chars - Format an error descriptor - - ErrorDescriptor = error_description() - Chars = [char() | Chars] - - -

Uses an ErrorDescriptor and returns a string - which describes the error. This function is usually called - implicitly when an ErrorInfo structure is processed - (see below).

- - - - - - Generate a list of tokens for an expression - -

This function generates a list of tokens representing the abstract - form AbsTerm of an expression. Optionally, it - appends MoreTokens.

- - - - - Convert abstract form to an Erlang term - -

Converts the abstract form AbsTerm of a - term into a - conventional Erlang data structure (i.e., the term itself). - This is the inverse of abstract/1.

- - - Convert an Erlang term into an abstract form + Convert an Erlang term into an abstract form.

Converts the Erlang data structure Data into an abstract form of type AbsTerm. - This is the inverse of normalise/1.

+ This function is the inverse of + normalise/1.

erl_parse:abstract(T) is equivalent to erl_parse:abstract(T, 0).

 + - Convert an Erlang term into an abstract form + Convert an Erlang term into an abstract form.

Converts the Erlang data structure Data into an abstract form of type AbsTerm.

-

The Line option is the line that will - be assigned to each node of AbsTerm.

-

The Encoding option is used for - selecting which integer lists will be considered +

Option Line is the line to be + assigned to each node of AbsTerm.

+

Option Encoding is used for + selecting which integer lists to be considered as strings. The default is to use the encoding returned by - + function epp:default_encoding/0. - The value none means that no integer lists will be - considered as strings. The encoding_func() will be - called with one integer of a list at a time, and if it - returns true for every integer the list will be + Value none means that no integer lists are + considered as strings. encoding_func() is + called with one integer of a list at a time; if it + returns true for every integer, the list is considered a string.

 + - - - Map a function over the annotations of a erl_parse tree - + + Return annotations as terms. -

Modifies the erl_parse tree Abstr - by applying Fun on each collection of - annotations of the nodes of the erl_parse tree. The - erl_parse tree is traversed in a depth-first, - left-to-right, fashion. -

+

Assumes that Term is a term with the same + structure as a erl_parse tree, but with terms, + say T, where a erl_parse tree has collections + of annotations. Returns a erl_parse tree where each + term T is replaced by the value returned by + + erl_anno:from_term(T). The term + Term is traversed in a depth-first, + left-to-right fashion.

+ + + + + + Return the representation of annotations. + +

Returns a term where each collection of annotations + Anno of the nodes of the erl_parse tree + Abstr is replaced by the term + returned by + erl_anno:to_term(Anno). The + erl_parse tree is traversed in a depth-first, + left-to-right fashion.

 + - - Fold a function over the annotations of a erl_parse tree + Fold a function over the annotations of an erl_parse tree.

Updates an accumulator by applying Fun on each collection of annotations of the erl_parse tree Abstr. The first call to Fun has AccIn as - argument, and the returned accumulator + argument, the returned accumulator AccOut is passed to the next call, and so on. The final value of the accumulator is returned. The - erl_parse tree is traversed in a depth-first, left-to-right, - fashion. -

+ erl_parse tree is traversed in a depth-first, left-to-right + fashion.

 + - - - Map and fold a function over the annotations of a - erl_parse tree + format_error(ErrorDescriptor) -> Chars + Format an error descriptor. + + ErrorDescriptor = error_description() + Chars = [char() | Chars] + + +

Uses an ErrorDescriptor and returns a string + that describes the error. This function is usually called + implicitly when an ErrorInfo structure is processed + (see section + Error Information).

+ + + + + + Map a function over the annotations of an erl_parse tree.

Modifies the erl_parse tree Abstr - by applying Fun on each collection of - annotations of the nodes of the erl_parse tree, while - at the same time updating an accumulator. The first call to - Fun has AccIn as - second argument, and the returned accumulator - AccOut is passed to the next call, and - so on. The modified erl_parse tree as well as the the - final value of the accumulator are returned. The - erl_parse tree is traversed in a depth-first, - left-to-right, fashion. -

+ by applying Fun on each collection of + annotations of the nodes of the erl_parse tree. The + erl_parse tree is traversed in a depth-first, + left-to-right fashion.

+ + + + + + Map and fold a function over the annotations of an + erl_parse tree. + +

Modifies the erl_parse tree Abstr + by applying Fun on each collection of + annotations of the nodes of the erl_parse tree, while + at the same time updating an accumulator. The first call to + Fun has AccIn as + second argument, the returned accumulator + AccOut is passed to the next call, and + so on. The modified erl_parse tree and the + final value of the accumulator are returned. The + erl_parse tree is traversed in a depth-first, + left-to-right fashion.

 + - - Create new annotations - + Create new annotations.

Assumes that Term is a term with the same structure as a erl_parse tree, but with locations where a erl_parse tree has collections of annotations. Returns a erl_parse tree where each location L - has been replaced by the value returned by erl_anno:new(L). The term Term is traversed in a - depth-first, left-to-right, fashion. -

+ depth-first, left-to-right fashion.

 + - - - Return annotations as terms - + + Convert abstract form to an Erlang term. -

Assumes that Term is a term with the same - structure as a erl_parse tree, but with terms, - T say, where a erl_parse tree has collections - of annotations. Returns a erl_parse tree where each - term T has been replaced by the value returned by - - erl_anno:from_term(T). The term - Term is traversed in a depth-first, - left-to-right, fashion. -

+

Converts the abstract form AbsTerm of a + term into a conventional Erlang data structure (that is, the + term itself). This function is the inverse of + abstract/1.

 + - - - Return the representation of annotations - + + Parse Erlang expressions. -

Returns a term where each collection of annotations - Anno of the nodes of the erl_parse tree - Abstr has been replaced by the term - returned by - erl_anno:to_term(Anno). The - erl_parse tree is traversed in a depth-first, - left-to-right, fashion. -

+

Parses Tokens as if it was a list of expressions. + Returns one of the following:

+ + {ok, ExprList} + +

The parsing was successful. ExprList is a + list of the abstract forms of the parsed expressions.

+ + {error, ErrorInfo} + +

An error occurred.

+ + + + + + + + Parse an Erlang form. + +

Parses Tokens as if it was a form. Returns one + of the following:

+ + {ok, AbsForm} + +

The parsing was successful. AbsForm is the + abstract form of the parsed form.

+ + {error, ErrorInfo} + +

An error occurred.

+ + + + + + + + Parse an Erlang term. + +

Parses Tokens as if it was a term. Returns + one of the following:

+ + {ok, Term} + +

The parsing was successful. Term is + the Erlang term corresponding to the token list.

+ + {error, ErrorInfo} + +

An error occurred.

+ + + + + + + + + Generate a list of tokens for an expression. + +

Generates a list of tokens representing the abstract + form AbsTerm of an expression. Optionally, + MoreTokens is appended.
+ Error Information -

The ErrorInfo mentioned above is the standard - ErrorInfo structure which is returned from all IO - modules. It has the format: -

+

ErrorInfo is the standard ErrorInfo structure that is + returned from all I/O modules. The format is as follows:

- {ErrorLine, Module, ErrorDescriptor} -

A string which describes the error is obtained with the following call: -

+{ErrorLine, Module, ErrorDescriptor} +

A string describing the error is obtained with the following call:

- Module:format_error(ErrorDescriptor) +Module:format_error(ErrorDescriptor)
See Also -

io(3), - erl_anno(3), - erl_scan(3), - ERTS User's Guide

+

erl_anno(3), + erl_scan(3), + io(3), + section The Abstract Format + in the ERTS User's Guide

 diff --git a/lib/stdlib/doc/src/erl_pp.xml b/lib/stdlib/doc/src/erl_pp.xml index e96fd576ec..77a7f1e8d1 100644 --- a/lib/stdlib/doc/src/erl_pp.xml +++ b/lib/stdlib/doc/src/erl_pp.xml @@ -7,7 +7,7 @@ 1996 2016 Ericsson AB, All Rights Reserved - + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -30,38 +30,37 @@ 1 Bjarne Däcker - 97-01-24 + 1997-01-24 B - erl_pp.sgml + erl_pp.xml
erl_pp - The Erlang Pretty Printer + The Erlang pretty printer.

The functions in this module are used to generate aesthetically attractive representations of abstract - forms, which are suitable for printing. All functions return (possibly deep) + forms, which are suitable for printing. + All functions return (possibly deep) lists of characters and generate an error if the form is wrong.

-

All functions can have an optional argument which specifies a hook + +

All functions can have an optional argument, which specifies a hook that is called if an attempt is made to print an unknown form.

 + -

The optional argument - HookFunction, shown in the functions described below, - defines a function which is called when an unknown form occurs where there - should be a valid expression.

- -

If HookFunction is equal to none there is no hook - function.

- -

The called hook function should return a (possibly deep) list - of characters. expr/4 - is useful in a hook. -

-

If CurrentIndentation is negative, there will be no line - breaks and only a space is used as a separator.

+

Optional argument HookFunction, + shown in the functions described in this module, defines a function + that is called when an unknown form occurs where there + is to be a valid expression. If HookFunction is equal to + none, there is no hook function.

+

The called hook function is to return a (possibly deep) list of + characters. Function expr/4 + is useful in a hook.

+

If CurrentIndentation is negative, there are no + line breaks and only a space is used as a separator.

 @@ -71,78 +70,88 @@ + - - - Pretty print a form + + + Pretty print an attribute. -

Pretty prints a - Form which is an abstract form of a type which is - returned by - erl_parse:parse_form/1.

+

Same as form/1,2, + but only for attribute Attribute.

 + - - - Pretty print an attribute + + + + + Pretty print one Expression. -

The same as form, but only for the attribute - Attribute.

+

Prints one expression. It is useful for implementing hooks (see + section + Known Limitations).

 + - - - Pretty print a function + + + + Pretty print Expressions. -

The same as form, but only for the function - Function.

+

Same as form/1,2, + but only for the sequence of + expressions in Expressions.

 + - - - Pretty print a guard + + + Pretty print a form. -

The same as form, but only for the guard test - Guard.

+

Pretty prints a + Form, which is an abstract form of a type that is + returned by + erl_parse:parse_form/1.

 + - - - - Pretty print Expressions + + + Pretty print a function. -

The same as form, but only for the sequence of - expressions in Expressions.

+

Same as form/1,2, + but only for function Function.

 + - - - - - Pretty print one Expression + + + Pretty print a guard. -

This function prints one expression. It is useful for implementing hooks (see below).

+

Same as form/1,2, + but only for the guard test Guard.
- Bugs -

It should be possible to have hook functions for unknown forms - at places other than expressions.

+ + Known Limitations +

It is not possible to have hook functions for unknown forms + at other places than expressions.

See Also -

io(3), - erl_parse(3), - erl_eval(3)

+

erl_eval(3), + erl_parse(3), + io(3)

 diff --git a/lib/stdlib/doc/src/erl_scan.xml b/lib/stdlib/doc/src/erl_scan.xml index ee0d6b6033..137ccd3416 100644 --- a/lib/stdlib/doc/src/erl_scan.xml +++ b/lib/stdlib/doc/src/erl_scan.xml @@ -4,7 +4,7 @@
- 19962015 + 19962016 Ericsson AB. All Rights Reserved. @@ -28,16 +28,17 @@ 1 Bjarne Däcker - 97-01-24 + 1997-01-24 B - erl_scan.sgml + erl_scan.xml
erl_scan - The Erlang Token Scanner + The Erlang token scanner. -

This module contains functions for tokenizing characters into +

This module contains functions for tokenizing (scanning) characters into Erlang tokens.

 + @@ -70,23 +71,96 @@ + + + + Return the category. + +

Returns the category of Token.

+ + + + + + Return the column. + +

Returns the column of Token's + collection of annotations.

+ + + + + + Return the end location of the text. + +

Returns the end location of the text of + Token's collection of annotations. If + there is no text, undefined is returned.

+ + + + + + Format an error descriptor. + +

Uses an ErrorDescriptor and returns a string + that describes the error or warning. This function is usually + called implicitly when an ErrorInfo structure is + processed (see section + Error Information).

+ + + + + + Return the line. + +

Returns the line of Token's collection + of annotations.

+ + + + + + Return the location. + +

Returns the location of Token's + collection of annotations.

+ + + + + + Test for a reserved word. + +

Returns true if Atom is an + Erlang reserved word, otherwise false.

+ + + - Scan a string and return the Erlang tokens + Scan a string and return the Erlang tokens.

Takes the list of characters String and tries to - scan (tokenize) them. Returns {ok, Tokens, - EndLocation}, - where Tokens are the Erlang tokens from - String. EndLocation - is the first location after the last token.

-

{error, ErrorInfo, ErrorLocation} - is returned if an error occurs. - ErrorLocation is the first location after - the erroneous token.

+ scan (tokenize) them. Returns one of the following:

+ + {ok, Tokens, EndLocation} + +

Tokens are the Erlang tokens from + String. EndLocation + is the first location after the last token.

+ + {error, ErrorInfo, + ErrorLocation} + +

An error occurred. ErrorLocation is the + first location after the erroneous token.

+ +

string(String) is equivalent to string(String, 1), and string(String, @@ -95,80 +169,102 @@ StartLocation, []).

StartLocation indicates the initial location when scanning starts. If StartLocation is a line, - Anno as well as EndLocation and - ErrorLocation will be lines. If - StartLocation is a pair of a line and a column + Anno, EndLocation, and + ErrorLocation are lines. If + StartLocation is a pair of a line and a column, Anno takes the form of an opaque compound data type, and EndLocation and ErrorLocation - will be pairs of a line and a column. The token + are pairs of a line and a column. The token annotations contain information about the column and the line where the token begins, as well as the text of the - token (if the text option is given), all of which can + token (if option text is specified), all of which can be accessed by calling - column/1, - line/1, - location/1, and - text/1.

+ column/1, + line/1, + location/1, and + text/1.

A token is a tuple containing information about - syntactic category, the token annotations, and the actual - terminal symbol. For punctuation characters (e.g. ;, + syntactic category, the token annotations, and the + terminal symbol. For punctuation characters (such as ; and |) and reserved words, the category and the symbol coincide, and the token is represented by a two-tuple. - Three-tuples have one of the following forms: {atom, - Info, atom()}, - {char, Info, integer()}, {comment, Info, - string()}, {float, Info, float()}, {integer, - Info, integer()}, {var, Info, atom()}, - and {white_space, Info, string()}.

-

The valid options are:

+ Three-tuples have one of the following forms:

+ + {atom, Anno, atom()} + {char, Anno, char()} + {comment, Anno, string()} + {float, Anno, float()} + {integer, Anno, integer()} + {var, Anno, atom()} + {white_space, Anno, string()} + +

Valid options:

- {reserved_word_fun, reserved_word_fun()} -

A callback function that is called when the scanner - has found an unquoted atom. If the function returns - true, the unquoted atom itself will be the category - of the token; if the function returns false, - atom will be the category of the unquoted atom.

- - return_comments -

Return comment tokens.

- - return_white_spaces -

Return white space tokens. By convention, if there is - a newline character, it is always the first character of the - text (there cannot be more than one newline in a white space - token).

- - return -

Short for [return_comments, return_white_spaces].

- - text -

Include the token's text in the token annotation. The - text is the part of the input corresponding to the token.

- + {reserved_word_fun, reserved_word_fun()} +

A callback function that is called when the scanner + has found an unquoted atom. If the function returns + true, the unquoted atom itself becomes the category + of the token. If the function returns false, + atom becomes the category of the unquoted atom.

+ + return_comments +

Return comment tokens.

+ + return_white_spaces +

Return white space tokens. By convention, a newline + character, if present, is always the first character of the + text (there cannot be more than one newline in a white space + token).

+ + return +

Short for [return_comments, return_white_spaces].

+ + text +

Include the token text in the token annotation. The + text is the part of the input corresponding to the token.

+ + + + + Return the symbol. + +

Returns the symbol of Token.

+ + + + + + Return the text. + +

Returns the text of Token's collection + of annotations. If there is no text, undefined is + returned.

+ + + - Re-entrant scanner + Re-entrant scanner. - An opaque continuation + An opaque continuation. -

This is the re-entrant scanner which scans characters until - a dot ('.' followed by a white space) or - eof has been reached. It returns:

+

This is the re-entrant scanner, which scans characters until + either a dot ('.' followed by a white space) or + eof is reached. It returns:

{done, Result, LeftOverChars} -

This return indicates that there is sufficient input +

Indicates that there is sufficient input data to get a result. Result is:

- {ok, Tokens, EndLocation} - + {ok, Tokens, EndLocation}

The scanning was successful. Tokens is the list of tokens including dot.

@@ -177,8 +273,7 @@

End of file was encountered before any more tokens.

 - {error, ErrorInfo, EndLocation} - + {error, ErrorInfo, EndLocation}

An error occurred. LeftOverChars is the remaining characters of the input data, @@ -194,110 +289,26 @@

The CharSpec eof signals end of file. - LeftOverChars will then take the value eof + LeftOverChars then takes the value eof as well.

tokens(Continuation, CharSpec, StartLocation) is equivalent to tokens(Continuation, CharSpec, StartLocation, []).

-

See string/3 for a - description of the various options.

- - - - - Test for a reserved word - -

Returns true if Atom is an Erlang - reserved word, otherwise false.

- - - - - Return the category - -

Returns the category of Token. -

- - - - - Return the symbol - -

Returns the symbol of Token. -

- - - - - Return the column - -

Returns the column of Token's - collection of annotations. -

- - - - - Return the end location of the text - -

Returns the end location of the text of - Token's collection of annotations. If - there is no text, - undefined is returned. -

- - - - - Return the line - -

Returns the line of Token's collection - of annotations. -

- - - - - Return the location - -

Returns the location of Token's - collection of annotations. -

- - - - - Return the text - -

Returns the text of Token's collection - of annotations. If there is no text, undefined is - returned. -

- - - - - Format an error descriptor - -

Takes an ErrorDescriptor and returns - a string which - describes the error or warning. This function is usually - called implicitly when processing an ErrorInfo - structure (see below).

+

For a description of the options, see + string/3.
+ Error Information -

The ErrorInfo mentioned above is the standard - ErrorInfo structure which is returned from all IO - modules. It has the following format:

+

ErrorInfo is the standard ErrorInfo structure that is + returned from all I/O modules. The format is as follows:

{ErrorLocation, Module, ErrorDescriptor} -

A string which describes the error is obtained with the - following call:

+

A string describing the error is obtained with the following call:

Module:format_error(ErrorDescriptor)
@@ -305,15 +316,15 @@ Module:format_error(ErrorDescriptor)
Notes

The continuation of the first call to the re-entrant input - functions must be []. Refer to Armstrong, Virding and - Williams, 'Concurrent Programming in Erlang', Chapter 13, for a - complete description of how the re-entrant input scheme works.

+ functions must be []. For a complete description of how the + re-entrant input scheme works, see Armstrong, Virding and + Williams: 'Concurrent Programming in Erlang', Chapter 13.

See Also -

io(3), - erl_anno(3), - erl_parse(3)

+

erl_anno(3), + erl_parse(3), + io(3)

 diff --git a/lib/stdlib/doc/src/erl_tar.xml b/lib/stdlib/doc/src/erl_tar.xml index 1f4a43f622..24e7b64b9e 100644 --- a/lib/stdlib/doc/src/erl_tar.xml +++ b/lib/stdlib/doc/src/erl_tar.xml @@ -28,117 +28,146 @@ 1 Kenneth Lundin - 03-01-21 + 2003-01-21 A - erl_tar.sgml + erl_tar.xml
erl_tar - Unix 'tar' utility for reading and writing tar archives + Unix 'tar' utility for reading and writing tar archives. + -

The erl_tar module archives and extract files to and from - a tar file. erl_tar supports the ustar format +

This module archives and extract files to and from + a tar file. This module supports the ustar format (IEEE Std 1003.1 and ISO/IEC 9945-1). All modern tar programs (including GNU tar) can read this format. To ensure that that GNU tar produces a tar file that erl_tar can read, - give the --format=ustar option to GNU tar.

-

By convention, the name of a tar file should end in ".tar". - To abide to the convention, you'll need to add ".tar" yourself - to the name.

-

Tar files can be created in one operation using the - create/2 or - create/3 function.

-

Alternatively, for more control, the - open, - add/3,4, and - close/1 functions can be used.

-

To extract all files from a tar file, use the - extract/1 function. + specify option --format=ustar to GNU tar.

+ +

By convention, the name of a tar file is to end in ".tar". + To abide to the convention, add ".tar" to the name.

+ +

Tar files can be created in one operation using function + create/2 or + create/3.

+ +

Alternatively, for more control, use functions + open/2, + add/3,4, and + close/1.

+ +

To extract all files from a tar file, use function + extract/1. To extract only some files or to be able to specify some more options, - use the extract/2 function.

+ use function extract/2.

+

To return a list of the files in a tar file, - use either the table/1 or - table/2 function. + use function table/1 or + table/2. To print a list of files to the Erlang shell, - use either the t/1 or - tt/1 function.

+ use function t/1 or + tt/1.

+

To convert an error term returned from one of the functions - above to a readable message, use the - format_error/1 function.

+ above to a readable message, use function + format_error/1.
- UNICODE SUPPORT -

If file:native_name_encoding/0 - returns utf8, path names will be encoded in UTF-8 when - creating tar files and path names will be assumed to be encoded in - UTF-8 when extracting tar files.

+ Unicode Support +

If + file:native_name_encoding/0 + returns utf8, path names are encoded in UTF-8 when + creating tar files, and path names are assumed to be encoded in + UTF-8 when extracting tar files.

-

If file:native_name_encoding/0 - returns latin1, no translation of path names will be - done.

+

If + file:native_name_encoding/0 + returns latin1, no translation of path names is done.

- OTHER STORAGE MEDIA -

The erl_ftp module normally accesses the tar-file on disk using the file module. When other needs arise, there is a way to define your own low-level Erlang functions to perform the writing and reading on the storage media. See init/3 for usage.

-

An example of this is the sftp support in ssh_sftp:open_tar/3. That function opens a tar file on a remote machine using an sftp channel.

+ Other Storage Media +

The ftp + module (Inets) normally accesses the tar file on disk using + the file module. + When other needs arise, you can define your own low-level Erlang + functions to perform the writing and reading on the storage media; + use function init/3.

+ +

An example of this is the SFTP support in + + ssh_sftp:open_tar/3. This function opens a tar file + on a remote machine using an SFTP channel.

- LIMITATIONS -

For maximum compatibility, it is safe to archive files with names - up to 100 characters in length. Such tar files can generally be - extracted by any tar program.

-

If filenames exceed 100 characters in length, the resulting tar - file can only be correctly extracted by a POSIX-compatible tar - program (such as Solaris tar), not by GNU tar.

-

File have longer names than 256 bytes cannot be stored at all.

-

The filename of the file a symbolic link points is always limited - to 100 characters.

+ Limitations + + +

For maximum compatibility, it is safe to archive files with names + up to 100 characters in length. Such tar files can generally be + extracted by any tar program.

+ + +

For filenames exceeding 100 characters in length, the resulting tar + file can only be correctly extracted by a POSIX-compatible tar + program (such as Solaris tar or a modern GNU tar).

+ + +

Files with longer names than 256 bytes cannot be stored.

+ + +

The file name a symbolic link points is always limited + to 100 characters.

+ +
+ add(TarDescriptor, Filename, Options) -> RetValue - Add a file to an open tar file + Add a file to an open tar file. TarDescriptor = term() Filename = filename() Options = [Option] Option = dereference|verbose|{chunks,ChunkSize} - ChunkSize = positive_integer() + ChunkSize = positive_integer() RetValue = ok|{error,{Filename,Reason}} Reason = term() -

The add/3 function adds - a file to a tar file that has been opened for writing by - open/1.

+

Adds a file to a tar file that has been opened for writing by + open/1.

+

Options:

dereference -

By default, symbolic links will be stored as symbolic links - in the tar file. Use the dereference option to override the - default and store the file that the symbolic link points to into - the tar file.

+

By default, symbolic links are stored as symbolic links + in the tar file. To override the default and store the file + that the symbolic link points to into the tar file, use + option dereference.

 verbose -

Print an informational message about the file being added.

+

Prints an informational message about the added file.

+ + {chunks,ChunkSize} + +

Reads data in parts from the file. This is intended for + memory-limited machines that, for example, builds a tar file + on a remote machine over SFTP, see + + ssh_sftp:open_tar/3.

 - {chunks,ChunkSize} - -

Read data in parts from the file. This is intended for memory-limited - machines that for example builds a tar file on a remote machine over - sftp.

- + - add(TarDescriptor, FilenameOrBin, NameInArchive, Options) -> RetValue - Add a file to an open tar file + add(TarDescriptor, FilenameOrBin, NameInArchive, Options) -> + RetValue + Add a file to an open tar file. TarDescriptor = term() FilenameOrBin = filename()|binary() @@ -150,53 +179,55 @@ Reason = term() -

The add/4 function adds a file to a tar file - that has been opened for writing by - open/1. It accepts the same - options as add/3.

-

NameInArchive is the name under which the file will - be stored in the tar file. That is the name that the file will - get when it will be extracted from the tar file.

+

Adds a file to a tar file that has been opened for writing by + open/2. This function + accepts the same options as + add/3.

+

NameInArchive is the name under which the file becomes + stored in the tar file. The file gets this name when it is + extracted from the tar file.

 + close(TarDescriptor) - Close an open tar file + Close an open tar file. TarDescriptor = term() -

The close/1 function - closes a tar file - opened by open/1.

+

Closes a tar file + opened by open/2.

 + create(Name, FileList) ->RetValue - Create a tar archive + Create a tar archive. Name = filename() - FileList = [Filename|{NameInArchive, binary()},{NameInArchive, Filename}] + FileList = [Filename|{NameInArchive, binary()},{NameInArchive, + Filename}] Filename = filename() NameInArchive = filename() RetValue = ok|{error,{Name,Reason}} Reason = term() -

The create/2 function - creates a tar file and - archives the files whose names are given in FileList into it. - The files may either be read from disk or given as - binaries.

+

Creates a tar file and archives the files whose names are specified + in FileList into it. The files can either be read from disk + or be specified as binaries.

 + create(Name, FileList, OptionList) - Create a tar archive with options + Create a tar archive with options. Name = filename() - FileList = [Filename|{NameInArchive, binary()},{NameInArchive, Filename}] - Filename = filename() + FileList = [Filename|{NameInArchive, binary()},{NameInArchive, + Filename}] + Filename = filename() NameInArchive = filename() OptionList = [Option] Option = compressed|cooked|dereference|verbose @@ -204,68 +235,66 @@ Reason = term() -

The create/3 function - creates a tar file and archives the files whose names are given - in FileList into it. The files may either be read from - disk or given as binaries.

-

The options in OptionList modify the defaults as follows. -

+

Creates a tar file and archives the files whose names are specified + in FileList into it. The files can either be read from disk + or be specified as binaries.

+

The options in OptionList modify the defaults as follows:

compressed -

The entire tar file will be compressed, as if it has +

The entire tar file is compressed, as if it has been run through the gzip program. To abide to the - convention that a compressed tar file should end in ".tar.gz" or - ".tgz", you'll need to add the appropriate extension yourself.

+ convention that a compressed tar file is to end in + ".tar.gz" or ".tgz", add the appropriate + extension.

 cooked -

By default, the open/2 function will open the tar file - in raw mode, which is faster but does not allow a remote (erlang) - file server to be used. Adding cooked to the mode list will - override the default and open the tar file without the raw - option.

+

By default, function open/2 opens the tar file in + raw mode, which is faster but does not allow a remote + (Erlang) file server to be used. Adding cooked to the + mode list overrides the default and opens the tar file without + option raw.

 dereference -

By default, symbolic links will be stored as symbolic links - in the tar file. Use the dereference option to override the - default and store the file that the symbolic link points to into - the tar file.

+

By default, symbolic links are stored as symbolic links in + the tar file. To override the default and store the file that + the symbolic link points to into the tar file, use + option dereference.

 verbose -

Print an informational message about each file being added.

+

Prints an informational message about each added file.

 + extract(Name) -> RetValue - Extract all files from a tar file + Extract all files from a tar file. Name = filename() RetValue = ok|{error,{Name,Reason}} Reason = term() -

The extract/1 function - extracts all files from a tar archive.

-

If the Name argument is given as "{binary,Binary}", - the contents of the binary is assumed to be a tar archive. -

-

If the Name argument is given as "{file,Fd}", - Fd is assumed to be a file descriptor returned from - the file:open/2 function. -

-

Otherwise, Name should be a filename.

+

Extracts all files from a tar archive.

+

If argument Name is specified as {binary,Binary}, + the contents of the binary is assumed to be a tar archive.

+

If argument Name is specified as {file,Fd}, + Fd is assumed to be a file descriptor returned from function + file:open/2.

+

Otherwise, Name is to be a filename.

 + extract(Name, OptionList) - Extract files from a tar file + Extract files from a tar file. - Name = filename() | {binary,Binary} | {file,Fd} + Name = filename() | {binary,Binary} | {file,Fd} Binary = binary() Fd = file_descriptor() OptionList = [Option] @@ -278,272 +307,263 @@ Reason = term() -

The extract/2 function - extracts files from a tar archive.

-

If the Name argument is given as "{binary,Binary}", - the contents of the binary is assumed to be a tar archive. -

-

If the Name argument is given as "{file,Fd}", - Fd is assumed to be a file descriptor returned from - the file:open/2 function. -

-

Otherwise, Name should be a filename. -

+

Extracts files from a tar archive.

+

If argument Name is specified as {binary,Binary}, + the contents of the binary is assumed to be a tar archive.

+

If argument Name is specified as {file,Fd}, + Fd is assumed to be a file descriptor returned from function + file:open/2.

+

Otherwise, Name is to be a filename.

The following options modify the defaults for the extraction as - follows.

+ follows:

{cwd,Cwd} -

Files with relative filenames will by default be extracted - to the current working directory. - Given the {cwd,Cwd} option, the extract/2 function - will extract into the directory Cwd instead of to the current - working directory.

+

Files with relative filenames are by default extracted + to the current working directory. With this option, files are + instead extracted into directory Cwd.

 {files,FileList} -

By default, all files will be extracted from the tar file. - Given the {files,Files} option, the extract/2 function - will only extract the files whose names are included in FileList.

+

By default, all files are extracted from the tar file. With + this option, only those files are extracted whose names are + included in FileList.

 compressed -

Given the compressed option, the extract/2 - function will uncompress the file while extracting - If the tar file is not actually compressed, the compressed - will effectively be ignored.

+

With this option, the file is uncompressed while extracting. + If the tar file is not compressed, this option is ignored.

 cooked -

By default, the open/2 function will open the tar file - in raw mode, which is faster but does not allow a remote (erlang) - file server to be used. Adding cooked to the mode list will - override the default and open the tar file without the raw - option.

+

By default, function open/2 function opens the tar file + in raw mode, which is faster but does not allow a remote + (Erlang) file server to be used. Adding cooked to the mode + list overrides the default and opens the tar file without option + raw.

 memory -

Instead of extracting to a directory, the memory option will - give the result as a list of tuples {Filename, Binary}, where - Binary is a binary containing the extracted data of the file named - Filename in the tar file.

+

Instead of extracting to a directory, this option gives the + result as a list of tuples {Filename, Binary}, where + Binary is a binary containing the extracted data of the + file named Filename in the tar file.

 keep_old_files -

By default, all existing files with the same name as file in - the tar file will be overwritten - Given the keep_old_files option, the extract/2 function - will not overwrite any existing files.

+

By default, all existing files with the same name as files in + the tar file are overwritten. With this option, existing + files are not overwriten.

 verbose -

Print an informational message as each file is being extracted.

+

Prints an informational message for each extracted file.

 + format_error(Reason) -> string() - Convert error term to a readable string + Convert error term to a readable string. Reason = term() -

The format_error/1 - function converts - an error reason term to a human-readable error message string.

+

Cconverts an error reason term to a human-readable error message + string.

 + - open(Name, OpenModeList) -> RetValue - Open a tar file for writing. + init(UserPrivate, AccessMode, Fun) -> + {ok,TarDescriptor} | {error,Reason} + Create a TarDescriptor used in subsequent tar operations + when defining own low-level storage access functions. - Name = filename() - OpenModeList = [OpenMode] - Mode = write|compressed|cooked - RetValue = {ok,TarDescriptor}|{error,{Name,Reason}} - TarDescriptor = term() + UserPrivate = term() + AccessMode = [write] | [read] + Fun when AccessMode is [write] = + fun(write, {UserPrivate,DataToWrite})->...; + (position,{UserPrivate,Position})->...; + (close, UserPrivate)->... end + Fun when AccessMode is [read] = + fun(read2, {UserPrivate,Size})->...; + (position,{UserPrivate,Position})->...; + (close, UserPrivate)->... end + TarDescriptor = term() Reason = term() -

The open/2 function creates - a tar file for writing. - (Any existing file with the same name will be truncated.)

-

By convention, the name of a tar file should end in ".tar". - To abide to the convention, you'll need to add ".tar" yourself - to the name.

-

Except for the write atom the following atoms - may be added to OpenModeList:

+

The Fun is the definition of what to do when the different + storage operations functions are to be called from the higher tar + handling functions (such as add/3, add/4, and + close/1).

+

The Fun is called when the tar function wants to do a + low-level operation, like writing a block to a file. The Fun + is called as Fun(Op, {UserPrivate,Parameters...}), where + Op is the operation name, UserPrivate is the term + passed as the first argument to init/1 and + Parameters... are the data added by the tar function to be + passed down to the storage handling function.

+

Parameter UserPrivate is typically the result of opening a + low-level structure like a file descriptor or an SFTP channel id. + The different Fun clauses operate on that very term.

+

The following are the fun clauses parameter lists:

- compressed + (write, {UserPrivate,DataToWrite}) -

The entire tar file will be compressed, as if it has - been run through the gzip program. To abide to the - convention that a compressed tar file should end in ".tar.gz" or - ".tgz", you'll need to add the appropriate extension yourself.

+

Writes term DataToWrite using UserPrivate.

 - cooked + (close, UserPrivate) + +

Closes the access.

+ + (read2, {UserPrivate,Size}) -

By default, the open/2 function will open the tar file - in raw mode, which is faster but does not allow a remote (erlang) - file server to be used. Adding cooked to the mode list will - override the default and open the tar file without the raw - option.

+

Reads using UserPrivate but only Size bytes. + Notice that there is only an arity-2 read function, not an arity-1 + function.

+ + (position,{UserPrivate,Position}) + +

Sets the position of UserPrivate as defined for files in + + file:position/2

 -

Use the add/3,4 functions - to add one file at the time into an opened tar file. When you are - finished adding files, use the close - function to close the tar file.

+

Example:

+

The following is a complete Fun parameter for reading and + writing on files using the + file module:

+ +ExampleFun = + fun(write, {Fd,Data}) -> file:write(Fd, Data); + (position, {Fd,Pos}) -> file:position(Fd, Pos); + (read2, {Fd,Size}) -> file:read(Fd, Size); + (close, Fd) -> file:close(Fd) + end +

Here Fd was specified to function init/3 as:

+ +{ok,Fd} = file:open(Name, ...). +{ok,TarDesc} = erl_tar:init(Fd, [write], ExampleFun), +

TarDesc is then used:

+ +erl_tar:add(TarDesc, SomeValueIwantToAdd, FileNameInTarFile), +..., +erl_tar:close(TarDesc) +

When the erl_tar core wants to, for example, write a piece + of Data, it would call + ExampleFun(write, {UserPrivate,Data}).

+ +

This example with the file module operations is + not necessary to use directly, as that is what function + open/2 in principle + does.

+ -

The TarDescriptor term is not a file descriptor. - You should not rely on the specific contents of the TarDescriptor - term, as it may change in future versions as more features are added - to the erl_tar module.

+

The TarDescriptor term is not a file descriptor. You are + advised not to rely on the specific contents of this term, as it + can change in future Erlang/OTP releases when more features are + added to this module.

 - init(UserPrivate, AccessMode, Fun) -> {ok,TarDescriptor} | {error,Reason} - - Creates a TarDescriptor used in subsequent tar operations when - defining own low-level storage access functions - + open(Name, OpenModeList) -> RetValue + Open a tar file for writing. - UserPrivate = term() - AccessMode = [write] | [read] - Fun when AccessMode is [write] = fun(write, {UserPrivate,DataToWrite})->...; - (position,{UserPrivate,Position})->...; - (close, UserPrivate)->... - end - - Fun when AccessMode is [read] = fun(read2, {UserPrivate,Size})->...; - (position,{UserPrivate,Position})->...; - (close, UserPrivate)->... - end - - TarDescriptor = term() - Reason = term() + Name = filename() + OpenModeList = [OpenMode] + Mode = write|compressed|cooked + RetValue = {ok,TarDescriptor}|{error,{Name,Reason}} + TarDescriptor = term() + Reason = term() -

The Fun is the definition of what to do when the different - storage operations functions are to be called from the higher tar - handling functions (add/3, add/4, close/1...). -

-

The Fun will be called when the tar function wants to do - a low-level operation, like writing a block to a file. The Fun is called - as Fun(Op,{UserPrivate,Parameters...}) where Op is the operation name, - UserPrivate is the term passed as the first argument to init/1 and - Parameters... are the data added by the tar function to be passed down to - the storage handling function. -

-

The parameter UserPrivate is typically the result of opening a low level - structure like a file descriptor, a sftp channel id or such. The different Fun - clauses operates on that very term. -

-

The fun clauses parameter lists are:

- - (write, {UserPrivate,DataToWrite}) - Write the term DataToWrite using UserPrivate - (close, UserPrivate) - Close the access. - (read2, {UserPrivate,Size}) - Read using UserPrivate but only Size bytes. Note that there is - only an arity-2 read function, not an arity-1 - - (position,{UserPrivate,Position}) - Sets the position of UserPrivate as defined for files in file:position/2 - - - -

A complete Fun parameter for reading and writing on files using the - file module could be: -

- - ExampleFun = - fun(write, {Fd,Data}) -> file:write(Fd, Data); - (position, {Fd,Pos}) -> file:position(Fd, Pos); - (read2, {Fd,Size}) -> file:read(Fd,Size); - (close, Fd) -> file:close(Fd) - end - -

where Fd was given to the init/3 function as:

- - {ok,Fd} = file:open(Name,...). - {ok,TarDesc} = erl_tar:init(Fd, [write], ExampleFun), - -

The TarDesc is then used:

- - erl_tar:add(TarDesc, SomeValueIwantToAdd, FileNameInTarFile), - ...., - erl_tar:close(TarDesc) - -

When the erl_tar core wants to e.g. write a piece of Data, it would call - ExampleFun(write,{UserPrivate,Data}). -

- -

The example above with file module operations is not necessary to - use directly since that is what the open function - in principle does. -

- +

Creates a tar file for writing (any existing file with the same + name is truncated).

+

By convention, the name of a tar file is to end in ".tar". + To abide to the convention, add ".tar" to the name.

+

Except for the write atom, the following atoms + can be added to OpenModeList:

+ + compressed + +

The entire tar file is compressed, as if it has been run + through the gzip program. To abide to the convention + that a compressed tar file is to end in ".tar.gz" or + ".tgz", add the appropriate extension.

+ + cooked + +

By default, the tar file is opened in raw mode, which is + faster but does not allow a remote (Erlang) file server to be + used. Adding cooked to the mode list overrides the + default and opens the tar file without option raw.

+ + +

To add one file at the time into an opened tar file, use function + add/3,4. When you are + finished adding files, use function + close/1 to close the tar file.

-

The TarDescriptor term is not a file descriptor. - You should not rely on the specific contents of the TarDescriptor - term, as it may change in future versions as more features are added - to the erl_tar module.

+

The TarDescriptor term is not a file descriptor. You are + advised not to rely on the specific contents of this term, as it + can change in future Erlang/OTP releases when more features are + added to this module..

 table(Name) -> RetValue - Retrieve the name of all files in a tar file + Retrieve the name of all files in a tar file. Name = filename() RetValue = {ok,[string()]}|{error,{Name,Reason}} Reason = term() -

The table/1 function - retrieves the names of all files in the tar file Name.

+

Retrieves the names of all files in the tar file Name.

 + table(Name, Options) - Retrieve name and information of all files in a tar file + Retrieve name and information of all files in a tar file. + Name = filename() -

The table/2 function - retrieves the names of all files in the tar file Name.

+

Retrieves the names of all files in the tar file Name.

 + t(Name) - Print the name of each file in a tar file + Print the name of each file in a tar file. Name = filename() -

The t/1 function prints the names - of all files in the tar file Name to the Erlang shell. - (Similar to "tar t".)

+

Prints the names of all files in the tar file Name to the + Erlang shell (similar to "tar t").

 + tt(Name) - Print name and information for each file in a tar file + Print name and information for each file in a tar file. + Name = filename() -

The tt/1 function prints - names and - information about all files in the tar file Name to - the Erlang shell. (Similar to "tar tv".)

+

Prints names and information about all files in the tar file + Name to the Erlang shell (similar to "tar tv").

 diff --git a/lib/stdlib/doc/src/ets.xml b/lib/stdlib/doc/src/ets.xml index 9fb7d227a3..b8e262208d 100644 --- a/lib/stdlib/doc/src/ets.xml +++ b/lib/stdlib/doc/src/ets.xml @@ -29,103 +29,131 @@
ets - Built-In Term Storage + Built-in term storage.

This module is an interface to the Erlang built-in term storage BIFs. These provide the ability to store very large quantities of data in an Erlang runtime system, and to have constant access time to the data. (In the case of ordered_set, see below, access time is proportional to the logarithm of the number of - objects stored).

+ stored objects.)

+

Data is organized as a set of dynamic tables, which can store tuples. Each table is created by a process. When the process terminates, the table is automatically destroyed. Every table has access rights set at creation.

+

Tables are divided into four different types, set, - ordered_set, bag and duplicate_bag. + ordered_set, bag, and duplicate_bag. A set or ordered_set table can only have one object - associated with each key. A bag or duplicate_bag can + associated with each key. A bag or duplicate_bag table can have many objects associated with each key.

+

The number of tables stored at one Erlang node is limited. - The current default limit is approximately 1400 tables. The upper - limit can be increased by setting the environment variable + The current default limit is about 1400 tables. The upper + limit can be increased by setting environment variable ERL_MAX_ETS_TABLES before starting the Erlang runtime - system (i.e. with the -env option to - erl/werl). The actual limit may be slightly higher + system (that is, with option -env to + erl/werl). The actual limit can be slightly higher than the one specified, but never lower.

-

Note that there is no automatic garbage collection for tables. + +

Notice that there is no automatic garbage collection for tables. Even if there are no references to a table from any process, it - will not automatically be destroyed unless the owner process - terminates. It can be destroyed explicitly by using - delete/1. The default owner is the process that created the - table. Table ownership can be transferred at process termination - by using the heir option or explicitly - by calling give_away/3.

+ is not automatically destroyed unless the owner process + terminates. To destroy a table explicitly, use function + delete/1. + The default owner is the process that created the + table. To transfer table ownership at process termination, use + option heir or call + give_away/3.

+

Some implementation details:

+ - In the current implementation, every object insert and - look-up operation results in a copy of the object. - '$end_of_table' should not be used as a key since - this atom is used to mark the end of the table when using - first/next. +

In the current implementation, every object insert and + look-up operation results in a copy of the object.

 +

'$end_of_table' is not to be used as a key, as + this atom is used to mark the end of the table when using functions + first/1 and + next/2.

 -

Also worth noting is the subtle difference between + +

Notice the subtle difference between matching and comparing equal, which is - demonstrated by the different table types set and - ordered_set. Two Erlang terms match if they are of - the same type and have the same value, so that 1 matches - 1, but not 1.0 (as 1.0 is a float() - and not an integer()). Two Erlang terms compare equal if they either are of the same type and value, or if - both are numeric types and extend to the same value, so that - 1 compares equal to both 1 and 1.0. The - ordered_set works on the Erlang term order and - there is no defined order between an integer() and a - float() that extends to the same value, hence the key - 1 and the key 1.0 are regarded as equal in an - ordered_set table.

+ demonstrated by table types set and ordered_set:

+ + + +

Two Erlang terms match if they are of + the same type and have the same value, so that 1 matches + 1, but not 1.0 (as 1.0 is a float() + and not an integer()).

+ + +

Two Erlang terms compare equal + if they either are of the same type and value, or if + both are numeric types and extend to the same value, so that + 1 compares equal to both 1 and 1.0.

+ + +

The ordered_set works on the Erlang term order and + no defined order exists between an integer() and a + float() that extends to the same value. Hence the key + 1 and the key 1.0 are regarded as equal in an + ordered_set table.

+ + +
Failure -

In general, the functions below will exit with reason - badarg if any argument is of the wrong format, if the - table identifier is invalid or if the operation is denied due to +

The functions in this module exits with reason + badarg if any argument has the wrong format, if the + table identifier is invalid, or if the operation is denied because of table access rights (protected or private).

+
Concurrency

This module provides some limited support for concurrent access. All updates to single objects are guaranteed to be both atomic - and isolated. This means that an updating operation towards - a single object will either succeed or fail completely without any - effect at all (atomicity). - Nor can any intermediate results of the update be seen by other - processes (isolation). Some functions that update several objects + and isolated. This means that an updating operation to + a single object either succeeds or fails completely without any + effect (atomicity) and that + no intermediate results of the update can be seen by other + processes (isolation). Some functions that update many objects state that they even guarantee atomicity and isolation for the entire operation. In database terms the isolation level can be seen as - "serializable", as if all isolated operations were carried out serially, + "serializable", as if all isolated operations are carried out serially, one after the other in a strict order.

-

No other support is available within ETS that would guarantee - consistency between objects. However, the safe_fixtable/2 - function can be used to guarantee that a sequence of - first/1 and next/2 calls will traverse the table - without errors and that each existing object in the table is visited - exactly once, even if another process (or the same process) + +

No other support is available within this module that would guarantee + consistency between objects. However, function + safe_fixtable/2 + can be used to guarantee that a sequence of + first/1 and + next/2 calls traverse the + table without errors and that each existing object in the table is + visited exactly once, even if another (or the same) process simultaneously deletes or inserts objects into the table. - Nothing more is guaranteed; in particular objects that are inserted - or deleted during such a traversal may be visited once or not at all. - Functions that internally traverse over a table, like select - and match, will give the same guarantee as safe_fixtable.

+ Nothing else is guaranteed; in particular objects that are inserted + or deleted during such a traversal can be visited once or not at all. + Functions that internally traverse over a table, like + select and + match, + give the same guarantee as + safe_fixtable.

+
Match Specifications -

Some of the functions uses a match specification, - match_spec. A brief explanation is given in - select/2. For a detailed - description, see chapter - Match Specifications in Erlang - in ERTS User's Guide.

+

Some of the functions use a match specification, + match_spec. For a brief explanation, see + select/2. For a detailed + description, see section + Match Specifications in Erlang in ERTS User's Guide.

@@ -137,8 +165,7 @@

Opaque continuation used by select/1,3, - select_reverse/1,3, + select_reverse/1,3, match/1,3, and match_object/1,3.

 @@ -159,26 +186,30 @@ -

A table identifier, as returned by new/2.

 +

A table identifier, as returned by + new/2.

 + Return a list of all ETS tables.

Returns a list of all tables at the node. Named tables are - given by their names, unnamed tables are given by their + specified by their names, unnamed tables are specified by their table identifiers.

-

There is no guarantee of consistency in the returned list. Tables created - or deleted by other processes "during" the ets:all() call may or may - not be included in the list. Only tables created/deleted before - ets:all() is called are guaranteed to be included/excluded.

+

There is no guarantee of consistency in the returned list. Tables + created or deleted by other processes "during" the ets:all() + call either are or are not included in the list. Only tables + created/deleted before ets:all() is called are + guaranteed to be included/excluded.

 + Delete an entire ETS table. @@ -186,175 +217,187 @@

Deletes the entire table Tab.

 + - Delete all objects with a given key from an ETS table. + Delete all objects with a specified key from an ETS + table. -

Deletes all objects with the key Key from the table +

Deletes all objects with key Key from table Tab.

 + Delete all objects in an ETS table.

Delete all objects in the ETS table Tab. - The operation is guaranteed to be - atomic and isolated.

+ The operation is guaranteed to be + atomic and isolated.

 + Deletes a specific from an ETS table. -

Delete the exact object Object from the ETS table, +

Delete the exact object Object from the + ETS table, leaving objects with the same key but other differences - (useful for type bag). In a duplicate_bag, all - instances of the object will be deleted.

+ (useful for type bag). In a duplicate_bag table, all + instances of the object are deleted.

 + Read an ETS table from a file. -

Reads a file produced by tab2file/2 or - tab2file/3 and creates the - corresponding table Tab.

-

Equivalent to file2tab(Filename, []).

+

Reads a file produced by + tab2file/2 or + tab2file/3 and + creates the corresponding table Tab.

+

Equivalent to file2tab(Filename, []).

 + Read an ETS table from a file. -

Reads a file produced by tab2file/2 or - tab2file/3 and creates the +

Reads a file produced by + tab2file/2 or + tab2file/3 and creates the corresponding table Tab.

-

The currently only supported option is {verify,boolean()}. If - verification is turned on (by means of specifying - {verify,true}), the function utilizes whatever - information is present in the file to assert that the - information is not damaged. How this is done depends on which - extended_info was written using - tab2file/3.

-

If no extended_info is present in the file and - {verify,true} is specified, the number of objects - written is compared to the size of the original table when the - dump was started. This might make verification fail if the - table was - public and objects were added or removed while the - table was dumped to file. To avoid this type of problems, - either do not verify files dumped while updated simultaneously - or use the {extended_info, [object_count]} option to - tab2file/3, which - extends the information in the file with the number of objects - actually written.

-

If verification is turned on and the file was written with - the option {extended_info, [md5sum]}, reading the file - is slower and consumes radically more CPU time than - otherwise.

+

The only supported option is {verify,boolean()}. + If verification is turned on (by specifying {verify,true}), + the function uses whatever information is present in the file to + assert that the information is not damaged. How this is done depends + on which extended_info was written using + tab2file/3.

+

If no extended_info is present in the file and + {verify,true} is specified, the number of objects + written is compared to the size of the original table when the + dump was started. This can make verification fail if the table was + public and objects were added or removed while the + table was dumped to file. To avoid this problem, + either do not verify files dumped while updated simultaneously + or use option {extended_info, [object_count]} to + tab2file/3, which + extends the information in the file with the number of objects + written.

+

If verification is turned on and the file was written with + option {extended_info, [md5sum]}, reading the file + is slower and consumes radically more CPU time than otherwise.

{verify,false} is the default.

 + Return the first key in an ETS table. -

Returns the first key Key in the table Tab. - If the table is of the ordered_set type, the first key - in Erlang term order will be returned. If the table is of any - other type, the first key according to the table's internal - order will be returned. If the table is empty, - '$end_of_table' will be returned.

-

Use next/2 to find subsequent keys in the table.

+

Returns the first key Key in table + Tab. For an ordered_set table, the first + key in Erlang term order is returned. For other + table types, the first key according to the internal + order of the table is returned. If the table is empty, + '$end_of_table' is returned.

+

To find subsequent keys in the table, use + next/2.

 + - Fold a function over an ETS table + Fold a function over an ETS table.

Acc0 is returned if the table is empty. - This function is similar to lists:foldl/3. The order in - which the elements of the table are traversed is unspecified, - except for tables of type ordered_set, for which they - are traversed first to last.

- -

If Function inserts objects into the table, or another - process inserts objects into the table, those objects may - (depending on key ordering) be included in the traversal.

+ This function is similar to + lists:foldl/3. + The table elements are traversed is unspecified order, except for + ordered_set tables, where they are traversed first to last.

+

If Function inserts objects into the table, + or another + process inserts objects into the table, those objects can + (depending on key ordering) be included in the traversal.

 + - Fold a function over an ETS table + Fold a function over an ETS table.

Acc0 is returned if the table is empty. - This function is similar to lists:foldr/3. The order in - which the elements of the table are traversed is unspecified, - except for tables of type ordered_set, for which they - are traversed last to first.

- -

If Function inserts objects into the table, or another - process inserts objects into the table, those objects may - (depending on key ordering) be included in the traversal.

+ This function is similar to + lists:foldr/3. + The table elements are traversed is unspecified order, except for + ordered_set tables, where they are traversed last to first.

+

If Function inserts objects into the table, + or another + process inserts objects into the table, those objects can + (depending on key ordering) be included in the traversal.

 + - Fill an ETS table with objects from a Dets table. + Fill an ETS table with objects from a Dets + table.

Fills an already created ETS table with the objects in the - already opened Dets table named DetsTab. The existing - objects of the ETS table are kept unless overwritten.

-

Throws a badarg error if any of the tables does not exist or the - dets table is not open.

+ already opened Dets table DetsTab. + Existing objects in the ETS table are kept unless + overwritten.

+

If any of the tables does not exist or the Dets table is + not open, a badarg exception is raised.

 + - Pseudo function that transforms fun syntax to a match_spec. + Pseudo function that transforms fun syntax to a match + specification. -

Pseudo function that by means of a parse_transform - translates LiteralFun typed as parameter in the - function call to a - match_spec. With - "literal" is meant that the fun needs to textually be written +

Pseudo function that by a parse_transform translates + LiteralFun typed as parameter in the function + call to a + match specification. + With "literal" is meant that the fun must textually be written as the parameter of the function, it cannot be held in a - variable which in turn is passed to the function).

-

The parse transform is implemented in the module - ms_transform and the source must include the - file ms_transform.hrl in STDLIB for this + variable that in turn is passed to the function.

+

The parse transform is provided in the ms_transform + module and the source must include + file ms_transform.hrl in STDLIB for this pseudo function to work. Failing to include the hrl file in - the source will result in a runtime error, not a compile - time ditto. The include file is easiest included by adding - the line + the source results in a runtime error, not a compile + time error. The include file is easiest included by adding line -include_lib("stdlib/include/ms_transform.hrl"). to the source file.

The fun is very restricted, it can take only a single parameter (the object to match): a sole variable or a - tuple. It needs to use the is_ guard tests. - Language constructs that have no representation - in a match_spec (like if, case, receive - etc) are not allowed.

-

The return value is the resulting match_spec.

-

Example:

+ tuple. It must use the is_ guard tests. + Language constructs that have no representation in a match + specification (if, case, receive, + and so on) are not allowed.

+

The return value is the resulting match specification.

+

Example:

 1> ets:fun2ms(fun({M,N}) when N > 3 -> M end).
 [{{'$1','$2'},[{'>','$2',3}],['$1']}]
-

Variables from the environment can be imported, so that this - works:

+

Variables from the environment can be imported, so that the + following works:

 2> X=3.
 3
 3> ets:fun2ms(fun({M,N}) when N > X -> M end).
 [{{'$1','$2'},[{'>','$2',{const,3}}],['$1']}]
-

The imported variables will be replaced by match_spec +

The imported variables are replaced by match specification const expressions, which is consistent with the - static scoping for Erlang funs. Local or global function - calls can not be in the guard or body of the fun however. - Calls to builtin match_spec functions of course is allowed:

+ static scoping for Erlang funs. However, local or global function + calls cannot be in the guard or body of the fun. Calls to built-in + match specification functions is of course allowed:

 4> ets:fun2ms(fun({M,N}) when N > X, is_atomm(M) -> M end).
 Error: fun containing local Erlang function calls
@@ -362,724 +405,832 @@ Error: fun containing local Erlang function calls
 {error,transform_error}
 5> ets:fun2ms(fun({M,N}) when N > X, is_atom(M) -> M end).
 [{{'$1','$2'},[{'>','$2',{const,3}},{is_atom,'$1'}],['$1']}]
-

As can be seen by the example, the function can be called - from the shell too. The fun needs to be literally in the call - when used from the shell as well. Other means than the - parse_transform are used in the shell case, but more or less - the same restrictions apply (the exception being records, - as they are not handled by the shell).

+

As shown by the example, the function can be called + from the shell also. The fun must be literally in the call + when used from the shell as well.

-

If the parse_transform is not applied to a module which - calls this pseudo function, the call will fail in runtime - (with a badarg). The module ets actually - exports a function with this name, but it should never - really be called except for when using the function in the +

If the parse_transform is not applied to a module that + calls this pseudo function, the call fails in runtime + (with a badarg). The ets module + exports a function with this name, but it is never to + be called except when using the function in the shell. If the parse_transform is properly applied by - including the ms_transform.hrl header file, compiled - code will never call the function, but the function call is - replaced by a literal match_spec.

+ including header file ms_transform.hrl, compiled + code never calls the function, but the function call is + replaced by a literal match specification.

 -

For more information, see - ms_transform(3).

+

For more information, see + ms_transform(3).

 + Change owner of a table. -

Make process Pid the new owner of table Tab. - If successful, the message - {'ETS-TRANSFER',Tab,FromPid,GiftData} will be sent - to the new owner.

-

The process Pid must be alive, local and not already the - owner of the table. The calling process must be the table owner.

-

Note that give_away does not at all affect the - heir option of the table. A table - owner can for example set the heir to itself, give the table - away and then get it back in case the receiver terminates.

+

Make process Pid the new owner of table + Tab. If successful, message + {'ETS-TRANSFER',Tab,FromPid,GiftData} + is sent to the new owner.

+

The process Pid must be alive, local, and not + already the owner of the table. + The calling process must be the table owner.

+

Notice that this function does not affect option + heir of the table. A table + owner can, for example, set heir to itself, give the table + away, and then get it back if the receiver terminates.

 + - Display information about all ETS tables on tty. + Display information about all ETS tables on a terminal. + -

Displays information about all ETS tables on tty.

+

Displays information about all ETS tables on a terminal.

 + - Browse an ETS table on tty. + Browse an ETS table on a terminal. -

Browses the table Tab on tty.

+

Browses table Tab on a terminal.

 + - Return information about an ETS table. + Return information about an table. -

Returns information about the table Tab as a list of +

Returns information about table Tab as a list of tuples. If Tab has the correct type - for a table identifier, but does not refer to an existing ETS - table, undefined is returned. If Tab is not of the - correct type, this function fails with reason badarg.

- - - {compressed, boolean()}

- - Indicates if the table is compressed or not. - {heir, pid() | none}

- - The pid of the heir of the table, or none if no heir is set. - {keypos, integer() >= 1}

- - The key position. - {memory, integer() >= 0

- - The number of words allocated to the table. - {name, atom()}

- - The name of the table. - {named_table, boolean()}

- - Indicates if the table is named or not. - {node, node()}

- - The node where the table is stored. This field is no longer - meaningful as tables cannot be accessed from other nodes. - {owner, pid()}

- - The pid of the owner of the table. - {protection, access()}

- - The table access rights. - {size, integer() >= 0

- - The number of objects inserted in the table. - {type, type()}

- - The table type. - {read_concurrency, boolean()}

- - Indicates whether the table uses read_concurrency or not. - {write_concurrency, boolean()}

- - Indicates whether the table uses write_concurrency or not. - + for a table identifier, but does not refer to an existing ETS + table, undefined is returned. If Tab is + not of the correct type, a badarg exception is raised.

+ + {compressed, boolean()} + +

Indicates if the table is compressed.

+ + {heir, pid() | none} + +

The pid of the heir of the table, or none if no heir + is set.

+ + {keypos, integer() >= 1} + +

The key position.

+ + {memory, integer() >= 0 + +

The number of words allocated to the table.

+ + {name, atom()} + +

The table name.

+ + {named_table, boolean()} + +

Indicates if the table is named.

+ + {node, node()} + +

The node where the table is stored. This field is no longer + meaningful, as tables cannot be accessed from other nodes.

+ + {owner, pid()} + +

The pid of the owner of the table.

+ + {protection, + access()} + +

The table access rights.

+ + {size, integer() >= 0 + +

The number of objects inserted in the table.

+ + {type, + type()} + +

The table type.

+ + {read_concurrency, boolean()} + +

Indicates whether the table uses read_concurrency or + not.

+ + {write_concurrency, boolean()} + +

Indicates whether the table uses write_concurrency.

+ + + - Return the information associated with given item for an ETS table. + Return the information associated with the specified item for + an ETS table. -

Returns the information associated with Item for - the table Tab, or returns undefined if Tab - does not refer an existing ETS table. - If Tab is not of the correct type, or if Item is not - one of the allowed values, this function fails with reason badarg.

- -

In R11B and earlier, this function would not fail but return - undefined for invalid values for Item.

- - -

In addition to the {Item,Value} - pairs defined for info/1, the following items are - allowed:

+

Returns the information associated with Item for table + Tab, or returns undefined if Tab + does not refer an existing ETS table. If + Tab is + not of the correct type, or if Item is not + one of the allowed values, a badarg exception is raised.

+ +

In Erlang/OTP R11B and earlier, this function would not fail but + return undefined for invalid values for Item.

+ +

In addition to the {Item,Value} + pairs defined for info/1, + the following items are allowed:

- Item=fixed, Value=boolean()

- - Indicates if the table is fixed by any process or not. - -

Item=safe_fixed|safe_fixed_monotonic_time, Value={FixationTime,Info}|false

-

+ +

Item=fixed, Value=boolean()

+

Indicates if the table is fixed by any process.

+ + +

+

Item=safe_fixed|safe_fixed_monotonic_time, + Value={FixationTime,Info}|false

If the table has been fixed using - safe_fixtable/2, + + safe_fixtable/2, the call returns a tuple where FixationTime is the - time when the table was first fixed by a process, which - may or may not be one of the processes it is fixed by - right now.

-

The format and value of FixationTime depends on - Item:

- - safe_fixed -

FixationTime will correspond to the result - returned by - erlang:timestamp/0 - at the time of fixation. Note that when the system is using - single or multi - time warp - modes this might produce strange results. This - since the usage of safe_fixed is not - time warp - safe. Time warp safe code need to use - safe_fixed_monotonic_time instead.

 - - safe_fixed_monotonic_time -

FixationTime will correspond to the result - returned by - erlang:monotonic_time/0 - at the time of fixation. The usage of safe_fixed_monotonic_time is - time warp - safe.

 - + time when the table was first fixed by a process, which either + is or is not one of the processes it is fixed by now.

+

The format and value of FixationTime depends on + Item:

+ + safe_fixed + +

FixationTime corresponds to the result returned by + + erlang:timestamp/0 at the time of fixation. + Notice that when the system uses single or multi + time + warp modes this can produce strange results, as + the use of safe_fixed is not + + time warp safe. Time warp safe code must use + safe_fixed_monotonic_time instead.

+ + safe_fixed_monotonic_time + +

FixationTime corresponds to the result returned by + + erlang:monotonic_time/0 at the time of + fixation. The use of safe_fixed_monotonic_time is + + time warp safe.

+ +

Info is a possibly empty lists of tuples {Pid,RefCount}, one tuple for every process the - table is fixed by right now. RefCount is the value - of the reference counter, keeping track of how many times + table is fixed by now. RefCount is the value + of the reference counter and it keeps track of how many times the table has been fixed by the process.

If the table never has been fixed, the call returns - false.

 -

Item=stats, Value=tuple()

- Returns internal statistics about set, bag and duplicate_bag tables on an internal format used by OTP test suites. - Not for production use.

 + false.

+ + +

Item=stats, Value=tuple()

+

Returns internal statistics about set, bag, and + duplicate_bag tables on an internal format used by OTP + test suites. Not for production use.

 + Replace all objects of an ETS table. -

Replaces the existing objects of the table Tab with - objects created by calling the input function InitFun, +

Replaces the existing objects of table Tab with + objects created by calling the input function + InitFun, see below. This function is provided for compatibility with the dets module, it is not more efficient than filling - a table by using ets:insert/2. -

-

When called with the argument read the function - InitFun is assumed to return end_of_input when + a table by using + insert/2.

+

When called with argument read, the function + InitFun is assumed to return + end_of_input when there is no more input, or {Objects, Fun}, where - Objects is a list of objects and Fun is a new - input function. Any other value Value is returned as an error - {error, {init_fun, Value}}. Each input function will be - called exactly once, and should an error occur, the last - function is called with the argument close, the reply + Objects is a list of objects and Fun is a + new input function. Any other value Value is returned as an + error {error, {init_fun, Value}}. Each input function is + called exactly once, and if an error occur, the last + function is called with argument close, the reply of which is ignored.

-

If the type of the table is set and there is more - than one object with a given key, one of the objects is +

If the table type is set and more than one object + exists with a given key, one of the objects is chosen. This is not necessarily the last object with the given key in the sequence of objects returned by the input functions. This holds also for duplicated objects stored in tables of type bag.

 + Insert an object into an ETS table. -

Inserts the object or all of the objects in the list - ObjectOrObjects into the table Tab. - If the table is a set and the key of the inserted - objects matches the key of any object in the table, - the old object will be replaced. If the table is an - ordered_set and the key of the inserted object - compares equal to the key of any object in the - table, the old object is also replaced. If the list contains - more than one object with matching keys and the table is a - set, one will be inserted, which one is - not defined. The same thing holds for ordered_set, but - will also happen if the keys compare equal.

+

Inserts the object or all of the objects in list + ObjectOrObjects into table + Tab.

+ + +

If the table type is set and the key of the inserted + objects matches the key of any object in the table, + the old object is replaced.

+ + +

If the table type is ordered_set and the key of the + inserted object compares equal to the key of any object + in the table, the old object is replaced.

+ + +

If the list contains more than one object with + matching keys and the table type is set, one is + inserted, which one is not defined. + The same holds for table type ordered_set + if the keys compare equal.

+ +

The entire operation is guaranteed to be atomic and isolated, even when a list of objects is inserted.

 + - Insert an object into an ETS table if the key is not already present. + Insert an object into an ETS table if the key is not + already present. -

This function works exactly like insert/2, with the - exception that instead of overwriting objects with the same - key (in the case of set or ordered_set) or - adding more objects with keys already existing in the table - (in the case of bag and duplicate_bag), it - simply returns false. If ObjectOrObjects is a - list, the function checks every key prior to - inserting anything. Nothing will be inserted if not +

Same as insert/2 + except that instead of overwriting objects with the same key + (for set or ordered_set) or adding more objects with + keys already existing in the table (for bag and + duplicate_bag), false is returned.

+

If ObjectOrObjects is a + list, the function checks every key before + inserting anything. Nothing is inserted unless all keys present in the list are absent from the table. Like insert/2, the entire operation is guaranteed to be atomic and isolated.

 + - Checks if an Erlang term is the result of ets:match_spec_compile + Check if an Erlang term is the result of + match_spec_compile. -

This function is used to check if a term is a valid - compiled match_spec. - The compiled match_spec is an opaque datatype which can - not be sent between Erlang nodes nor be stored on +

Checks if a term is a valid + compiled match specification. + The compiled match specification is an opaque datatype that + cannot be sent between Erlang nodes or be stored on disk. Any attempt to create an external representation of a - compiled match_spec will result in an empty binary - (>]]>). As an example, the following - expression:

+ compiled match specification results in an empty binary + (>]]>).

+

Examples:

+

The following expression yields true::

ets:is_compiled_ms(ets:match_spec_compile([{'_',[],[true]}])). -

will yield true, while the following expressions:

+

The following expressions yield false, as variable + Broken contains a compiled match specification that has + passed through external representation:

MS = ets:match_spec_compile([{'_',[],[true]}]), Broken = binary_to_term(term_to_binary(MS)), ets:is_compiled_ms(Broken). -

will yield false, as the variable Broken will contain - a compiled match_spec that has passed through external - representation.

-

The fact that compiled match_specs has no external - representation is for performance reasons. It may be subject - to change in future releases, while this interface will - still remain for backward compatibility reasons.

+

The reason for not having an external representation of + compiled match specifications is performance. It can be + subject to change in future releases, while this interface + remains for backward compatibility.

 + - Return the last key in an ETS table of typeordered_set. + Return the last key in an ETS table of type + ordered_set. -

Returns the last key Key according to Erlang term - order in the table Tab of the ordered_set type. - If the table is of any other type, the function is synonymous - to first/1. If the table is empty, - '$end_of_table' is returned.

-

Use prev/2 to find preceding keys in the table.

+

Returns the last key Key according to Erlang + term order in table Tab of type ordered_set. For + other table types, the function is synonymous to + first/1. + If the table is empty, '$end_of_table' is returned.

+

To find preceding keys in the table, use + prev/2.

 + - Return all objects with a given key in an ETS table. + Return all objects with a specified key in an ETS table. + -

Returns a list of all objects with the key Key in - the table Tab.

-

In the case of set, bag and duplicate_bag, an object - is returned only if the given key matches the key - of the object in the table. If the table is an - ordered_set however, an object is returned if the key - given compares equal to the key of an object in the - table. The difference being the same as between =:= - and ==. As an example, one might insert an object - with the +

Returns a list of all objects with key Key in + table Tab.

+ + +

For tables of type set, bag, or + duplicate_bag, an object is returned only if the specified + key matches the key of the object in the table.

+ + +

For tables of type ordered_set, an object is returned if + the specified key compares equal to the key of an object + in the table.

+ + +

The difference is the same as between =:= and ==.

+

As an example, one can insert an object with integer() 1 as a key in an ordered_set - and get the object returned as a result of doing a - lookup/2 with the float() 1.0 as the - key to search for.

-

If the table is of type set or ordered_set, + and get the object returned as a result of doing a lookup/2 + with float() 1.0 as the key to search for.

+

For tables of type set or ordered_set, the function returns either the empty list or a list with one element, as there cannot be more than one object with the same - key. If the table is of type bag or - duplicate_bag, the function returns a list of - arbitrary length.

-

Note that the time order of object insertions is preserved; - the first object inserted with the given key will be first + key. For tables of type bag or duplicate_bag, the + function returns a list of arbitrary length.

+

Notice that the time order of object insertions is preserved; + the first object inserted with the specified key is the first in the resulting list, and so on.

-

Insert and look-up times in tables of type set, - bag and duplicate_bag are constant, regardless - of the size of the table. For the ordered_set - data-type, time is proportional to the (binary) logarithm of +

Insert and lookup times in tables of type set, + bag, and duplicate_bag are constant, regardless + of the table size. For the ordered_set + datatype, time is proportional to the (binary) logarithm of the number of objects.

 + - Return the Pos:th element of all objects with a given key in an ETS table. + Return the Pos:th element of all objects with a + specified key in an ETS table. -

If the table Tab is of type set or - ordered_set, the function returns the Pos:th - element of the object with the key Key.

-

If the table is of type bag or duplicate_bag, - the functions returns a list with the Pos:th element of - every object with the key Key.

-

If no object with the key Key exists, the function - will exit with reason badarg.

-

The difference between set, bag and +

For a table Tab of type set or + ordered_set, the function returns the + Pos:th + element of the object with key Key.

+

For tables of type bag or duplicate_bag, + the functions returns a list with the Pos:th + element of every object with key Key.

+

If no object with key Key exists, the + function exits with reason badarg.

+

The difference between set, bag, and duplicate_bag on one hand, and ordered_set on - the other, regarding the fact that ordered_set's + the other, regarding the fact that ordered_set view keys as equal when they compare equal - whereas the other table types only regard them equal when - they match, naturally holds for - lookup_element as well as for lookup.

+ whereas the other table types regard them equal only when + they match, holds for lookup_element/3.

 + + + + Continues matching objects in an ETS table. + +

Continues a match started with + match/3. The next + chunk of the size specified in the initial match/3 + call is returned together with a new Continuation, + which can be used in subsequent calls to this function.

+

When there are no more objects in the table, '$end_of_table' + is returned.

+ + + - Match the objects in an ETS table against a pattern. + Match the objects in an ETS table against a pattern. + -

Matches the objects in the table Tab against the +

Matches the objects in table Tab against pattern Pattern.

-

A pattern is a term that may contain:

+

A pattern is a term that can contain:

- bound parts (Erlang terms), - '_' which matches any Erlang term, and - pattern variables: '$N' where - N=0,1,... + Bound parts (Erlang terms) + '_' that matches any Erlang term + Pattern variables '$N', where N=0,1,...

The function returns a list with one element for each matching object, where each element is an ordered list of - pattern variable bindings. An example:

+ pattern variable bindings, for example:

-6> ets:match(T, '$1'). % Matches every object in the table
+6> ets:match(T, '$1'). % Matches every object in table
 [[{rufsen,dog,7}],[{brunte,horse,5}],[{ludde,dog,5}]]
 7> ets:match(T, {'_',dog,'$1'}).
 [[7],[5]]
 8> ets:match(T, {'_',cow,'$1'}).
 []

If the key is specified in the pattern, the match is very - efficient. If the key is not specified, i.e. if it is a + efficient. If the key is not specified, that is, if it is a variable or an underscore, the entire table must be searched. The search time can be substantial if the table is very large.

-

On tables of the ordered_set type, the result is in - the same order as in a first/next traversal.

+

For tables of type ordered_set, the result is in + the same order as in a first/next traversal.

 + - Match the objects in an ETS table against a pattern and returns part of the answers. + Match the objects in an ETS table against a pattern + and return part of the answers. -

Works like ets:match/2 but only returns a limited - (Limit) number of matching objects. The - Continuation term can then be used in subsequent calls - to ets:match/1 to get the next chunk of matching - objects. This is a space efficient way to work on objects in a - table which is still faster than traversing the table object - by object using ets:first/1 and ets:next/1.

-

'$end_of_table' is returned if the table is empty.

+

Works like match/2, + but returns only a limited (Limit) number of + matching objects. Term Continuation can then + be used in subsequent calls to + match/1 to get the next chunk of matching + objects. This is a space-efficient way to work on objects in a + table, which is faster than traversing the table object + by object using + first/1 and + next/2.

+

If the table is empty, '$end_of_table' is returned.

 + - - Continues matching objects in an ETS table. + + Delete all objects that match a specified pattern from an + ETS table. -

Continues a match started with ets:match/3. The next - chunk of the size given in the initial ets:match/3 - call is returned together with a new Continuation - that can be used in subsequent calls to this function.

-

'$end_of_table' is returned when there are no more - objects in the table.

+

Deletes all objects that match pattern Pattern + from table Tab. For a description of patterns, + see match/2.

 + - - Delete all objects which match a given pattern from an ETS table. + + Continues matching objects in an ETS table. -

Deletes all objects which match the pattern Pattern - from the table Tab. See match/2 for a - description of patterns.

+

Continues a match started with + match_object/3. + The next chunk of the size specified in the initial + match_object/3 call is returned together with a new + Continuation, which can be used in subsequent + calls to this function.

+

When there are no more objects in the table, '$end_of_table' + is returned.

 + - Match the objects in an ETS table against a pattern. + Match the objects in an ETS table against a pattern. + -

Matches the objects in the table Tab against the - pattern Pattern. See match/2 for a description - of patterns. The function returns a list of all objects which +

Matches the objects in table Tab against + pattern Pattern. For a description of patterns, + see match/2. + The function returns a list of all objects that match the pattern.

If the key is specified in the pattern, the match is very - efficient. If the key is not specified, i.e. if it is a + efficient. If the key is not specified, that is, if it is a variable or an underscore, the entire table must be searched. The search time can be substantial if the table is very large.

-

On tables of the ordered_set type, the result is in - the same order as in a first/next traversal.

+

For tables of type ordered_set, the result is in + the same order as in a first/next traversal.

 + - Match the objects in an ETS table against a pattern and returns part of the answers. + Match the objects in an ETS table against a pattern and + return part of the answers. -

Works like ets:match_object/2 but only returns a - limited (Limit) number of matching objects. The - Continuation term can then be used in subsequent calls - to ets:match_object/1 to get the next chunk of matching - objects. This is a space efficient way to work on objects in a - table which is still faster than traversing the table object - by object using ets:first/1 and ets:next/1.

-

'$end_of_table' is returned if the table is empty.

- - - - - Continues matching objects in an ETS table. - -

Continues a match started with ets:match_object/3. - The next chunk of the size given in the initial - ets:match_object/3 call is returned together with a - new Continuation that can be used in subsequent calls - to this function.

-

'$end_of_table' is returned when there are no more - objects in the table.

+

Works like + match_object/2, but only returns a + limited (Limit) number of matching objects. Term + Continuation can then be used in subsequent + calls to + match_object/1 to get the next chunk of matching + objects. This is a space-efficient way to work on objects in a + table, which is faster than traversing the table object + by object using + first/1 and + next/2.

+

If the table is empty, '$end_of_table' is returned.

 + - Compiles a match specification into its internal representation + Compile a match specification into its internal representation. + -

This function transforms a - match_spec into an - internal representation that can be used in subsequent calls - to ets:match_spec_run/2. The internal representation is - opaque and can not be converted to external term format and - then back again without losing its properties (meaning it can - not be sent to a process on another node and still remain a - valid compiled match_spec, nor can it be stored on disk). - The validity of a compiled match_spec can be checked using - ets:is_compiled_ms/1.

-

If the term MatchSpec can not be compiled (does not - represent a valid match_spec), a badarg fault is - thrown.

+

Transforms a + match specification into an + internal representation that can be used in subsequent calls to + match_spec_run/2. + The internal representation is + opaque and cannot be converted to external term format and + then back again without losing its properties (that is, it cannot + be sent to a process on another node and still remain a + valid compiled match specification, nor can it be stored on disk). + To check the validity of a compiled match specification, use + is_compiled_ms/1. +

+

If term MatchSpec cannot be compiled (does not + represent a valid match specification), a badarg exception is + raised.

-

This function has limited use in normal code, it is used by - Dets to perform the dets:select operations.

+

This function has limited use in normal code. It is used by the + dets module + to perform the dets:select() operations.

 + - Performs matching, using a compiled match_spec, on a list of tuples + Perform matching, using a compiled match specification on a + list of tuples. -

This function executes the matching specified in a - compiled match_spec on - a list of tuples. The CompiledMatchSpec term should be - the result of a call to ets:match_spec_compile/1 and - is hence the internal representation of the match_spec one - wants to use.

-

The matching will be executed on each element in List - and the function returns a list containing all results. If an - element in List does not match, nothing is returned +

Executes the matching specified in a compiled + match specification on a list + of tuples. Term CompiledMatchSpec is to be + the result of a call to + match_spec_compile/1 and is hence the internal + representation of the match specification one wants to use.

+

The matching is executed on each element in List + and the function returns a list containing all results. If an element + in List does not match, nothing is returned for that element. The length of the result list is therefore - equal or less than the the length of the parameter - List. The two calls in the following example will give - the same result (but certainly not the same execution - time...):

+ equal or less than the length of parameter List. +

+

Example:

+

The following two calls give the same result (but certainly not the + same execution time):

Table = ets:new... -MatchSpec = .... +MatchSpec = ... % The following call... ets:match_spec_run(ets:tab2list(Table), ets:match_spec_compile(MatchSpec)), -% ...will give the same result as the more common (and more efficient) -ets:select(Table,MatchSpec), +% ...gives the same result as the more common (and more efficient) +ets:select(Table, MatchSpec), -

This function has limited use in normal code, it is used by - Dets to perform the dets:select operations and by +

This function has limited use in normal code. It is used by the + dets module + to perform the dets:select() operations and by Mnesia during transactions.

 + - Tests for occurrence of a key in an ETS table + Tests for occurrence of a key in an ETS table. -

Works like lookup/2, but does not return the objects. - The function returns true if one or more elements in - the table has the key Key, false otherwise.

+

Works like lookup/2, + but does not return the objects. Returns true if one or more + elements in the table has key Key, otherwise + false.

 + Create a new ETS table. -

Creates a new table and returns a table identifier which can +

Creates a new table and returns a table identifier that can be used in subsequent operations. The table identifier can be sent to other processes so that a table can be shared between different processes within a node.

-

The parameter Options is a list of atoms which - specifies table type, access rights, key position and if the - table is named or not. If one or more options are left out, - the default values are used. This means that not specifying - any options ([]) is the same as specifying - [set, protected, {keypos,1}, {heir,none}, {write_concurrency,false}, {read_concurrency,false}].

- +

Parameter Options is a list of atoms that + specifies table type, access rights, key position, and whether the + table is named. Default values are used for omitted options. + This means that not specifying any options ([]) is the same + as specifying [set, protected, {keypos,1}, {heir,none}, + {write_concurrency,false}, {read_concurrency,false}].

+ + set -

set - The table is a set table - one key, one object, +

The table is a set table: one key, one object, no order among objects. This is the default table type.

 + ordered_set -

ordered_set - The table is a ordered_set table - one key, one +

The table is a ordered_set table: one key, one object, ordered in Erlang term order, which is the order implied by the < and > operators. Tables of this type have a somewhat different behavior in some situations - than tables of the other types. Most notably the + than tables of other types. Most notably, the ordered_set tables regard keys as equal when they compare equal, not only when they match. This - means that to an ordered_set, the - integer() 1 and the float() 1.0 are regarded as equal. This also means that the + means that to an ordered_set table, integer() + 1 and float() 1.0 are regarded as equal. + This also means that the key used to lookup an element not necessarily - matches the key in the elements returned, if + matches the key in the returned elements, if float()'s and integer()'s are mixed in keys of a table.

 + bag -

bag - The table is a bag table which can have many +

The table is a bag table, which can have many objects, but only one instance of each object, per key.

 + duplicate_bag -

duplicate_bag - The table is a duplicate_bag table which can have +

The table is a duplicate_bag table, which can have many objects, including multiple copies of the same object, per key.

 + public -

public - Any process may read or write to the table.

+

Any process can read or write to the table.

+ + protected - -

protected - The owner process can read and write to the table. Other +

The owner process can read and write to the table. Other processes can only read the table. This is the default setting for the access rights.

+ + private - -

private - Only the owner process can read or write to the table.

+

Only the owner process can read or write to the table.

 + named_table -

named_table - If this option is present, the name Name is +

If this option is present, name Name is associated with the table identifier. The name can then be used instead of the table identifier in subsequent operations.

 + {keypos,Pos} -

{keypos,Pos} - Specifies which element in the stored tuples should be - used as key. By default, it is the first element, i.e. - Pos=1. However, this is not always appropriate. In +

Specifies which element in the stored tuples to use + as key. By default, it is the first element, that is, + Pos=1. However, this is not always + appropriate. In particular, we do not want the first element to be the key if we want to store Erlang records in a table.

-

Note that any tuple stored in the table must have at +

Notice that any tuple stored in the table must have at least Pos number of elements.

- - -

{heir,Pid,HeirData} | {heir,none}

- Set a process as heir. The heir will inherit the table if - the owner terminates. The message - {'ETS-TRANSFER',tid(),FromPid,HeirData} will be sent to - the heir when that happens. The heir must be a local process. - Default heir is none, which will destroy the table when - the owner terminates.

 + {heir,Pid,HeirData} | + {heir,none} +

Set a process as heir. The heir inherits the table if + the owner terminates. Message + {'ETS-TRANSFER',tid(),FromPid,HeirData} is + sent to the heir when that occurs. The heir must be a local + process. Default heir is none, which destroys the table + when the owner terminates.

-

{write_concurrency,boolean()} - Performance tuning. Default is false, in which case an operation that - mutates (writes to) the table will obtain exclusive access, - blocking any concurrent access of the same table until finished. - If set to true, the table is optimized towards concurrent - write access. Different objects of the same table can be mutated - (and read) by concurrent processes. This is achieved to some degree - at the expense of memory consumption and the performance of - sequential access and concurrent reading. - The write_concurrency option can be combined with the - read_concurrency - option. You typically want to combine these when large concurrent - read bursts and large concurrent write bursts are common (see the - documentation of the - read_concurrency - option for more information). - Note that this option does not change any guarantees about - atomicy and isolation. - Functions that makes such promises over several objects (like - insert/2) will gain less (or nothing) from this option.

-

In current implementation, table type ordered_set is not - affected by this option. Also, the memory consumption inflicted by - both write_concurrency and read_concurrency is a - constant overhead per table. This overhead can be especially large - when both options are combined.

 + {write_concurrency,boolean()} +

Performance tuning. Defaults to false, in which case an + operation that + mutates (writes to) the table obtains exclusive access, + blocking any concurrent access of the same table until finished. + If set to true, the table is optimized to concurrent + write access. Different objects of the same table can be mutated + (and read) by concurrent processes. This is achieved to some + degree at the expense of memory consumption and the performance + of sequential access and concurrent reading.

+

Option write_concurrency can be combined with option + + read_concurrency. You typically want to combine + these when large concurrent read bursts and large concurrent + write bursts are common; for more information, see option + + read_concurrency.

+

Notice that this option does not change any guarantees about + atomicity and isolation. + Functions that makes such promises over many objects (like + insert/2) + gain less (or nothing) from this option.

+

Table type ordered_set is not affected by this option. + Also, the memory consumption inflicted by + both write_concurrency and read_concurrency is a + constant overhead per table. This overhead can be especially + large when both options are combined.

-

{read_concurrency,boolean()} - Performance tuning. Default is false. When set to - true, the table is optimized for concurrent read - operations. When this option is enabled on a runtime system with - SMP support, read operations become much cheaper; especially on - systems with multiple physical processors. However, switching - between read and write operations becomes more expensive. You - typically want to enable this option when concurrent read - operations are much more frequent than write operations, or when - concurrent reads and writes comes in large read and write - bursts (i.e., lots of reads not interrupted by writes, and lots - of writes not interrupted by reads). You typically do - not want to enable this option when the common access - pattern is a few read operations interleaved with a few write - operations repeatedly. In this case you will get a performance - degradation by enabling this option. The read_concurrency - option can be combined with the - write_concurrency - option. You typically want to combine these when large concurrent - read bursts and large concurrent write bursts are common.

 + {read_concurrency,boolean()} +

Performance tuning. Defaults to false. When set to + true, the table is optimized for concurrent read + operations. When this option is enabled on a runtime system with + SMP support, read operations become much cheaper; especially on + systems with multiple physical processors. However, switching + between read and write operations becomes more expensive.

+

You typically want to enable this option when concurrent read + operations are much more frequent than write operations, or when + concurrent reads and writes comes in large read and write bursts + (that is, many reads not interrupted by writes, and many + writes not interrupted by reads).

+

You typically do + not want to enable this option when the common access + pattern is a few read operations interleaved with a few write + operations repeatedly. In this case, you would get a performance + degradation by enabling this option.

+

Option read_concurrency can be combined with option + + write_concurrency. + You typically want to combine these when large concurrent + read bursts and large concurrent write bursts are common.

-

compressed - If this option is present, the table data will be stored in a more compact format to - consume less memory. The downside is that it will make table operations slower. - Especially operations that need to inspect entire objects, - such as match and select, will get much slower. The key element - is not compressed in current implementation.

 - + compressed + +

If this option is present, the table data is stored in a more + compact format to consume less memory. However, it will make + table operations slower. Especially operations that need to + inspect entire objects, such as match and select, + get much slower. The key element is not compressed.

+ + + Return the next key in an ETS table. -

Returns the next key Key2, following the key - Key1 in the table Tab. If the table is of the - ordered_set type, the next key in Erlang term order is - returned. If the table is of any other type, the next key - according to the table's internal order is returned. If there - is no next key, '$end_of_table' is returned.

-

Use first/1 to find the first key in the table.

-

Unless a table of type set, bag or +

Returns the next key Key2, following key + Key1 in table Tab. For table + type ordered_set, the next key in Erlang term order is + returned. For other table types, the next key + according to the internal order of the table is returned. If no + next key exists, '$end_of_table' is returned.

+

To find the first key in the table, use + first/1.

+

Unless a table of type set, bag, or duplicate_bag is protected using - safe_fixtable/2, see below, a traversal may fail if - concurrent updates are made to the table. If the table is of + safe_fixtable/2, + a traversal can fail if + concurrent updates are made to the table. For table type ordered_set, the function returns the next key in order, even if the object does no longer exist.

 + - Return the previous key in an ETS table of typeordered_set. + Return the previous key in an ETS table of type + ordered_set. -

Returns the previous key Key2, preceding the key - Key1 according the Erlang term order in the table - Tab of the ordered_set type. If the table is of - any other type, the function is synonymous to next/2. - If there is no previous key, '$end_of_table' is - returned.

-

Use last/1 to find the last key in the table.

+

Returns the previous key Key2, preceding key + Key1 according to Erlang term order in table + Tab of type ordered_set. For other + table types, the function is synonymous to + next/2. + If no previous key exists, '$end_of_table' is returned.

+

To find the last key in the table, use + last/1.

 + Rename a named ETS table.

Renames the named table Tab to the new name - Name. Afterwards, the old name can not be used to + Name. Afterwards, the old name cannot be used to access the table. Renaming an unnamed table has no effect.

 + - Repair a continuation from ets:select/1 or ets:select/3 that has passed through external representation + Repair a continuation from ets:select/1 or ets:select/3 + that has passed through external representation. -

This function can be used to restore an opaque continuation - returned by ets:select/3 or ets:select/1 if the +

Restores an opaque continuation returned by + select/3 or + select/1 if the continuation has passed through external term format (been sent between nodes or stored on disk).

The reason for this function is that continuation terms - contain compiled match_specs and therefore will be - invalidated if converted to external term format. Given that - the original match_spec is kept intact, the continuation can + contain compiled match specifications and therefore are + invalidated if converted to external term format. Given that the + original match specification is kept intact, the continuation can be restored, meaning it can once again be used in subsequent - ets:select/1 calls even though it has been stored on + select/1 calls even though it has been stored on disk or on another node.

-

As an example, the following sequence of calls will fail:

+

Examples:

+

The following sequence of calls fails:

T=ets:new(x,[]), ... @@ -1089,7 +1240,9 @@ A end),10), Broken = binary_to_term(term_to_binary(C)), ets:select(Broken). -

...while the following sequence will work:

+

The following sequence works, as the call to + repair_continuation/2 reestablishes the (deliberately) + invalidated continuation Broken.

T=ets:new(x,[]), ... @@ -1100,45 +1253,44 @@ end), {_,C} = ets:select(T,MS,10), Broken = binary_to_term(term_to_binary(C)), ets:select(ets:repair_continuation(Broken,MS)). -

...as the call to ets:repair_continuation/2 will - reestablish the (deliberately) invalidated continuation - Broken.

-

This function is very rarely needed in application code. It - is used by Mnesia to implement distributed select/3 +

This function is rarely needed in application code. It is used + by Mnesia to provide distributed select/3 and select/1 sequences. A normal application would either use Mnesia or keep the continuation from being converted to external format.

The reason for not having an external representation of a - compiled match_spec is performance. It may be subject to - change in future releases, while this interface will remain + compiled match specification is performance. It can be subject to + change in future releases, while this interface remains for backward compatibility.

 + Fix an ETS table for safe traversal. -

Fixes a table of the set, bag or - duplicate_bag table type for safe traversal.

+

Fixes a table of type set, bag, or + duplicate_bag for safe traversal.

A process fixes a table by calling - safe_fixtable(Tab, true). The table remains fixed until - the process releases it by calling + safe_fixtable(Tab, true). The table remains + fixed until the process releases it by calling safe_fixtable(Tab, false), or until the process terminates.

-

If several processes fix a table, the table will remain fixed +

If many processes fix a table, the table remains fixed until all processes have released it (or terminated). A reference counter is kept on a per process basis, and N - consecutive fixes requires N releases to actually release - the table.

-

When a table is fixed, a sequence of first/1 and - next/2 calls are guaranteed to succeed and each object in - the table will only be returned once, even if objects - are removed or inserted during the traversal. - The keys for new objects inserted during the traversal may - be returned by next/2 - (it depends on the internal ordering of the keys). An example:

+ consecutive fixes requires N releases to release the table.

+

When a table is fixed, a sequence of + first/1 and + next/2 calls are + guaranteed to succeed, and each object in + the table is returned only once, even if objects + are removed or inserted during the traversal. The keys for new + objects inserted during the traversal can be returned by + next/2 (it depends on the internal ordering of the keys).

+

Example:

clean_all_with_value(Tab,X) -> safe_fixtable(Tab,true), @@ -1155,218 +1307,205 @@ clean_all_with_value(Tab,X,Key) -> true end, clean_all_with_value(Tab,X,ets:next(Tab,Key)). -

Note that no deleted objects are actually removed from a +

Notice that no deleted objects are removed from a fixed table until it has been released. If a process fixes a table but never releases it, the memory used by the deleted - objects will never be freed. The performance of operations on - the table will also degrade significantly.

-

Use - info(Tab, - safe_fixed_monotonic_time) to retrieve information - about which processes have fixed which tables. A system with a lot - of processes fixing tables may need a monitor which sends alarms + objects is never freed. The performance of operations on + the table also degrades significantly.

+

To retrieve information about which processes have fixed which + tables, use + info(Tab, safe_fixed_monotonic_time). A system with + many processes fixing tables can need a monitor that sends alarms when tables have been fixed for too long.

-

Note that for tables of the ordered_set type, - safe_fixtable/2 is not necessary as calls to - first/1 and next/2 will always succeed.

+

Notice that for table type ordered_set, + safe_fixtable/2 is not necessary, as calls to + first/1 and next/2 always succeed.

 + + + + Continue matching objects in an ETS table. + +

Continues a match started with + select/3. The next + chunk of the size specified in the initial select/3 + call is returned together with a new Continuation, + which can be used in subsequent calls to this function.

+

When there are no more objects in the table, '$end_of_table' + is returned.

+ + + - Match the objects in an ETS table against a match_spec. + Match the objects in an ETS table against a + match specification. -

Matches the objects in the table Tab using a - match_spec. This is a - more general call than the ets:match/2 and - ets:match_object/2 calls. In its simplest forms the - match_specs look like this:

- - MatchSpec = [MatchFunction] - MatchFunction = {MatchHead, [Guard], [Result]} - MatchHead = "Pattern as in ets:match" - Guard = {"Guardtest name", ...} - Result = "Term construct" - -

This means that the match_spec is always a list of one or - more tuples (of arity 3). The tuples first element should be - a pattern as described in the documentation of - ets:match/2. The second element of the tuple should +

Matches the objects in table Tab using a + match specification. + This is a more general call than + match/2 and + match_object/2 + calls. In its simplest form, the match specification is as + follows:

+ +MatchSpec = [MatchFunction] +MatchFunction = {MatchHead, [Guard], [Result]} +MatchHead = "Pattern as in ets:match" +Guard = {"Guardtest name", ...} +Result = "Term construct" +

This means that the match specification is always a list of one or + more tuples (of arity 3). The first element of the tuple is to be + a pattern as described in + match/2. + The second element of the tuple is to be a list of 0 or more guard tests (described below). The - third element of the tuple should be a list containing a - description of the value to actually return. In almost all - normal cases the list contains exactly one term which fully + third element of the tuple is to be a list containing a + description of the value to return. In almost all + normal cases, the list contains exactly one term that fully describes the value to return for each object.

The return value is constructed using the "match variables" - bound in the MatchHead or using the special match variables + bound in MatchHead or using the special match variables '$_' (the whole matching object) and '$$' (all match variables in a list), so that the following - ets:match/2 expression:

+ match/2 expression:

ets:match(Tab,{'$1','$2','$3'})

is exactly equivalent to:

ets:select(Tab,[{{'$1','$2','$3'},[],['$$']}]) -

- and the following ets:match_object/2 call:

+

And that the following match_object/2 call:

ets:match_object(Tab,{'$1','$2','$1'})

is exactly equivalent to

ets:select(Tab,[{{'$1','$2','$1'},[],['$_']}])

Composite terms can be constructed in the Result part - either by simply writing a list, so that this code:

+ either by simply writing a list, so that the following code:

ets:select(Tab,[{{'$1','$2','$3'},[],['$$']}])

gives the same output as:

ets:select(Tab,[{{'$1','$2','$3'},[],[['$1','$2','$3']]}]) -

i.e. all the bound variables in the match head as a list. If +

That is, all the bound variables in the match head as a list. If tuples are to be constructed, one has to write a tuple of - arity 1 with the single element in the tuple being the tuple - one wants to construct (as an ordinary tuple could be mistaken - for a Guard). Therefore the following call:

+ arity 1 where the single element in the tuple is the tuple + one wants to construct (as an ordinary tuple can be mistaken + for a Guard).

+

Therefore the following call:

ets:select(Tab,[{{'$1','$2','$1'},[],['$_']}])

gives the same output as:

ets:select(Tab,[{{'$1','$2','$1'},[],[{{'$1','$2','$3'}}]}]) -

- this syntax is equivalent to the syntax used in the trace - patterns (see - dbg(3)).

-

The Guards are constructed as tuples where the first - element is the name of the test and the rest of the elements - are the parameters of the test. To check for a specific type +

This syntax is equivalent to the syntax used in the trace + patterns (see the + + dbg(3)) module in Runtime_Tools.

+

The Guards are constructed as tuples, where the first + element is the test name and the remaining elements + are the test parameters. To check for a specific type (say a list) of the element bound to the match variable '$1', one would write the test as {is_list, '$1'}. If the test fails, the object in the - table will not match and the next MatchFunction (if - any) will be tried. Most guard tests present in Erlang can be + table does not match and the next MatchFunction (if + any) is tried. Most guard tests present in Erlang can be used, but only the new versions prefixed is_ are - allowed (like is_float, is_atom etc).

+ allowed (is_float, is_atom, and so on).

The Guard section can also contain logic and arithmetic operations, which are written with the same syntax - as the guard tests (prefix notation), so that a guard test - written in Erlang looking like this:

+ as the guard tests (prefix notation), so that the following + guard test written in Erlang:

-

is expressed like this (X replaced with '$1' and Y with - '$2'):

+

is expressed as follows (X replaced with '$1' and + Y with '$2'):

-

On tables of the ordered_set type, objects are visited - in the same order as in a first/next - traversal. This means that the match specification will be - executed against objects with keys in the first/next - order and the corresponding result list will be in the order of that +

For tables of type ordered_set, objects are visited + in the same order as in a first/next + traversal. This means that the match specification is + executed against objects with keys in the first/next + order and the corresponding result list is in the order of that execution.

- + - Match the objects in an ETS table against a match_spec and returns part of the answers. + Match the objects in an ETS table against a match + specification and return part of the answers. -

Works like ets:select/2 but only returns a limited - (Limit) number of matching objects. The - Continuation term can then be used in subsequent calls - to ets:select/1 to get the next chunk of matching - objects. This is a space efficient way to work on objects in a - table which is still faster than traversing the table object - by object using ets:first/1 and ets:next/1.

-

'$end_of_table' is returned if the table is empty.

- - - - - Continue matching objects in an ETS table. - -

Continues a match started with - ets:select/3. The next - chunk of the size given in the initial ets:select/3 - call is returned together with a new Continuation - that can be used in subsequent calls to this function.

-

'$end_of_table' is returned when there are no more - objects in the table.

+

Works like select/2, + but only returns a limited + (Limit) number of matching objects. Term + Continuation can then be used in subsequent + calls to select/1 + to get the next chunk of matching + objects. This is a space-efficient way to work on objects in a + table, which is still faster than traversing the table object by + object using first/1 + and next/2.

+

If the table is empty, '$end_of_table' is returned.

 + - Match the objects in an ETS table against a match_spec and returns the number of objects for which the match_spec returned 'true' + Match the objects in an ETS table against a match + specification and return the number of objects for which the match + specification returned true. -

Matches the objects in the table Tab using a - match_spec. If the - match_spec returns true for an object, that object +

Matches the objects in table Tab using a + match specificationc. If the + match specification returns true for an object, that object considered a match and is counted. For any other result from - the match_spec the object is not considered a match and is + the match specification the object is not considered a match and is therefore not counted.

-

The function could be described as a match_delete/2 - that does not actually delete any elements, but only counts - them.

+

This function can be described as a + match_delete/2 + function that does not delete any elements, but only counts them.

The function returns the number of objects matched.

 + - Match the objects in an ETS table against a match_spec and deletes objects where the match_spec returns 'true' + Match the objects in an ETS table against a match + specification and delete objects where the match specification + returns true. -

Matches the objects in the table Tab using a - match_spec. If the - match_spec returns true for an object, that object is - removed from the table. For any other result from the - match_spec the object is retained. This is a more general - call than the ets:match_delete/2 call.

-

The function returns the number of objects actually +

Matches the objects in table Tab using a + match specification. If the + match specification returns true for an object, that object is + removed from the table. For any other result from the match + specification the object is retained. This is a more general + call than the + match_delete/2 call.

+

The function returns the number of objects deleted from the table.

-

The match_spec has to return the atom true if - the object is to be deleted. No other return value will get the - object deleted, why one can not use the same match specification for +

The match specification has to return the atom true if + the object is to be deleted. No other return value gets the + object deleted. So one cannot use the same match specification for looking up elements as for deleting them.

 - - - Match the objects in an ETS table against a match_spec. - - -

Works like select/2, but returns the list in reverse - order for the ordered_set table type. For all other table - types, the return value is identical to that of select/2.

- - - - - - Match the objects in an ETS table against a match_spec and returns part of the answers. - - -

Works like select/3, but for the ordered_set - table type, traversing is done starting at the last object in - Erlang term order and moves towards the first. For all other - table types, the return value is identical to that of - select/3.

-

Note that this is not equivalent to - reversing the result list of a select/3 call, as the result list - is not only reversed, but also contains the last Limit - matching objects in the table, not the first.

- - - Continue matching objects in an ETS table. - -

Continues a match started with - ets:select_reverse/3. If the table is an - ordered_set, the traversal of the table will continue - towards objects with keys earlier in the Erlang term order. The - returned list will also contain objects with keys in reverse - order.

- -

For all other table types, the behaviour is exactly that of select/1.

-

Example:

+

Continues a match started with + select_reverse/3. For tables of type + ordered_set, the traversal of the table continues + to objects with keys earlier in the Erlang term order. The + returned list also contains objects with keys in reverse order. + For all other table types, the behavior is exactly that of + select/1.

+

Example:

1> T = ets:new(x,[ordered_set]). 2> [ ets:insert(T,{N}) || N <- lists:seq(1,10) ]. @@ -1384,217 +1523,288 @@ is_integer(X), is_integer(Y), X + Y < 4711]]> 8> R2. [{2},{1}] 9> '$end_of_table' = ets:select_reverse(C2). -... - +... + + + + Match the objects in an ETS table against a + match specification. + +

Works like select/2, + but returns the list in reverse order for table type ordered_set. + For all other table types, the return value is identical to that of + select/2.

+ + + + + + Match the objects in an ETS table against a + match specification and return part of the answers. + +

Works like select/3, + but for table type ordered_set + traversing is done starting at the last object in + Erlang term order and moves to the first. For all other table + types, the return value is identical to that of select/3.

+

Notice that this is not equivalent to + reversing the result list of a select/3 call, as the result list + is not only reversed, but also contains the last + Limit + matching objects in the table, not the first.

+ + + Set table options. -

Set table options. The only option that currently is allowed to be - set after the table has been created is - heir. The calling process must be - the table owner.

+

Sets table options. The only allowed option to be set after the + table has been created is + heir. + The calling process must be the table owner.

 + - Return all objects in a given slot of an ETS table. + Return all objects in a specified slot of an ETS table. +

This function is mostly for debugging purposes, Normally - one should use first/next or last/prev instead.

-

Returns all objects in the I:th slot of the table - Tab. A table can be traversed by repeatedly calling - the function, starting with the first slot I=0 and + first/next or last/prev are to be used + instead.

+

Returns all objects in slot I of table + Tab. A table can be traversed by repeatedly + calling the function, + starting with the first slot I=0 and ending when '$end_of_table' is returned. - The function will fail with reason badarg if the - I argument is out of range.

-

Unless a table of type set, bag or + If argument I is out of range, + the function fails with reason badarg.

+

Unless a table of type set, bag, or duplicate_bag is protected using - safe_fixtable/2, see above, a traversal may fail if - concurrent updates are made to the table. If the table is of - type ordered_set, the function returns a list - containing the I:th object in Erlang term order.

+ safe_fixtable/2, + a traversal can fail if + concurrent updates are made to the table. For table type + ordered_set, the function returns a list containing + object I in Erlang term order.

 + Dump an ETS table to a file. -

Dumps the table Tab to the file Filename.

-

Equivalent to tab2file(Tab, Filename,[])

- +

Dumps table Tab to file + Filename.

+

Equivalent to + tab2file(Tab, Filename,[])

 + Dump an ETS table to a file. -

Dumps the table Tab to the file Filename.

-

When dumping the table, certain information about the table - is dumped to a header at the beginning of the dump. This - information contains data about the table type, - name, protection, size, version and if it's a named table. It - also contains notes about what extended information is added - to the file, which can be a count of the objects in the file - or a MD5 sum of the header and records in the file.

-

The size field in the header might not correspond to the - actual number of records in the file if the table is public - and records are added or removed from the table during - dumping. Public tables updated during dump, and that one wants - to verify when reading, needs at least one field of extended - information for the read verification process to be reliable - later.

-

The extended_info option specifies what extra - information is written to the table dump:

- - object_count -

The number of objects actually written to the file is - noted in the file footer, why verification of file truncation - is possible even if the file was updated during - dump.

 - md5sum -

The header and objects in the file are checksummed using - the built in MD5 functions. The MD5 sum of all objects is - written in the file footer, so that verification while reading - will detect the slightest bitflip in the file data. Using this - costs a fair amount of CPU time.

 - -

Whenever the extended_info option is used, it - results in a file not readable by versions of ets prior to - that in stdlib-1.15.1

-

The sync option, if set to true, ensures that - the content of the file is actually written to the disk before - tab2file returns. Default is {sync, false}.

+

Dumps table Tab to file + Filename.

+

When dumping the table, some information about the table + is dumped to a header at the beginning of the dump. This + information contains data about the table type, + name, protection, size, version, and if it is a named table. It + also contains notes about what extended information is added + to the file, which can be a count of the objects in the file + or a MD5 sum of the header and records in the file.

+

The size field in the header might not correspond to the + number of records in the file if the table is public + and records are added or removed from the table during + dumping. Public tables updated during dump, and that one wants + to verify when reading, needs at least one field of extended + information for the read verification process to be reliable + later.

+

Option extended_info specifies what extra + information is written to the table dump:

+ + object_count + +

The number of objects written to the file is + noted in the file footer, so file truncation can be + verified even if the file was updated during dump.

+ + md5sum + +

The header and objects in the file are checksummed using + the built-in MD5 functions. The MD5 sum of all objects is + written in the file footer, so that verification while reading + detects the slightest bitflip in the file data. Using this + costs a fair amount of CPU time.

+ + +

Whenever option extended_info is used, it + results in a file not readable by versions of ETS before + that in STDLIB 1.15.1

+

If option sync is set to true, it ensures that + the content of the file is written to the disk before + tab2file returns. Defaults to {sync, false}.

 + Return a list of all objects in an ETS table. -

Returns a list of all objects in the table Tab.

+

Returns a list of all objects in table Tab.

 + Return a list of all objects in an ETS table. -

Returns information about the table dumped to file by - tab2file/2 or - tab2file/3

-

The following items are returned:

- - name -

The name of the dumped table. If the table was a - named table, a table with the same name cannot exist when the - table is loaded from file with - file2tab/2. If the table is - not saved as a named table, this field has no significance - at all when loading the table from file.

 - type - The ets type of the dumped table (i.e. set, bag, - duplicate_bag or ordered_set). This type will be used - when loading the table again. - protection - The protection of the dumped table (i.e. private, - protected or public). A table loaded from the file - will get the same protection. - named_table - true if the table was a named table when dumped - to file, otherwise false. Note that when a named table - is loaded from a file, there cannot exist a table in the - system with the same name. - keypos - The keypos of the table dumped to file, which - will be used when loading the table again. - size - The number of objects in the table when the table dump - to file started, which in case of a public table need - not correspond to the number of objects actually saved to the - file, as objects might have been added or deleted by another - process during table dump. - extended_info - The extended information written in the file footer to - allow stronger verification during table loading from file, as - specified to tab2file/3. Note that this - function only tells which information is present, not - the values in the file footer. The value is a list containing - one or more of the atoms object_count and - md5sum. - version - A tuple {Major,Minor} containing the major and - minor version of the file format for ets table dumps. This - version field was added beginning with stdlib-1.5.1, files - dumped with older versions will return {0,0} in this - field. - -

An error is returned if the file is inaccessible, - badly damaged or not an file produced with tab2file/2 or tab2file/3.

+

Returns information about the table dumped to file by + tab2file/2 or + tab2file/3.

+

The following items are returned:

+ + name + +

The name of the dumped table. If the table was a + named table, a table with the same name cannot exist when the + table is loaded from file with + file2tab/2. + If the table is + not saved as a named table, this field has no significance + when loading the table from file.

+ + type + +

The ETS type of the dumped table (that is, set, + bag, duplicate_bag, or ordered_set). This + type is used when loading the table again.

+ + protection + +

The protection of the dumped table (that is, private, + protected, or public). A table loaded from the + file gets the same protection.

+ + named_table + +

true if the table was a named table when dumped + to file, otherwise false. Notice that when a named table + is loaded from a file, there cannot exist a table in the + system with the same name.

+ + keypos + +

The keypos of the table dumped to file, which + is used when loading the table again.

+ + size + +

The number of objects in the table when the table dump + to file started. For a public table, this number + does not need to correspond to the number of objects saved to + the file, as objects can have been added or deleted by another + process during table dump.

+ + extended_info + +

The extended information written in the file footer to + allow stronger verification during table loading from file, as + specified to + tab2file/3. Notice that this + function only tells which information is present, not + the values in the file footer. The value is a list containing one + or more of the atoms object_count and md5sum.

+ + version + +

A tuple {Major,Minor} + containing the major and + minor version of the file format for ETS table dumps. This + version field was added beginning with STDLIB 1.5.1. + Files dumped with older versions return {0,0} in this + field.

+ + +

An error is returned if the file is inaccessible, + badly damaged, or not produced with + tab2file/2 or + tab2file/3.

 + Return a QLC query handle. -

Returns a QLC (Query List - Comprehension) query handle. The module qlc implements - a query language aimed mainly at Mnesia but ETS tables, Dets - tables, and lists are also recognized by QLC as sources of - data. Calling ets:table/1,2 is the means to make the +

Returns a Query List + Comprehension (QLC) query handle. The + qlc module provides + a query language aimed mainly at Mnesia, but ETS + tables, Dets tables, + and lists are also recognized by QLC as sources of + data. Calling table/1,2 is the means to make the ETS table Tab usable to QLC.

-

When there are only simple restrictions on the key position - QLC uses ets:lookup/2 to look up the keys, but when - that is not possible the whole table is traversed. The - option traverse determines how this is done:

- +

When there are only simple restrictions on the key position, + QLC uses lookup/2 + to look up the keys. When + that is not possible, the whole table is traversed. + Option traverse determines how this is done:

+ + first_next -

first_next. The table is traversed one key at - a time by calling ets:first/1 and - ets:next/2.

+

The table is traversed one key at a time by calling + first/1 and + next/2.

 + last_prev -

last_prev. The table is traversed one key at - a time by calling ets:last/1 and - ets:prev/2.

+

The table is traversed one key at a time by calling + last/1 and + prev/2.

 + select -

select. The table is traversed by calling - ets:select/3 and ets:select/1. The option - n_objects determines the number of objects +

The table is traversed by calling + select/3 and + select/1. + Option n_objects determines the number of objects returned (the third argument of select/3); the default is to return 100 objects at a time. The - match_spec (the - second argument of select/3) is assembled by QLC: - simple filters are translated into equivalent match_specs - while more complicated filters have to be applied to all - objects returned by select/3 given a match_spec + match specification (the + second argument of select/3) is assembled by QLC: simple + filters are translated into equivalent match specifications + while more complicated filters must be applied to all + objects returned by select/3 given a match specification that matches all objects.

 + {select, MatchSpec} -

{select, MatchSpec}. As for select - the table is traversed by calling ets:select/3 and - ets:select/1. The difference is that the - match_spec is explicitly given. This is how to state - match_specs that cannot easily be expressed within the - syntax provided by QLC.

+

As for select, the table is traversed by calling + select/3 and + select/1. + The difference is that the match specification is explicitly + specified. This is how to state match specifications that cannot + easily be expressed within the syntax provided by QLC.

 - -

The following example uses an explicit match_spec to - traverse the table:

+ +

Examples:

+

An explicit match specification is here used to traverse the + table:

 9> true = ets:insert(Tab = ets:new(t, []), [{1,a},{2,b},{3,c},{4,d}]),
 MS = ets:fun2ms(fun({X,Y}) when (X > 1) or (X < 5) -> {Y} end),
 QH1 = ets:table(Tab, [{traverse, {select, MS}}]).
-

An example with implicit match_spec:

+

An example with an implicit match specification:

 10> QH2 = qlc:q([{Y} || {X,Y} <- ets:table(Tab), (X > 1) or (X < 5)]).
-

The latter example is in fact equivalent to the former which - can be verified using the function qlc:info/1:

+

The latter example is equivalent to the former, which + can be verified using function qlc:info/1:

 11> qlc:info(QH1) =:= qlc:info(QH2).
 true
@@ -1603,52 +1813,60 @@ true two query handles.

 + + + + Return and remove all objects with a specified key from an + ETS table. + +

Returns and removes a list of all objects with key + Key in table Tab.

+

The specified Key is used to identify the object + by either comparing equal the key of an object in an + ordered_set table, or matching in other types of + tables (for details on the difference, see + lookup/2 and + new/2).

+ + - Test a match_spec for use in ets:select/2. + Test a match specification for use in select/2. +

This function is a utility to test a - match_spec used in - calls to ets:select/2. The function both tests - MatchSpec for "syntactic" correctness and runs the - match_spec against the object Tuple. If the match_spec - contains errors, the tuple {error, Errors} is returned + match specification used in + calls to select/2. + The function both tests MatchSpec for "syntactic" + correctness and runs the match specification against object + Tuple.

+

If the match specification is syntactically correct, the function + either returns {ok,Result}, where + Result is what would have been the result in a + real select/2 call, or false if the match specification + does not match object Tuple.

+

If the match specification contains errors, tuple + {error, Errors} is returned, where Errors is a list of natural language - descriptions of what was wrong with the match_spec. If the - match_spec is syntactically OK, the function returns - {ok,Result} where Result is what would have been - the result in a real ets:select/2 call or false - if the match_spec does not match the object Tuple.

+ descriptions of what was wrong with the match specification.

This is a useful debugging and test tool, especially when - writing complicated ets:select/2 calls.

+ writing complicated select/2 calls.

See also: erlang:match_spec_test/3.

 - - - Return and remove all objects with a given key from an ETS - table. - -

Returns a list of all objects with the key Key in - the table Tab and removes.

-

The given Key is used to identify the object by - either comparing equal the key of an object in an - ordered_set table, or matching in other types of - tables (see lookup/2 and - new/2 for details on the - difference).

- - + - Fill a Dets table with objects from an ETS table. + Fill a Dets table with objects from an ETS table. +

Fills an already created/opened Dets table with the objects - in the already opened ETS table named Tab. The Dets - table is emptied before the objects are inserted.

+ in the already opened ETS table named Tab. + The Dets table is emptied before the objects are inserted.

 + @@ -1666,107 +1884,112 @@ true

This function provides an efficient way to update one or more - counters, without the hassle of having to look up an object, update - the object by incrementing an element and insert the resulting object - into the table again. (The update is done atomically; i.e. no process - can access the ets table in the middle of the operation.) -

-

It will destructively update the object with key Key - in the table Tab by adding Incr to the element - at the Pos:th position. The new counter value is + counters, without the trouble of having to look up an object, update + the object by incrementing an element, and insert the resulting + object into the table again. (The update is done atomically, + that is, no process + can access the ETS table in the middle of the operation.)

+

This function destructively update the object with key + Key in table Tab by adding + Incr to the element at position + Pos. The new counter value is returned. If no position is specified, the element directly - following the key (+1]]>) is updated.

-

If a Threshold is specified, the counter will be - reset to the value SetValue if the following + following key (+1]]>) is updated.

+

If a Threshold is specified, the counter is + reset to value SetValue if the following conditions occur:

- The Incr is not negative (>= 0) and the - result would be greater than (>) Threshold - The Incr is negative () and the - result would be less than () - Threshold +

Incr is not negative (>= 0) and + the result would be greater than (>) + Threshold.

+ +

Incr is negative + () and the result would be less than + () Threshold.

+ -

A list of UpdateOp can be supplied to do several update - operations within the object. The operations are carried out in the - order specified in the list. If the same counter position occurs - more than one time in the list, the corresponding counter will thus - be updated several times, each time based on the previous result. - The return value is a list of the new counter values from each - update operation in the same order as in the operation list. If an - empty list is specified, nothing is updated and an empty list is - returned. If the function should fail, no updates will be done at - all. -

-

The given Key is used to identify the object by either - matching the key of an object in a set table, - or compare equal to the key of an object in an - ordered_set table (see - lookup/2 and - new/2 - for details on the difference).

-

If a default object Default is given, it is used +

A list of UpdateOp can be supplied to do many + update operations within the object. + The operations are carried out in the + order specified in the list. If the same counter position occurs + more than once in the list, the corresponding counter is thus + updated many times, each time based on the previous result. + The return value is a list of the new counter values from each + update operation in the same order as in the operation list. If an + empty list is specified, nothing is updated and an empty list is + returned. If the function fails, no updates is done.

+

The specified Key is used to identify the object + by either matching the key of an object in a set + table, or compare equal to the key of an object in an + ordered_set table (for details on the difference, see + lookup/2 and + new/2).

+

If a default object Default is specified, + it is used as the object to be updated if the key is missing from the table. The value in place of the key is ignored and replaced by the proper key value. The return value is as if the default object had not been used, - that is a single updated element or a list of them.

-

The function will fail with reason badarg if:

+ that is, a single updated element or a list of them.

+

The function fails with reason badarg in the following + situations:

- the table is not of type set or - ordered_set, - no object with the right key exists and no default object were - supplied, - the object has the wrong arity, - the default object arity is smaller than - ]]> - any field from the default object being updated is not an - integer - the element to update is not an integer, - the element to update is also the key, or, - any of Pos, Incr, Threshold or - SetValue is not an integer + The table type is not set or + ordered_set. + No object with the correct key exists and no default object was + supplied. + The object has the wrong arity. + The default object arity is smaller than + ]]>. + Any field from the default object that is updated is not an + integer. + The element to update is not an integer. + The element to update is also the key. + Any of Pos, Incr, + Threshold, or SetValue + is not an integer. + - Updates the Pos:th element of the object with a given key in an ETS table. + Update the Pos:th element of the object with a + specified key in an ETS table.

This function provides an efficient way to update one or more - elements within an object, without the hassle of having to look up, - update and write back the entire object. -

-

It will destructively update the object with key Key - in the table Tab. The element at the Pos:th position - will be given the value Value.

-

A list of {Pos,Value} can be supplied to update several - elements within the same object. If the same position occurs more - than one in the list, the last value in the list will be written. If - the list is empty or the function fails, no updates will be done at - all. The function is also atomic in the sense that other processes - can never see any intermediate results. -

-

The function returns true if an object with the key - Key was found, false otherwise. -

-

The given Key is used to identify the object by either - matching the key of an object in a set table, - or compare equal to the key of an object in an - ordered_set table (see - lookup/2 and - new/2 - for details on the difference).

-

The function will fail with reason badarg if:

+ elements within an object, without the trouble of having to look up, + update, and write back the entire object.

+

This function destructively updates the object with key + Key in table Tab. + The element at position Pos is given + the value Value.

+

A list of {Pos,Value} can be + supplied to update many + elements within the same object. If the same position occurs more + than once in the list, the last value in the list is written. If + the list is empty or the function fails, no updates are done. + The function is also atomic in the sense that other processes + can never see any intermediate results.

+

Returns true if an object with key Key + is found, otherwise false.

+

The specified Key is used to identify the object + by either matching the key of an object in a set + table, or compare equal to the key of an object in an + ordered_set table (for details on the difference, see + lookup/2 and + new/2).

+

The function fails with reason badarg in the following + situations:

- the table is not of type set or - ordered_set, - Pos is less than 1 or greater than the object - arity, or, - the element to update is also the key + The table type is not set or ordered_set. + Pos < 1. + Pos > object arity. + The element to update is also the key. diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml index bc24f02a99..e988d58c2f 100644 --- a/lib/stdlib/doc/src/file_sorter.xml +++ b/lib/stdlib/doc/src/file_sorter.xml @@ -24,125 +24,150 @@ file_sorter Hans Bolinder - nobody + - nobody - no + + 2001-03-13 PA1 - file_sorter.sgml + file_sorter.xml
file_sorter - File Sorter + File sorter. -

The functions of this module sort terms on files, merge already - sorted files, and check files for sortedness. Chunks containing - binary terms are read from a sequence of files, sorted +

This module contains functions for sorting terms on files, merging + already sorted files, and checking files for sortedness. Chunks + containing binary terms are read from a sequence of files, sorted internally in memory and written on temporary files, which are merged producing one sorted file as output. Merging is provided as an optimization; it is faster when the files are already - sorted, but it always works to sort instead of merge. -

+ sorted, but it always works to sort instead of merge.

+

On a file, a term is represented by a header and a binary. Two - options define the format of terms on files: -

- - {header, HeaderLength}. HeaderLength determines the - number of bytes preceding each binary and containing the - length of the binary in bytes. Default is 4. The order of the - header bytes is defined as follows: if B is a binary - containing a header only, the size Size of the binary - is calculated as - > = B]]>. + options define the format of terms on files:

+ + + {header, HeaderLength} + +

HeaderLength determines the + number of bytes preceding each binary and containing the + length of the binary in bytes. Defaults to 4. The order of the + header bytes is defined as follows: if B is a binary + containing a header only, size Size of the binary + is calculated as + > = B]]>.

 - {format, Format}. The format determines the - function that is applied to binaries in order to create the - terms that will be sorted. The default value is - binary_term, which is equivalent to - fun binary_to_term/1. The value binary is - equivalent to fun(X) -> X end, which means that the - binaries will be sorted as they are. This is the fastest - format. If Format is term, io:read/2 is - called to read terms. In that case only the default value of - the header option is allowed. The format option - also determines what is written to the sorted output file: if - Format is term then io:format/3 is called - to write each term, otherwise the binary prefixed by a header - is written. Note that the binary written is the same binary - that was read; the results of applying the Format - function are thrown away as soon as the terms have been - sorted. Reading and writing terms using the io module - is very much slower than reading and writing binaries. + {format, Format} + +

Option Format determines the + function that is applied to binaries to create the + terms to be sorted. Defaults to + binary_term, which is equivalent to + fun binary_to_term/1. Value binary is + equivalent to fun(X) -> X end, which means that the + binaries are sorted as they are. This is the fastest + format. If Format is term, io:read/2 is + called to read terms. In that case, only the default value of + option header is allowed.

+

Option format also determines what is written to the + sorted output file: if + Format is term, then io:format/3 is called + to write each term, otherwise the binary prefixed by a header + is written. Notice that the binary written is the same binary + that was read; the results of applying function Format + are thrown away when the terms have been sorted. + Reading and writing terms using the io module + is much slower than reading and writing binaries.

 - -

Other options are: -

- - {order, Order}. The default is to sort terms in - ascending order, but that can be changed by the value - descending or by giving an ordering function Fun. - An ordering function is antisymmetric, transitive and total. - Fun(A, B) should return true if A - comes before B in the ordering, false otherwise. - An example of a typical ordering function is less than or equal - to, =</2. - Using an ordering function will slow down the sort - considerably. The keysort, keymerge and - keycheck functions do not accept ordering functions. + + +

Other options are:

+ + + {order, Order} + +

The default is to sort terms in + ascending order, but that can be changed by value + descending or by specifying an ordering function Fun. + An ordering function is antisymmetric, transitive, and total. + Fun(A, B) is to return true if A + comes before B in the ordering, otherwise false. + An example of a typical ordering function is less than or equal + to, =</2. Using an ordering function slows down the sort + considerably. Functions keysort, keymerge and + keycheck do not accept ordering functions.

 - {unique, boolean()}. When sorting or merging files, - only the first of a sequence of terms that compare equal (==) - is output if this option is set to true. The default - value is false which implies that all terms that - compare equal are output. When checking files for - sortedness, a check that no pair of consecutive terms - compares equal is done if this option is set to true. + {unique, boolean()} + +

When sorting or merging files, + only the first of a sequence of terms that compare equal (==) + is output if this option is set to true. Defaults + to false, which implies that all terms that + compare equal are output. When checking files for + sortedness, a check that no pair of consecutive terms + compares equal is done if this option is set to true.

 - {tmpdir, TempDirectory}. The directory where - temporary files are put can be chosen explicitly. The - default, implied by the value "", is to put temporary - files on the same directory as the sorted output file. If - output is a function (see below), the directory returned by - file:get_cwd() is used instead. The names of - temporary files are derived from the Erlang nodename - (node()), the process identifier of the current Erlang - emulator (os:getpid()), and a unique integer - (erlang:unique_integer([positive])); a typical name would be - fs_mynode@myhost_1763_4711.17, where - 17 is a sequence number. Existing files will be - overwritten. Temporary files are deleted unless some - uncaught EXIT signal occurs. + {tmpdir, TempDirectory} + +

The directory where + temporary files are put can be chosen explicitly. The + default, implied by value "", is to put temporary + files on the same directory as the sorted output file. If + output is a function (see below), the directory returned by + file:get_cwd() is used instead. The names of + temporary files are derived from the Erlang nodename + (node()), the process identifier of the current Erlang + emulator (os:getpid()), and a unique integer + (erlang:unique_integer([positive])). A typical name is + fs_mynode@myhost_1763_4711.17, where + 17 is a sequence number. Existing files are + overwritten. Temporary files are deleted unless some + uncaught EXIT signal occurs.

 - {compressed, boolean()}. Temporary files and the - output file may be compressed. The default value - false implies that written files are not - compressed. Regardless of the value of the compressed - option, compressed files can always be read. Note that - reading and writing compressed files is significantly slower - than reading and writing uncompressed files. + {compressed, boolean()} + +

Temporary files and the output file can be compressed. Defaults + false, which implies that written files are not + compressed. Regardless of the value of option compressed, + compressed files can always be read. Notice that + reading and writing compressed files are significantly slower + than reading and writing uncompressed files.

 - {size, Size}. By default approximately 512*1024 - bytes read from files are sorted internally. This option - should rarely be needed. + {size, Size} + +

By default about 512*1024 bytes read from files are sorted + internally. This option is rarely needed.

 - {no_files, NoFiles}. By default 16 files are - merged at a time. This option should rarely be needed. + {no_files, NoFiles} + +

By default 16 files are merged at a time. This option is rarely + needed.

 - + +

As an alternative to sorting files, a function of one argument - can be given as input. When called with the argument read - the function is assumed to return end_of_input or - {end_of_input, Value}} when there is no more input - (Value is explained below), or {Objects, Fun}, - where Objects is a list of binaries or terms depending on - the format and Fun is a new input function. Any other - value is immediately returned as value of the current call to - sort or keysort. Each input function will be - called exactly once, and should an error occur, the last - function is called with the argument close, the reply of - which is ignored. -

-

A function of one argument can be given as output. The results + can be specified as input. When called with argument read, + the function is assumed to return either of the following:

+ + + +

end_of_input or {end_of_input, Value}} when there + is no more input (Value is explained below).

+ + +

{Objects, Fun}, where Objects is a list of binaries + or terms depending on the format, and Fun is a new input + function.

+ + + +

Any other value is immediately returned as value of the current call + to sort or keysort. Each input function is + called exactly once. If an error occurs, the last + function is called with argument close, the reply of + which is ignored.

+ +

A function of one argument can be specified as output. The results of sorting or merging the input is collected in a non-empty sequence of variable length lists of binaries or terms depending on the format. The output function is called with one list at a @@ -151,18 +176,20 @@ call to the sort or merge function. Each output function is called exactly once. When some output function has been applied to all of the results or an error occurs, the last function is - called with the argument close, and the reply is returned - as value of the current call to the sort or merge function. If a - function is given as input and the last input function returns - {end_of_input, Value}, the function given as output will - be called with the argument {value, Value}. This makes it + called with argument close, and the reply is returned + as value of the current call to the sort or merge function.

+ +

If a function is specified as input and the last input function + returns {end_of_input, Value}, the function specified as output + is called with argument {value, Value}. This makes it easy to initiate the sequence of output functions with a value - calculated by the input functions. -

+ calculated by the input functions.

+

As an example, consider sorting the terms on a disk log file. A function that reads chunks from the disk log and returns a list of binaries is used as input. The results are collected in a list of terms.

+ 
 sort(Log) ->
     {ok, _} = disk_log:open([{name,Log}, {mode,read_only}]),
@@ -193,29 +220,32 @@ output(L) ->
             lists:append(lists:reverse(L));
        (Terms) ->
             output([Terms | L])
-    end.
-

Further examples of functions as input and output can be found - at the end of the file_sorter module; the term - format is implemented with functions. -

+ end. + +

For more examples of functions as input and output, see + the end of the file_sorter module; the term + format is implemented with functions.

+

The possible values of Reason returned when an error occurs are:

+ -

bad_object, {bad_object, FileName}. +

bad_object, {bad_object, FileName} - Applying the format function failed for some binary, or the key(s) could not be extracted from some term.

 -

{bad_term, FileName}. io:read/2 failed +

{bad_term, FileName} - io:read/2 failed to read some term.

 -

{file_error, FileName, file:posix()}. See - file(3) for an explanation of file:posix().

+

{file_error, FileName, file:posix()} - For an + explanation of file:posix(), see + file(3).

 -

{premature_eof, FileName}. End-of-file was +

{premature_eof, FileName} - End-of-file was encountered inside some binary term.

 @@ -304,30 +334,53 @@ output(L) -> - - Sort terms on files. + + + Check whether terms on files are sorted. -

Sorts terms on files. sort(FileName) is equivalent - to sort([FileName], FileName).

+

Checks files for sortedness. If a file is not sorted, the + first out-of-order element is returned. The first term on a + file has position 1.

+

check(FileName) is equivalent to + check([FileName], []).

 + - - - Sort terms on files. + + + Check whether terms on files are sorted by key. -

Sorts terms on files. sort(Input, Output) is - equivalent to sort(Input, Output, []).

+

Checks files for sortedness. If a file is not sorted, the + first out-of-order element is returned. The first term on a + file has position 1.

+

keycheck(KeyPos, FileName) is equivalent + to keycheck(KeyPos, [FileName], []).

 + + + + + Merge terms on files by key. + +

Merges tuples on files. Each input file is assumed to be + sorted on key(s).

+

keymerge(KeyPos, FileNames, Output) is equivalent + to keymerge(KeyPos, FileNames, Output, []).

+ + + Sort terms on files by key. -

Sorts tuples on files. keysort(N, FileName) is +

Sorts tuples on files.

+

keysort(N, FileName) is equivalent to keysort(N, [FileName], FileName).

 + @@ -335,13 +388,14 @@ output(L) ->

Sorts tuples on files. The sort is performed on the element(s) mentioned in KeyPos. If two - tuples compare equal (==) on one element, next + tuples compare equal (==) on one element, the next element according to KeyPos is compared. The sort is stable.

keysort(N, Input, Output) is equivalent to keysort(N, Input, Output, []).

 + @@ -353,39 +407,25 @@ output(L) -> merge(FileNames, Output, []).

 + - - - Merge terms on files by key. - -

Merges tuples on files. Each input file is assumed to be - sorted on key(s).

-

keymerge(KeyPos, FileNames, Output) is equivalent - to keymerge(KeyPos, FileNames, Output, []).

- - - - - - Check whether terms on files are sorted. + + Sort terms on files. -

Checks files for sortedness. If a file is not sorted, the - first out-of-order element is returned. The first term on a - file has position 1.

-

check(FileName) is equivalent to - check([FileName], []).

+

Sorts terms on files.

+

sort(FileName) is equivalent + to sort([FileName], FileName).

 + - - - Check whether terms on files are sorted by key. + + + Sort terms on files. -

Checks files for sortedness. If a file is not sorted, the - first out-of-order element is returned. The first term on a - file has position 1.

-

keycheck(KeyPos, FileName) is equivalent - to keycheck(KeyPos, [FileName], []).

+

Sorts terms on files.

+

sort(Input, Output) is + equivalent to sort(Input, Output, []).

 diff --git a/lib/stdlib/doc/src/filelib.xml b/lib/stdlib/doc/src/filelib.xml index 3ad159a66d..7c6380ce28 100644 --- a/lib/stdlib/doc/src/filelib.xml +++ b/lib/stdlib/doc/src/filelib.xml @@ -28,19 +28,23 @@ 1 Kenneth Lundin - 03-01-21 + 2003-01-21 A - filelib.sgml + filelib.xml
filelib - File utilities, such as wildcard matching of filenames + File utilities, such as wildcard matching of filenames. + -

This module contains utilities on a higher level than the file - module.

-

This module does not support "raw" file names (i.e. files whose names - do not comply with the expected encoding). Such files will be ignored - by the functions in this module.

-

For more information about raw file names, see the file module.

+

This module contains utilities on a higher level than the + file module.

+ +

This module does not support "raw" filenames (that is, files whose + names do not comply with the expected encoding). Such files are ignored + by the functions in this module.

+ +

For more information about raw filenames, see the + file module.

 @@ -61,93 +65,99 @@ - Ensure that all parent directories for a file or directory exist. + Ensure that all parent directories for a file or directory + exist. -

The ensure_dir/1 function ensures that all parent - directories for the given file or directory name Name +

Ensures that all parent directories for the specified file or + directory name Name exist, trying to create them if necessary.

Returns ok if all parent directories already exist - or could be created, or {error, Reason} if some parent - directory does not exist and could not be created for some - reason.

+ or can be created. Returns {error, Reason} if + some parent directory does not exist and cannot be created.

 + - Return the size in bytes of the file. + Return the size in bytes of a file. -

The file_size function returns the size of the given file.

+

Returns the size of the specified file.

 + Fold over all files matching a regular expression. -

The fold_files/5 function folds the function - Fun over all (regular) files F in the - directory Dir that match the regular expression RegExp - (see the re module for a description - of the allowed regular expressions). - If Recursive is true all sub-directories to Dir - are processed. The regular expression matching is done on just - the filename without the directory part.

- -

If Unicode file name translation is in effect and the file - system is completely transparent, file names that cannot be - interpreted as Unicode may be encountered, in which case the - fun() must be prepared to handle raw file names - (i.e. binaries). If the regular expression contains - codepoints beyond 255, it will not match file names that do - not conform to the expected character encoding (i.e. are not - encoded in valid UTF-8).

- -

For more information about raw file names, see the - file module.

+

Folds function Fun over all (regular) files + F in directory Dir that match + the regular expression RegExp (for a description + of the allowed regular expressions, + see the re module). + If Recursive is true, all subdirectories + to Dir + are processed. The regular expression matching is only done on + the filename without the directory part.

+

If Unicode filename translation is in effect and the file + system is transparent, filenames that cannot be + interpreted as Unicode can be encountered, in which case the + fun() must be prepared to handle raw filenames + (that is, binaries). If the regular expression contains + codepoints > 255, it does not match filenames that do + not conform to the expected character encoding (that is, are not + encoded in valid UTF-8).

+

For more information about raw filenames, see the + file module.

 + - Test whether Name refer to a directory or not + Test whether Name refers to a directory. -

The is_dir/1 function returns true if Name - refers to a directory, and false otherwise.

+

Returns true if Name + refers to a directory, otherwise false.

 + - Test whether Name refer to a file or directory. + Test whether Name refers to a file or directory. + -

The is_file/1 function returns true if Name - refers to a file or a directory, and false otherwise.

+

Returns true if Name + refers to a file or a directory, otherwise false.

 + - Test whether Name refer to a (regular) file. + Test whether Name refers to a (regular) file. -

The is_regular/1 function returns true if Name - refers to a file (regular file), and false otherwise.

+

Returns true if Name + refers to a (regular) file, otherwise false.

 + - Return the local date and time when a file was last modified. + Return the local date and time when a file was last modified. + -

The last_modified/1 function returns the date and time the - given file or directory was last modified, or 0 if the file - does not exist.

+

Returns the date and time the specified file or directory was last + modified, or 0 if the file does not exist.

 + Match filenames using Unix-style wildcards. -

The wildcard/1 function returns a list of all files - that match Unix-style wildcard-string Wildcard.

+

Returns a list of all files that match Unix-style wildcard string + Wildcard.

The wildcard string looks like an ordinary filename, except - that certain "wildcard characters" are interpreted in a special - way. The following characters are special: -

+ that the following "wildcard characters" are interpreted in a special + way:

? @@ -160,14 +170,14 @@ ** -

Two adjacent *'s used as a single pattern will - match all files and zero or more directories and subdirectories.

+

Two adjacent * used as a single pattern match + all files and zero or more directories and subdirectories.

 [Character1,Character2,...]

Matches any of the characters listed. Two characters - separated by a hyphen will match a range of characters. - Example: [A-Z] will match any uppercase letter.

+ separated by a hyphen match a range of characters. + Example: [A-Z] matches any uppercase letter.

 {Item,...} @@ -175,49 +185,45 @@

Other characters represent themselves. Only filenames that - have exactly the same character in the same position will match. - (Matching is case-sensitive; i.e. "a" will not match "A"). -

-

Note that multiple "*" characters are allowed - (as in Unix wildcards, but opposed to Windows/DOS wildcards). -

-

Examples:

+ have exactly the same character in the same position match. + Matching is case-sensitive, for example, "a" does not match "A".

+

Notice that multiple "*" characters are allowed + (as in Unix wildcards, but opposed to Windows/DOS wildcards).

+

Examples:

The following examples assume that the current directory is the - top of an Erlang/OTP installation. -

-

To find all .beam files in all applications, the following - line can be used:

+ top of an Erlang/OTP installation.

+

To find all .beam files in all applications, use the + following line:

- filelib:wildcard("lib/*/ebin/*.beam"). -

To find either .erl or .hrl in all applications - src directories, the following

+filelib:wildcard("lib/*/ebin/*.beam"). +

To find .erl or .hrl in all applications src + directories, use either of the following lines:

- filelib:wildcard("lib/*/src/*.?rl") -

or the following line

+filelib:wildcard("lib/*/src/*.?rl") - filelib:wildcard("lib/*/src/*.{erl,hrl}") -

can be used.

-

To find all .hrl files in either src or include - directories, use:

+filelib:wildcard("lib/*/src/*.{erl,hrl}") +

To find all .hrl files in src or include + directories:

- filelib:wildcard("lib/*/{src,include}/*.hrl"). +filelib:wildcard("lib/*/{src,include}/*.hrl").

To find all .erl or .hrl files in either - src or include directories, use:

+ src or include directories:

- filelib:wildcard("lib/*/{src,include}/*.{erl,hrl}") -

To find all .erl or .hrl files in any - subdirectory, use:

+filelib:wildcard("lib/*/{src,include}/*.{erl,hrl}") +

To find all .erl or .hrl files in any subdirectory:

- filelib:wildcard("lib/**/*.{erl,hrl}") +filelib:wildcard("lib/**/*.{erl,hrl}") + - Match filenames using Unix-style wildcards starting at a specified directory. + Match filenames using Unix-style wildcards starting at a + specified directory. -

The wildcard/2 function works like wildcard/1, - except that instead of the actual working directory, Cwd - will be used.

+

Same as wildcard/1, + except that Cwd is used instead of the working + directory.

 diff --git a/lib/stdlib/doc/src/filename.xml b/lib/stdlib/doc/src/filename.xml index f284a7596c..2a413835d0 100644 --- a/lib/stdlib/doc/src/filename.xml +++ b/lib/stdlib/doc/src/filename.xml @@ -25,27 +25,37 @@ filename Kenneth Lundin 1 - 97-11-13 + 1997-11-13 B
filename - Filename Manipulation Functions + Filename manipulation functions. -

The module filename provides a number of useful functions - for analyzing and manipulating file names. These functions are +

This module provides functions + for analyzing and manipulating filenames. These functions are designed so that the Erlang code can work on many different - platforms with different formats for file names. With file name - is meant all strings that can be used to denote a file. They can - be short relative names like foo.erl, very long absolute - name which include a drive designator and directory names like + platforms with different filename formats. With filename + is meant all strings that can be used to denote a file. The filename + can be a short relative name like foo.erl, a long absolute + name including a drive designator, a directory name like D:\usr/local\bin\erl/lib\tools\foo.erl, or any variations in between.

-

In Windows, all functions return file names with forward slashes - only, even if the arguments contain back slashes. Use - join/1 to normalize a file name by removing redundant - directory separators.

-

The module supports raw file names in the way that if a binary is present, or the file name cannot be interpreted according to the return value of - file:native_name_encoding/0, a raw file name will also be returned. For example filename:join/1 provided with a path component being a binary (and also not being possible to interpret under the current native file name encoding) will result in a raw file name being returned (the join operation will have been performed of course). For more information about raw file names, see the file module.

+ +

In Windows, all functions return filenames with forward slashes + only, even if the arguments contain backslashes. To normalize a + filename by removing redundant directory separators, use + join/1.

+ +

The module supports raw filenames in the way that if a binary is + present, or the filename cannot be interpreted according to the return + value of + file:native_name_encoding/0, a raw filename is also + returned. For example, join/1 provided with a path component + that is a binary (and cannot be interpreted under the current + native filename encoding) results in a raw filename that is returned + (the join operation is performed of course). For more information + about raw filenames, see the + file module.

 @@ -56,13 +66,14 @@ - Convert a filename to an absolute name, relative the working directory + Convert a filename to an absolute name, relative the working + directory. -

Converts a relative Filename and returns an absolute - name. No attempt is made to create the shortest absolute name, - because this can give incorrect results on file systems which +

Converts a relative Filename and returns an + absolute name. No attempt is made to create the shortest absolute + name, as this can give incorrect results on file systems that allow links.

-

Unix examples:

+

Unix examples:

 1> pwd().
 "/usr/local"
@@ -72,7 +83,7 @@
 "/usr/local/../x"
 4> filename:absname("/").
 "/"
-

Windows examples:

+

Windows examples:

 1> pwd().
 "D:/usr/local"
@@ -84,28 +95,32 @@
 "D:/"
 + - Convert a filename to an absolute name, relative a specified directory + Convert a filename to an absolute name, relative a specified + directory. -

This function works like absname/1, except that - the directory to which the file name should be made relative - is given explicitly in the Dir argument.

+

Same as absname/1, + except that the directory to which the filename is to be made + relative is specified in argument Dir.

 + - Join an absolute directory with a relative filename + Join an absolute directory with a relative filename. -

Joins an absolute directory with a relative filename. - Similar to join/2, but on platforms with tight - restrictions on raw filename length and no support for - symbolic links (read: VxWorks), leading parent directory - components in Filename are matched against trailing - directory components in Dir so they can be removed - from the result - minimizing its length.

+

Joins an absolute directory with a relative filename. Similar to + join/2, but on platforms + with tight restrictions on raw filename length and no support for + symbolic links (read: VxWorks), leading parent directory components + in Filename are matched against trailing + directory components in Dir so they can be + removed from the result - minimizing its length.

 + Equivalent to basedir(Type,Application,#{}). @@ -121,11 +136,13 @@

- Returns a suitable path, or paths, for a given type. - If os is not set in Opts the function will default to - the native option, i.e. 'linux', 'darwin' or 'windows', as understood - by os:type/0. Anything not recognized as 'darwin' or 'windows' is - interpreted as 'linux'.

+ Returns a suitable path, or paths, for a given type. If + os is not set in Opts the + function will default to the native option, that is + 'linux', 'darwin' or 'windows', as + understood by os:type/0. Anything not recognized + as 'darwin' or 'windows' is interpreted as + 'linux'.

The options 'author' and 'version' are only used with 'windows' option mode.

@@ -257,11 +274,12 @@ true - Return the last component of a filename + Return the last component of a filename.

Returns the last component of Filename, or - Filename itself if it does not contain any directory - separators.

+ Filename itself if it does not contain any + directory separators.

+

Examples:

 5> filename:basename("foo").
 "foo"
@@ -271,15 +289,18 @@ true
 []
 + - Return the last component of a filename, stripped of the specified extension + Return the last component of a filename, stripped of the + specified extension. -

Returns the last component of Filename with the - extension Ext stripped. This function should be used - to remove a specific extension which might, or might not, be - there. Use rootname(basename(Filename)) to remove an - extension that exists, but you are not sure which one it is.

+

Returns the last component of Filename with + extension Ext stripped. This function is to be + used to remove a (possible) specific extension. To remove an + existing extension when you are unsure which one it is, use + rootname(basename(Filename)).

+

Examples:

 8> filename:basename("~/src/kalle.erl", ".erl").
 "kalle"
@@ -293,27 +314,32 @@ true
 "kalle"
 + - Return the directory part of a path name + Return the directory part of a path name.

Returns the directory part of Filename.

+

Examples:

 13> filename:dirname("/usr/src/kalle.erl").
 "/usr/src"
 14> filename:dirname("kalle.erl").
-"."
-
+"."
+ 
 5> filename:dirname("\\usr\\src/kalle.erl"). % Windows
 "/usr/src"
 + - Return the file extension + Return the file extension. -

Returns the file extension of Filename, including - the period. Returns an empty string if there is no extension.

+

Returns the file extension of Filename, + including the period. Returns an empty string if no extension + exists.

+

Examples:

 15> filename:extension("foo.erl").
 ".erl"
@@ -321,69 +347,123 @@ true
 []
 + + + + + Find the filename and compiler options for a module. + +

Finds the source filename and compiler options for a module. + The result can be fed to + compile:file/2 to compile the file again.

+

It is not recommended to use this function. If possible, + use the beam_lib(3) + module to extract the abstract code format from the Beam file and + compile that instead.

 +

Argument Beam, which can be a string or an atom, + specifies either the module name or the path to the source + code, with or without extension ".erl". In either + case, the module must be known by the code server, that is, + code:which(Module) must succeed.

+

Rules describes how the source directory can be + found when the object code directory is known. It is a list of + tuples {BinSuffix, SourceSuffix} and + is interpreted as follows: if the end of the directory name where the + object is located matches BinSuffix, then the + source code directory has the same name, but with + BinSuffix replaced by + SourceSuffix. Rules defaults + to:

+ +[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}] +

If the source file is found in the resulting directory, the function + returns that location together with Options. + Otherwise the next rule is tried, and so on.

+

The function returns {SourceFile, + Options} if it succeeds. + SourceFile is the absolute path to the source + file without extension ".erl". Options + includes the options that are necessary to recompile the file with + compile:file/2, but excludes options such as report + and verbose, which do not change the way code is generated. + The paths in options {outdir, Path} and + {i, Path} are guaranteed to be absolute.

+ + + - Convert a filename to a flat string + Convert a filename to a flat string.

Converts a possibly deep list filename consisting of characters and atoms into the corresponding flat string filename.

 + - Join a list of filename components with directory separators + Join a list of filename components with directory separators. + -

Joins a list of file name Components with directory - separators. If one of the elements of Components - includes an absolute path, for example "/xxx", +

Joins a list of filename Components with + directory separators. + If one of the elements of Components + includes an absolute path, such as "/xxx", the preceding elements, if any, are removed from the result.

The result is "normalized":

Redundant directory separators are removed. In Windows, all directory separators are forward - slashes and the drive letter is in lower case. + slashes and the drive letter is in lower case. +

Examples:

 17> filename:join(["/usr", "local", "bin"]).
 "/usr/local/bin"
 18> filename:join(["a/b///c/"]).
-"a/b/c"
-
+"a/b/c"
+ 
 6> filename:join(["B:a\\b///c/"]). % Windows
 "b:a/b/c"
 + - Join two filename components with directory separators + Join two filename components with directory separators. + -

Joins two file name components with directory separators. - Equivalent to join([Name1, Name2]).

+

Joins two filename components with directory separators. + Equivalent to join([Name1, Name2]). +

+ - Return the native form of a file path + Return the native form of a file path. -

Converts Path to a form accepted by the command shell - and native applications on the current platform. On Windows, +

Converts Path to a form accepted by the command + shell and native applications on the current platform. On Windows, forward slashes are converted to backward slashes. On all - platforms, the name is normalized as done by join/1.

+ platforms, the name is normalized as done by + join/1.

+

Examples:

 19> filename:nativename("/usr/local/bin/"). % Unix
-"/usr/local/bin"
-
+"/usr/local/bin"
+ 
 7> filename:nativename("/usr/local/bin/"). % Windows
 "\\usr\\local\\bin"
 + - Return the type of a path + Return the path type. -

Returns the type of path, one of absolute, - relative, or volumerelative.

+

Returns the path type, which is one of the following:

absolute @@ -408,14 +488,16 @@ true + - Remove a filename extension + Remove a filename extension. -

Remove a filename extension. rootname/2 works as +

Removes a filename extension. rootname/2 works as rootname/1, except that the extension is removed only if it is Ext.

+

Examples:

 20> filename:rootname("/beam.src/kalle").
 /beam.src/kalle"
@@ -427,12 +509,14 @@ true
 "/beam.src/foo.beam"
 + - Split a filename into its path components + Split a filename into its path components.

Returns a list whose elements are the path components of Filename.

+

Examples:

 24> filename:split("/usr/local/bin").
 ["/","usr","local","bin"]
@@ -442,50 +526,6 @@ true
 ["a:/","msdev","include"]
 - - - - Find the filename and compiler options for a module - -

Finds the source filename and compiler options for a module. - The result can be fed to compile:file/2 in order to - compile the file again.

- -

We don't recommend using this function. If possible, - use beam_lib(3) to extract - the abstract code format from the BEAM file and compile that - instead.

 - -

The Beam argument, which can be a string or an atom, - specifies either the module name or the path to the source - code, with or without the ".erl" extension. In either - case, the module must be known by the code server, i.e. - code:which(Module) must succeed.

-

Rules describes how the source directory can be found, - when the object code directory is known. It is a list of - tuples {BinSuffix, SourceSuffix} and is interpreted - as follows: If the end of the directory name where the object - is located matches BinSuffix, then the source code - directory has the same name, but with BinSuffix - replaced by SourceSuffix. Rules defaults to:

- -[{"", ""}, {"ebin", "src"}, {"ebin", "esrc"}] -

If the source file is found in the resulting directory, then - the function returns that location together with - Options. Otherwise, the next rule is tried, and so on.

- -

The function returns {SourceFile, Options} if it succeeds. - SourceFile is the absolute path to the source file - without the ".erl" extension. Options include - the options which are necessary to recompile the file with - compile:file/2, but excludes options such as - report or verbose which do not change the way - code is generated. The paths in the {outdir, Path} - and {i, Path} options are guaranteed to be - absolute.

- - - diff --git a/lib/stdlib/doc/src/gb_sets.xml b/lib/stdlib/doc/src/gb_sets.xml index 84609a0f7c..d677dd6f83 100644 --- a/lib/stdlib/doc/src/gb_sets.xml +++ b/lib/stdlib/doc/src/gb_sets.xml @@ -29,87 +29,75 @@
gb_sets - General Balanced Trees + General balanced trees. -

An implementation of ordered sets using Prof. Arne Andersson's - General Balanced Trees. This can be much more efficient than +

This module provides ordered sets using Prof. Arne Andersson's + General Balanced Trees. Ordered sets can be much more efficient than using ordered lists, for larger sets, but depends on the application.

+

This module considers two elements as different if and only if they do not compare equal (==).
- Complexity note -

The complexity on set operations is bounded by either O(|S|) or - O(|T| * log(|S|)), where S is the largest given set, depending + Complexity Note +

The complexity on set operations is bounded by either O(|S|) or + O(|T| * log(|S|)), where S is the largest given set, depending on which is fastest for any particular function call. For operating on sets of almost equal size, this implementation is about 3 times slower than using ordered-list sets directly. For sets of very different sizes, however, this solution can be - arbitrarily much faster; in practical cases, often between 10 - and 100 times. This implementation is particularly suited for + arbitrarily much faster; in practical cases, often + 10-100 times. This implementation is particularly suited for accumulating elements a few at a time, building up a large set - (more than 100-200 elements), and repeatedly testing for + (> 100-200 elements), and repeatedly testing for membership in the current set.

+

As with normal tree structures, lookup (membership testing), - insertion and deletion have logarithmic complexity.

+ insertion, and deletion have logarithmic complexity.

Compatibility -

All of the following functions in this module also exist - and do the same thing in the sets and ordsets +

The following functions in this module also exist and provides + the same functionality in the + sets(3) and + ordsets(3) modules. That is, by only changing the module name for each call, you can try out different set representations.

- -

add_element/2

+ add_element/2 - -

del_element/2

+ del_element/2 - -

filter/2

+ filter/2 - -

fold/3

+ fold/3 - -

from_list/1

+ from_list/1 - -

intersection/1

+ intersection/1 - -

intersection/2

+ intersection/2 - -

is_element/2

+ is_element/2 - -

is_set/1

+ is_set/1 - -

is_subset/2

+ is_subset/2 - -

new/0

+ new/0 - -

size/1

+ size/1 - -

subtract/2

+ subtract/2 - -

to_list/1

+ to_list/1 - -

union/1

+ union/1 - -

union/2

+ union/2
@@ -117,290 +105,369 @@ -

A GB set.

 +

A general balanced set.

 -

A GB set iterator.

 +

A general balanced set iterator.

 + - Add a (possibly existing) element to a set + Add a (possibly existing) element to a set.

Returns a new set formed from Set1 with - Element inserted. If Element is already an + Element inserted. If Element + is already an element in Set1, nothing is changed.

 + - Rebalance tree representation of a set + Rebalance tree representation of a set. -

Rebalances the tree representation of Set1. Note that - this is rarely necessary, but may be motivated when a large +

Rebalances the tree representation of Set1. + Notice that + this is rarely necessary, but can be motivated when a large number of elements have been deleted from the tree without - further insertions. Rebalancing could then be forced in order - to minimise lookup times, since deletion only does not + further insertions. Rebalancing can then be forced + to minimise lookup times, as deletion does not rebalance the tree.

 + + + + Remove a (possibly non-existing) element from a set. + +

Returns a new set formed from Set1 with + Element removed. If Element + is not an element + in Set1, nothing is changed.

+ + + - Remove an element from a set + Remove an element from a set.

Returns a new set formed from Set1 with - Element removed. Assumes that Element is present + Element removed. Assumes that + Element is present in Set1.

 + - - Remove a (possibly non-existing) element from a set + Remove a (possibly non-existing) element from a set.

Returns a new set formed from Set1 with - Element removed. If Element is not an element + Element removed. If Element + is not an element in Set1, nothing is changed.

 + - - Return the difference of two sets + Return the difference of two sets. -

Returns only the elements of Set1 which are not also - elements of Set2.

+

Returns only the elements of Set1 that are not + also elements of Set2.

 + - - Return an empty set + Return an empty set.

Returns a new empty set.

 + - Filter set elements + Filter set elements.

Filters elements in Set1 using predicate function Pred.

 + - Fold over set elements + Fold over set elements. -

Folds Function over every element in Set +

Folds Function over every element in + Set returning the final value of the accumulator.

 + - Convert a list into a set + Convert a list into a set.

Returns a set of the elements in List, where - List may be unordered and contain duplicates.

+ List can be unordered and contain duplicates.

 + - Make a set from an ordset list + Make a set from an ordset list. -

Turns an ordered-set list List into a set. The list - must not contain duplicates.

+

Turns an ordered-set list List into a set. + The list must not contain duplicates.

 + - Add a new element to a set + Add a new element to a set.

Returns a new set formed from Set1 with - Element inserted. Assumes that Element is not + Element inserted. Assumes that + Element is not present in Set1.

 + - - Return the intersection of two sets + + Return the intersection of a list of sets. -

Returns the intersection of Set1 and Set2.

+

Returns the intersection of the non-empty list of sets.

 + - - Return the intersection of a list of sets + + Return the intersection of two sets. -

Returns the intersection of the non-empty list of sets.

+

Returns the intersection of Set1 and + Set2.

 + - Check whether two sets are disjoint + Check whether two sets are disjoint.

Returns true if Set1 and Set2 are disjoint (have no elements in common), - and false otherwise.

+ otherwise false.

+ + + + + + Test for membership of a set. + +

Returns true if Element is an element of + Set, otherwise false.

 + - Test for empty set + Test for empty set. -

Returns true if Set is an empty set, and - false otherwise.

+

Returns true if Set is an empty set, + otherwise false.

 + - - Test for membership of a set + Test for membership of a set.

Returns true if Element is an element of Set, otherwise false.

 + - Test for a set + Test for a set.

Returns true if Term appears to be a set, otherwise false.

 + - Test for subset + Test for subset.

Returns true when every element of Set1 is also a member of Set2, otherwise false.

 + - Return an iterator for a set + Return an iterator for a set. -

Returns an iterator that can be used for traversing the - entries of Set; see next/1. The implementation +

Returns an iterator that can be used for traversing the entries of + Set; see + next/1. The implementation of this is very efficient; traversing the whole set using - next/1 is only slightly slower than getting the list - of all elements using to_list/1 and traversing that. + next/1 is only slightly slower than getting the list of all + elements using to_list/1 + and traversing that. The main advantage of the iterator approach is that it does not require the complete list of all elements to be built in memory at one time.

 + - Return an iterator for a set starting from a specified element + Return an iterator for a set starting from a specified element. +

Returns an iterator that can be used for traversing the - entries of Set; see next/1. + entries of Set; see + next/1. The difference as compared to the iterator returned by - iterator/1 is that the first element greater than + iterator/1 + is that the first element greater than or equal to Element is returned.

 + - Return largest element + Return largest element.

Returns the largest element in Set. Assumes that - Set is nonempty.

+ Set is not empty.

 + + + + Return an empty set. + +

Returns a new empty set.

+ + + - Traverse a set with an iterator + Traverse a set with an iterator. -

Returns {Element, Iter2} where Element is the - smallest element referred to by the iterator Iter1, +

Returns {Element, Iter2}, where + Element is the smallest element referred to by + iterator Iter1, and Iter2 is the new iterator to be used for traversing the remaining elements, or the atom none if no elements remain.

 + - Return a set with one element + Return a set with one element. -

Returns a set containing only the element Element.

+

Returns a set containing only element Element. +

+ - Return the number of elements in a set + Return the number of elements in a set.

Returns the number of elements in Set.

 + - Return smallest element + Return smallest element.

Returns the smallest element in Set. Assumes that - Set is nonempty.

+ Set is not empty.

 + + + + Return the difference of two sets. + +

Returns only the elements of Set1 that are not + also elements of Set2.

+ + + - Extract largest element + Extract largest element. -

Returns {Element, Set2}, where Element is the - largest element in Set1, and Set2 is this set - with Element deleted. Assumes that Set1 is - nonempty.

+

Returns {Element, Set2}, where + Element is the largest element in + Set1, and Set2 is this set + with Element deleted. Assumes that + Set1 is not empty.

 + - Extract smallest element + Extract smallest element. -

Returns {Element, Set2}, where Element is the - smallest element in Set1, and Set2 is this set - with Element deleted. Assumes that Set1 is - nonempty.

+

Returns {Element, Set2}, where + Element is the smallest element in + Set1, and Set2 is this set + with Element deleted. Assumes that + Set1 is not empty.

 + - Convert a set into a list + Convert a set into a list.

Returns the elements of Set as a list.

 + - - Return the union of two sets + + Return the union of a list of sets. -

Returns the merged (union) set of Set1 and - Set2.

+

Returns the merged (union) set of the list of sets.

 + - - Return the union of a list of sets + + Return the union of two sets. -

Returns the merged (union) set of the list of sets.

+

Returns the merged (union) set of Set1 and + Set2.
- SEE ALSO -

gb_trees(3), - ordsets(3), - sets(3)

+ See Also +

gb_trees(3), + ordsets(3), + sets(3)

 diff --git a/lib/stdlib/doc/src/gb_trees.xml b/lib/stdlib/doc/src/gb_trees.xml index 5d1f27c014..9a49d66820 100644 --- a/lib/stdlib/doc/src/gb_trees.xml +++ b/lib/stdlib/doc/src/gb_trees.xml @@ -29,277 +29,320 @@
gb_trees - General Balanced Trees + General balanced trees. -

An efficient implementation of Prof. Arne Andersson's General +

This module provides Prof. Arne Andersson's General Balanced Trees. These have no storage overhead compared to - unbalanced binary trees, and their performance is in general + unbalanced binary trees, and their performance is better than AVL trees.

+

This module considers two keys as different if and only if they do not compare equal (==).
- Data structure -

Data structure:

+ Data Structure - -- {Size, Tree}, where `Tree' is composed of nodes of the form: - - {Key, Value, Smaller, Bigger}, and the "empty tree" node: - - nil. -

There is no attempt to balance trees after deletions. Since +{Size, Tree} + +

Tree is composed of nodes of the form {Key, Value, Smaller, + Bigger} and the "empty tree" node nil.

+ +

There is no attempt to balance trees after deletions. As deletions do not increase the height of a tree, this should be OK.

-

Original balance condition h(T) <= ceil(c * log(|T|)) + +

The original balance condition h(T) <= ceil(c * log(|T|)) has been changed to the similar (but not quite equivalent) condition 2 ^ h(T) <= |T| ^ c. This should also be OK.

-

Performance is comparable to the AVL trees in the Erlang book - (and faster in general due to less overhead); the difference is - that deletion works for these trees, but not for the book's - trees. Behaviour is logarithmic (as it should be).

-

A GB tree.

 +

A general balanced tree.

 -

A GB tree iterator.

 +

A general balanced tree iterator.

 + - Rebalance a tree + Rebalance a tree. -

Rebalances Tree1. Note that this is rarely necessary, - but may be motivated when a large number of nodes have been +

Rebalances Tree1. Notice that this is + rarely necessary, + but can be motivated when many nodes have been deleted from the tree without further insertions. Rebalancing - could then be forced in order to minimise lookup times, since - deletion only does not rebalance the tree.

+ can then be forced to minimize lookup times, as + deletion does not rebalance the tree.

 + - Remove a node from a tree + Remove a node from a tree. -

Removes the node with key Key from Tree1; - returns new tree. Assumes that the key is present in the tree, - crashes otherwise.

+

Removes the node with key Key from + Tree1 and returns the new tree. Assumes that the + key is present in the tree, crashes otherwise.

 + - Remove a (possibly non-existing) node from a tree + Remove a (possibly non-existing) node from a tree. -

Removes the node with key Key from Tree1 if - the key is present in the tree, otherwise does nothing; - returns new tree.

+

Removes the node with key Key from + Tree1 if + the key is present in the tree, otherwise does nothing. + Returns the new tree.

 + - Return an empty tree + Return an empty tree. -

Returns a new empty tree

+

Returns a new empty tree.

 + - Insert or update key with value in a tree + Insert or update key with value in a tree. -

Inserts Key with value Value into Tree1 if - the key is not present in the tree, otherwise updates - Key to value Value in Tree1. Returns the +

Inserts Key with value Value + into Tree1 if the key is not present in the tree, + otherwise updates Key to value + Value in Tree1. Returns the new tree.

 + - Make a tree from an orddict + Make a tree from an orddict. -

Turns an ordered list List of key-value tuples into a - tree. The list must not contain duplicate keys.

+

Turns an ordered list List of key-value tuples + into a tree. The list must not contain duplicate keys.

 + - Look up a key in a tree, if present + Look up a key in a tree, if present. -

Retrieves the value stored with Key in Tree. +

Retrieves the value stored with Key in + Tree. Assumes that the key is present in the tree, crashes otherwise.

 + - Insert a new key and value in a tree + Insert a new key and value in a tree. -

Inserts Key with value Value into Tree1; +

Inserts Key with value Value + into Tree1 and returns the new tree. Assumes that the key is not present in the tree, crashes otherwise.

 + - Test for membership of a tree + Test for membership of a tree. -

Returns true if Key is present in Tree, - otherwise false.

+

Returns true if Key is present in + Tree, otherwise false.

 + - Test for empty tree + Test for empty tree. -

Returns true if Tree is an empty tree, and - false otherwise.

+

Returns true if Tree is an empty tree, + othwewise false.

 + - Return an iterator for a tree + Return an iterator for a tree.

Returns an iterator that can be used for traversing the - entries of Tree; see next/1. The implementation + entries of Tree; see + next/1. The implementation of this is very efficient; traversing the whole tree using next/1 is only slightly slower than getting the list - of all elements using to_list/1 and traversing that. + of all elements using + to_list/1 + and traversing that. The main advantage of the iterator approach is that it does not require the complete list of all elements to be built in memory at one time.

 + - Return an iterator for a tree starting from specified key + Return an iterator for a tree starting from a specified key. +

Returns an iterator that can be used for traversing the - entries of Tree; see next/1. - The difference as compared to the iterator returned by - iterator/1 is that the first key greater than - or equal to Key is returned.

+ entries of Tree; see + next/1. + The difference as compared to the iterator returned by + iterator/1 + is that the first key greater than + or equal to Key is returned.

 + - Return a list of the keys in a tree + Return a list of the keys in a tree.

Returns the keys in Tree as an ordered list.

 + - Return largest key and value + Return largest key and value. -

Returns {Key, Value}, where Key is the largest - key in Tree, and Value is the value associated - with this key. Assumes that the tree is nonempty.

+

Returns {Key, Value}, where + Key is the largest + key in Tree, and Value is + the value associated + with this key. Assumes that the tree is not empty.

 + - Look up a key in a tree + Look up a key in a tree. -

Looks up Key in Tree; returns - {value, Value}, or none if Key is not - present.

+

Looks up Key in Tree. + Returns {value, Value}, or none if + Key is not present.

 + - Return largest key and value -

Maps the function F(K, V1) -> V2 to all key-value pairs - of the tree Tree1 and returns a new tree Tree2 with the same set of keys - as Tree1 and the new set of values V2.

+ Return largest key and value. + +

Maps function F(K, V1) -> V2 + to all key-value pairs of tree Tree1. Returns a + new tree Tree2 with the same set of keys as + Tree1 and the new set of values + V2.

 + - Traverse a tree with an iterator + Traverse a tree with an iterator. -

Returns {Key, Value, Iter2} where Key is the - smallest key referred to by the iterator Iter1, and +

Returns {Key, Value, + Iter2}, where Key is the + smallest key referred to by iterator Iter1, and Iter2 is the new iterator to be used for traversing the remaining nodes, or the atom none if no nodes remain.

 + - Return the number of nodes in a tree + Return the number of nodes in a tree.

Returns the number of nodes in Tree.

 + - Return smallest key and value + Return smallest key and value. -

Returns {Key, Value}, where Key is the smallest - key in Tree, and Value is the value associated - with this key. Assumes that the tree is nonempty.

+

Returns {Key, Value}, where + Key is the smallest + key in Tree, and Value is + the value associated + with this key. Assumes that the tree is not empty.

 + - Extract largest key and value + Extract largest key and value. -

Returns {Key, Value, Tree2}, where Key is the - largest key in Tree1, Value is the value - associated with this key, and Tree2 is this tree with - the corresponding node deleted. Assumes that the tree is - nonempty.

+

Returns {Key, Value, + Tree2}, where Key is the + largest key in Tree1, Value + is the value associated with this key, and Tree2 + is this tree with the corresponding node deleted. Assumes that the + tree is not empty.

 + - Extract smallest key and value + Extract smallest key and value. -

Returns {Key, Value, Tree2}, where Key is the - smallest key in Tree1, Value is the value - associated with this key, and Tree2 is this tree with - the corresponding node deleted. Assumes that the tree is - nonempty.

+

Returns {Key, Value, + Tree2}, where Key is the + smallest key in Tree1, Value + is the value associated with this key, and Tree2 + is this tree with the corresponding node deleted. Assumes that the + tree is not empty.

 + - Convert a tree into a list + Convert a tree into a list.

Converts a tree into an ordered list of key-value tuples.

 + - Update a key to new value in a tree + Update a key to new value in a tree. -

Updates Key to value Value in Tree1; - returns the new tree. Assumes that the key is present in the - tree.

+

Updates Key to value Value + in Tree1 and + returns the new tree. Assumes that the key is present in the tree.

 + - Return a list of the values in a tree + Return a list of the values in a tree. -

Returns the values in Tree as an ordered list, sorted - by their corresponding keys. Duplicates are not removed.

+

Returns the values in Tree as an ordered list, + sorted by their corresponding keys. Duplicates are not removed.
- SEE ALSO -

gb_sets(3), - dict(3)

+ See Also +

dict(3), + gb_sets(3)

diff --git a/lib/stdlib/doc/src/gen_event.xml b/lib/stdlib/doc/src/gen_event.xml index b2c482d3ed..c24542002a 100644 --- a/lib/stdlib/doc/src/gen_event.xml +++ b/lib/stdlib/doc/src/gen_event.xml @@ -29,19 +29,23 @@
gen_event - Generic Event Handling Behaviour + Generic event handling behavior. -

A behaviour module for implementing event handling functionality. - The OTP event handling model consists of a generic event manager - process with an arbitrary number of event handlers which are added and - deleted dynamically.

-

An event manager implemented using this module will have a standard - set of interface functions and include functionality for tracing and - error reporting. It will also fit into an OTP supervision tree. - Refer to OTP Design Principles for more information.

+

This behavior module provides event handling functionality. It + consists of a generic event manager process with any number of + event handlers that are added and deleted dynamically.

+ +

An event manager implemented using this module has a standard + set of interface functions and includes functionality for tracing and + error reporting. It also fits into an OTP supervision tree. For more + information, see + OTP Design Principles. +

+

Each event handler is implemented as a callback module exporting - a pre-defined set of functions. The relationship between the behaviour - functions and the callback functions can be illustrated as follows:

+ a predefined set of functions. The relationship between the behavior + functions and the callback functions is as follows:

+ 
 gen_event module                   Callback module
 ----------------                   ---------------
@@ -69,39 +73,46 @@ gen_event:which_handlers   ----->  -
 gen_event:stop             ----->  Module:terminate/2
 
 -                          ----->  Module:code_change/3
-

Since each event handler is one callback module, an event manager - will have several callback modules which are added and deleted - dynamically. Therefore gen_event is more tolerant of callback - module errors than the other behaviours. If a callback function for + +

As each event handler is one callback module, an event manager + has many callback modules that are added and deleted + dynamically. gen_event is therefore more tolerant of callback + module errors than the other behaviors. If a callback function for an installed event handler fails with Reason, or returns a - bad value Term, the event manager will not fail. It will delete - the event handler by calling the callback function - Module:terminate/2 (see below), giving as argument + bad value Term, the event manager does not fail. It deletes + the event handler by calling callback function + Module:terminate/2, + giving as argument {error,{'EXIT',Reason}} or {error,Term}, respectively. - No other event handler will be affected.

-

A gen_event process handles system messages as documented in - sys(3). The sys module + No other event handler is affected.

+ +

A gen_event process handles system messages as described in + sys(3). The sys module can be used for debugging an event manager.

-

Note that an event manager does trap exit signals + +

Notice that an event manager does trap exit signals automatically.

-

The gen_event process can go into hibernation - (see erlang(3)) if a callback - function in a handler module specifies 'hibernate' in its return value. - This might be useful if the server is expected to be idle for a long - time. However this feature should be used with care as hibernation - implies at least two garbage collections (when hibernating and - shortly after waking up) and is not something you'd want to do - between each event handled by a busy event manager.

- -

It's also worth noting that when multiple event handlers are - invoked, it's sufficient that one single event handler returns a - 'hibernate' request for the whole event manager to go into - hibernation.

+ +

The gen_event process can go into hibernation + (see + erlang:hibernate/3) if a callback function in + a handler module specifies hibernate in its return value. + This can be useful if the server is expected to be idle for a long + time. However, use this feature with care, as hibernation + implies at least two garbage collections (when hibernating and + shortly after waking up) and is not something you want to do + between each event handled by a busy event manager.

+ +

Notice that when multiple event handlers are + invoked, it is sufficient that one single event handler returns a + hibernate request for the whole event manager to go into + hibernation.

Unless otherwise stated, all functions in this module fail if the specified event manager does not exist or if bad arguments are - given.

+ specified.

 + @@ -116,65 +127,8 @@ gen_event:stop -----> Module:terminate/2 + - - start_link() -> Result - start_link(EventMgrName) -> Result - Create a generic event manager process in a supervision tree. - - EventMgrName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Result = {ok,Pid} | {error,{already_started,Pid}} -  Pid = pid() - - -

Creates an event manager process as part of a supervision - tree. The function should be called, directly or indirectly, - by the supervisor. It will, among other things, ensure that - the event manager is linked to the supervisor.

-

If EventMgrName={local,Name}, the event manager is - registered locally as Name using register/2. - If EventMgrName={global,GlobalName}, the event manager is - registered globally as GlobalName using - global:register_name/2. If no name is provided, - the event manager is not registered. - If EventMgrName={via,Module,ViaName}, the event manager will - register with the registry represented by Module. - The Module callback should export the functions - register_name/2, unregister_name/1, - whereis_name/1 and send/2, which should behave like the - corresponding functions in global. Thus, - {via,global,GlobalName} is a valid reference.

-

If the event manager is successfully created the function - returns {ok,Pid}, where Pid is the pid of - the event manager. If there already exists a process with - the specified EventMgrName the function returns - {error,{already_started,Pid}}, where Pid is - the pid of that process.

- - - - start() -> Result - start(EventMgrName) -> Result - Create a stand-alone event manager process. - - EventMgrName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Result = {ok,Pid} | {error,{already_started,Pid}} -  Pid = pid() - - -

Creates a stand-alone event manager process, i.e. an event - manager which is not part of a supervision tree and thus has - no supervisor.

-

See start_link/0,1 for a description of arguments and - return values.

- - add_handler(EventMgrRef, Handler, Args) -> Result Add an event handler to a generic event manager. @@ -191,26 +145,27 @@ gen_event:stop -----> Module:terminate/2  Reason = term() -

Adds a new event handler to the event manager EventMgrRef. - The event manager will call Module:init/1 to initiate - the event handler and its internal state.

-

EventMgrRef can be:

+

Adds a new event handler to event manager EventMgrRef. + The event manager calls + Module:init/1 + to initiate the event handler and its internal state.

+

EventMgrRef can be any of the following:

- the pid, - Name, if the event manager is locally registered, + The pid + Name, if the event manager is locally registered {Name,Node}, if the event manager is locally - registered at another node, or + registered at another node {global,GlobalName}, if the event manager is globally - registered. - {via,Module,ViaName}, if the event manager is registered - through an alternative process registry. + registered + {via,Module,ViaName}, if the event manager is registered + through an alternative process registry

Handler is the name of the callback module Module or a tuple {Module,Id}, where Id is any term. The {Module,Id} representation makes it possible to - identify a specific event handler when there are several event - handlers using the same callback module.

-

Args is an arbitrary term which is passed as the argument + identify a specific event handler when many event handlers + use the same callback module.

+

Args is any term that is passed as the argument to Module:init/1.

If Module:init/1 returns a correct value indicating successful completion, the event manager adds the event @@ -221,9 +176,11 @@ gen_event:stop -----> Module:terminate/2 {error,Reason}, respectively.

 + add_sup_handler(EventMgrRef, Handler, Args) -> Result - Add a supervised event handler to a generic event manager. + Add a supervised event handler to a generic event manager. + EventMgrRef = Name | {Name,Node} | {global,GlobalName} | {via,Module,ViaName} | pid() @@ -237,63 +194,52 @@ gen_event:stop -----> Module:terminate/2  Reason = term() -

Adds a new event handler in the same way as add_handler/3 - but will also supervise the connection between the event handler +

Adds a new event handler in the same way as + add_handler/3, + but also supervises the connection between the event handler and the calling process.

If the calling process later terminates with Reason, - the event manager will delete the event handler by calling - Module:terminate/2 with {stop,Reason} as argument. + the event manager deletes the event handler by calling + + Module:terminate/2 + with {stop,Reason} as argument. + -

If the event handler later is deleted, the event manager +

If the event handler is deleted later, the event manager sends a message{gen_event_EXIT,Handler,Reason} to the calling process. Reason is one of the following:

- normal, if the event handler has been removed due to a - call to delete_handler/3, or remove_handler - has been returned by a callback function (see below). - shutdown, if the event handler has been removed - because the event manager is terminating. - {swapped,NewHandler,Pid}, if the process Pid - has replaced the event handler with another event handler - NewHandler using a call to swap_handler/3 or - swap_sup_handler/3. - a term, if the event handler is removed due to an error. - Which term depends on the error. + +

normal, if the event handler has been removed + because of a + call to delete_handler/3, or remove_handler + has been returned by a callback function (see below).

+ + +

shutdown, if the event handler has been removed + because the event manager is terminating.

+ + +

{swapped,NewHandler,Pid}, if the process Pid + has replaced the event handler with another event handler + NewHandler using a call to + + swap_handler/3 or + + swap_sup_handler/3.

+ + +

A term, if the event handler is removed because of an error. + Which term depends on the error.

 -

See add_handler/3 for a description of the arguments - and return values.

- - - - notify(EventMgrRef, Event) -> ok - sync_notify(EventMgrRef, Event) -> ok - Notify an event manager about an event. - - EventMgrRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() -  Name = Node = atom() -  GlobalName = ViaName = term() - Event = term() - - -

Sends an event notification to the event manager - EventMgrRef. The event manager will call - Module:handle_event/2 for each installed event handler to - handle the event.

-

notify is asynchronous and will return immediately after - the event notification has been sent. sync_notify is - synchronous in the sense that it will return ok after - the event has been handled by all event handlers.

-

See add_handler/3 for a description of EventMgrRef.

-

Event is an arbitrary term which is passed as one of - the arguments to Module:handle_event/2.

-

notify will not fail even if the specified event manager - does not exist, unless it is specified as Name.

+

For a description of the arguments and return values, see + add_handler/3.

 + call(EventMgrRef, Handler, Request) -> Result call(EventMgrRef, Handler, Request, Timeout) -> Result @@ -314,18 +260,18 @@ gen_event:stop -----> Module:terminate/2   Reason = term() -

Makes a synchronous call to the event handler Handler - installed in the event manager EventMgrRef by sending a - request and waiting until a reply arrives or a timeout occurs. - The event manager will call Module:handle_call/2 to handle - the request.

-

See add_handler/3 for a description of EventMgrRef - and Handler.

-

Request is an arbitrary term which is passed as one of +

Makes a synchronous call to event handler Handler + installed in event manager EventMgrRef by sending a + request and waiting until a reply arrives or a time-out occurs. + The event manager calls + Module:handle_call/2 to handle the request.

+

For a description of EventMgrRef and Handler, see + add_handler/3.

+

Request is any term that is passed as one of the arguments to Module:handle_call/2.

-

Timeout is an integer greater than zero which specifies +

Timeout is an integer greater than zero that specifies how many milliseconds to wait for a reply, or the atom - infinity to wait indefinitely. Default value is 5000. + infinity to wait indefinitely. Defaults to 5000. If no reply is received within the specified time, the function call fails.

The return value Reply is defined in the return value of @@ -337,7 +283,8 @@ gen_event:stop -----> Module:terminate/2 respectively.

 - + + delete_handler(EventMgrRef, Handler, Args) -> Result Delete an event handler from a generic event manager. @@ -353,12 +300,14 @@ gen_event:stop -----> Module:terminate/2  Reason = term() -

Deletes an event handler from the event manager - EventMgrRef. The event manager will call - Module:terminate/2 to terminate the event handler.

-

See add_handler/3 for a description of EventMgrRef - and Handler.

-

Args is an arbitrary term which is passed as one of +

Deletes an event handler from event manager + EventMgrRef. The event manager calls + + Module:terminate/2 to terminate the event + handler.

+

For a description of EventMgrRef and Handler, see + add_handler/3.

+

Args is any term that is passed as one of the arguments to Module:terminate/2.

The return value is the return value of Module:terminate/2. If the specified event handler is not installed, the function @@ -367,6 +316,148 @@ gen_event:stop -----> Module:terminate/2 {'EXIT',Reason}.

 + + + notify(EventMgrRef, Event) -> ok + sync_notify(EventMgrRef, Event) -> ok + Notify an event manager about an event. + + EventMgrRef = Name | {Name,Node} | {global,GlobalName} + | {via,Module,ViaName} | pid() +  Name = Node = atom() +  GlobalName = ViaName = term() + Event = term() + + +

Sends an event notification to event manager + EventMgrRef. The event manager calls + + Module:handle_event/2 + for each installed event handler to handle the event.

+

notify/2 is asynchronous and returns immediately after + the event notification has been sent. sync_notify/2 is + synchronous in the sense that it returns ok after + the event has been handled by all event handlers.

+

For a description of EventMgrRef, see + add_handler/3.

+

Event is any term that is passed as one of + the arguments to + Module:handle_event/2.

+

notify/1 does not fail even if the specified event manager + does not exist, unless it is specified as Name.

+ + + + + start() -> Result + start(EventMgrName) -> Result + Create a stand-alone event manager process. + + EventMgrName = {local,Name} | {global,GlobalName} + | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Result = {ok,Pid} | {error,{already_started,Pid}} +  Pid = pid() + + +

Creates a stand-alone event manager process, that is, an event + manager that is not part of a supervision tree and thus has + no supervisor.

+

For a description of the arguments and return values, see + start_link/0,1.

+ + + + + start_link() -> Result + start_link(EventMgrName) -> Result + Create a generic event manager process in a supervision tree. + + + EventMgrName = {local,Name} | {global,GlobalName} + | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Result = {ok,Pid} | {error,{already_started,Pid}} +  Pid = pid() + + +

Creates an event manager process as part of a supervision + tree. The function is to be called, directly or indirectly, + by the supervisor. For example, it ensures that + the event manager is linked to the supervisor.

+ + +

If EventMgrName={local,Name}, the event manager is + registered locally as Name using register/2.

+ + +

If EventMgrName={global,GlobalName}, the event manager is + registered globally as GlobalName using + + global:register_name/2. + If no name is provided, the event manager is not registered.

+ + +

If EventMgrName={via,Module,ViaName}, the event manager + registers with the registry represented by Module. + The Module callback is to export the functions + register_name/2, unregister_name/1, + whereis_name/1, and send/2, which are to behave + as the corresponding functions in + global. + Thus, {via,global,GlobalName} is a valid reference.

+ + +

If the event manager is successfully created, the function + returns {ok,Pid}, where Pid is the pid of + the event manager. If a process with the specified + EventMgrName exists already, the function returns + {error,{already_started,Pid}}, where Pid is + the pid of that process.

+ + + + + stop(EventMgrRef) -> ok + stop(EventMgrRef, Reason, Timeout) -> ok + Terminate a generic event manager. + + EventMgrRef = Name | {Name,Node} | {global,GlobalName} + | {via,Module,ViaName} | pid() + Name = Node = atom() + GlobalName = ViaName = term() + Reason = term() + Timeout = int()>0 | infinity + + +

Orders event manager EventMgrRef to exit with + the specifies Reason and waits for it to + terminate. Before terminating, gen_event calls + + Module:terminate(stop,...) + for each installed event handler.

+

The function returns ok if the event manager terminates + with the expected reason. Any other reason than normal, + shutdown, or {shutdown,Term} causes an + error report to be issued using + + error_logger:format/2. + The default Reason is normal.

+

Timeout is an integer greater than zero that + specifies how many milliseconds to wait for the event manager to + terminate, or the atom infinity to wait + indefinitely. Defaults to infinity. If the + event manager has not terminated within the specified time, a + timeout exception is raised.

+

If the process does not exist, a noproc exception + is raised.

+

For a description of EventMgrRef, see + add_handler/3.

+ + + swap_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result Replace an event handler in a generic event manager. @@ -385,34 +476,35 @@ gen_event:stop -----> Module:terminate/2

Replaces an old event handler with a new event handler in - the event manager EventMgrRef.

-

See add_handler/3 for a description of the arguments.

+ event manager EventMgrRef.

+

For a description of the arguments, see + add_handler/3.

First the old event handler Handler1 is deleted. The event manager calls Module1:terminate(Args1, ...), where Module1 is the callback module of Handler1, and collects the return value.

Then the new event handler Handler2 is added and initiated by calling Module2:init({Args2,Term}), where Module2 - is the callback module of Handler2 and Term + is the callback module of Handler2 and Term is the return value of Module1:terminate/2. This makes it possible to transfer information from Handler1 to Handler2.

-

The new handler will be added even if the the specified old event - handler is not installed in which case Term=error, or if - Module1:terminate/2 fails with Reason in which case - Term={'EXIT',Reason}. - The old handler will be deleted even if Module2:init/1 - fails.

+

The new handler is added even if the the specified old event + handler is not installed, in which case Term=error, or if + Module1:terminate/2 fails with Reason, + in which case Term={'EXIT',Reason}. + The old handler is deleted even if Module2:init/1 fails.

If there was a supervised connection between Handler1 and - a process Pid, there will be a supervised connection + a process Pid, there is a supervised connection between Handler2 and Pid instead.

If Module2:init/1 returns a correct value, this function returns ok. If Module2:init/1 fails with - Reason or returns an unexpected value Term, this + Reason or returns an unexpected value Term, this function returns {error,{'EXIT',Reason}} or {error,Term}, respectively.

 + swap_sup_handler(EventMgrRef, {Handler1,Args1}, {Handler2,Args2}) -> Result Replace an event handler in a generic event manager. @@ -430,16 +522,18 @@ gen_event:stop -----> Module:terminate/2   Reason = term() -

Replaces an event handler in the event manager EventMgrRef - in the same way as swap_handler/3 but will also supervise +

Replaces an event handler in event manager EventMgrRef + in the same way as swap_handler/3, but also supervises the connection between Handler2 and the calling process.

-

See swap_handler/3 for a description of the arguments - and return values.

+

For a description of the arguments and return values, see + swap_handler/3.

 + which_handlers(EventMgrRef) -> [Handler] - Return all event handlers installed in a generic event manager. + Return all event handlers installed in a generic event manager. + EventMgrRef = Name | {Name,Node} | {global,GlobalName} | {via,Module,ViaName} | pid() @@ -450,132 +544,106 @@ gen_event:stop -----> Module:terminate/2  Id = term() -

Returns a list of all event handlers installed in the event +

Returns a list of all event handlers installed in event manager EventMgrRef.

-

See add_handler/3 for a description of EventMgrRef - and Handler.

- - - - stop(EventMgrRef) -> ok - stop(EventMgrRef, Reason, Timeout) -> ok - Terminate a generic event manager. - - EventMgrRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() - Name = Node = atom() - GlobalName = ViaName = term() - Reason = term() - Timeout = int()>0 | infinity - - -

Orders the event manager EventMgrRef to exit with - the given Reason and waits for it to - terminate. Before terminating, the gen_event will call - Module:terminate(stop,...) - for each installed event handler.

-

The function returns ok if the event manager terminates - with the expected reason. Any other reason than normal, - shutdown, or {shutdown,Term} will cause an - error report to be issued using - error_logger:format/2. - The default Reason is normal.

-

Timeout is an integer greater than zero which - specifies how many milliseconds to wait for the event manager to - terminate, or the atom infinity to wait - indefinitely. The default value is infinity. If the - event manager has not terminated within the specified time, a - timeout exception is raised.

-

If the process does not exist, a noproc exception - is raised.

-

See add_handler/3 for a description of EventMgrRef.

+

For a description of EventMgrRef and Handler, see + add_handler/3.
- CALLBACK FUNCTIONS -

The following functions should be exported from a gen_event + Callback Functions +

The following functions are to be exported from a gen_event callback module.

+ - Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate} | {error,Reason} - Initialize an event handler. + Module:code_change(OldVsn, State, Extra) -> {ok, NewState} + Update the internal state during upgrade/downgrade. - InitArgs = Args | {Args,Term} -  Args = Term = term() - State = term() - Reason = term() + OldVsn = Vsn | {down, Vsn} +   Vsn = term() + State = NewState = term() + Extra = term() -

Whenever a new event handler is added to an event manager, - this function is called to initialize the event handler.

-

If the event handler is added due to a call to - gen_event:add_handler/3 or - gen_event:add_sup_handler/3, InitArgs is - the Args argument of these functions.

-

If the event handler is replacing another event handler due to - a call to gen_event:swap_handler/3 or - gen_event:swap_sup_handler/3, or due to a swap - return tuple from one of the other callback functions, - InitArgs is a tuple {Args,Term} where Args is - the argument provided in the function call/return tuple and - Term is the result of terminating the old event handler, - see gen_event:swap_handler/3.

-

If successful, the function should return {ok,State} - or {ok,State,hibernate} where State is the - initial internal state of the event handler.

-

If {ok,State,hibernate} is returned, the event - manager will go into hibernation (by calling proc_lib:hibernate/3), - waiting for the next event to occur.

+

This function is called for an installed event handler that + is to update its internal state during a release + upgrade/downgrade, that is, when the instruction + {update,Module,Change,...}, where + Change={advanced,Extra}, is specified in the .appup + file. For more information, see OTP Design Principles.

+

For an upgrade, OldVsn is Vsn, and for a downgrade, + OldVsn is {down,Vsn}. Vsn is defined by the + vsn attribute(s) of the old version of the callback module + Module. If no such attribute is defined, the version + is the checksum of the Beam file.

+

State is the internal state of the event handler.

+

Extra is passed "as is" from the {advanced,Extra} + part of the update instruction.

+

The function is to return the updated internal state.

 + - Module:handle_event(Event, State) -> Result - Handle an event. + Module:format_status(Opt, [PDict, State]) -> Status + Optional function for providing a term describing the + current event handler state. - Event = term() + Opt = normal | terminate + PDict = [{Key, Value}] State = term() - Result = {ok,NewState} | {ok,NewState,hibernate} -   | {swap_handler,Args1,NewState,Handler2,Args2} | remove_handler -  NewState = term() -  Args1 = Args2 = term() -  Handler2 = Module2 | {Module2,Id} -   Module2 = atom() -   Id = term() + Status = term() -

Whenever an event manager receives an event sent using - gen_event:notify/2 or gen_event:sync_notify/2, this - function is called for each installed event handler to handle - the event.

-

Event is the Event argument of - notify/sync_notify.

+ +

This callback is optional, so event handler modules need + not export it. If a handler does not export this function, + the gen_event module uses the handler state directly for + the purposes described below.

+ +

This function is called by a gen_event process in the + following situations:

+ + One of + sys:get_status/1,2 + is invoked to get the gen_event status. Opt is set + to the atom normal for this case. + The event handler terminates abnormally and gen_event + logs an error. Opt is set to the + atom terminate for this case. + +

This function is useful for changing the form and + appearance of the event handler state for these cases. An + event handler callback module wishing to change the + the sys:get_status/1,2 return value as well as how + its state appears in termination error logs, exports an + instance of format_status/2 that returns a term + describing the current state of the event handler.

+

PDict is the current value of the + process dictionary of gen_event.

State is the internal state of the event handler.

-

If the function returns {ok,NewState} or {ok,NewState,hibernate} - the event handler - will remain in the event manager with the possible updated - internal state NewState.

-

If {ok,NewState,hibernate} is returned, the event - manager will also go into hibernation (by calling proc_lib:hibernate/3), - waiting for the next event to occur. It is sufficient that one of the event - handlers return {ok,NewState,hibernate} for the whole event manager - process to hibernate.

-

If the function returns - {swap_handler,Args1,NewState,Handler2,Args2} the event - handler will be replaced by Handler2 by first calling - Module:terminate(Args1,NewState) and then - Module2:init({Args2,Term}) where Term is the return - value of Module:terminate/2. - See gen_event:swap_handler/3 for more information.

-

If the function returns remove_handler the event handler - will be deleted by calling - Module:terminate(remove_handler,State).

+

The function is to return Status, a term that + change the details of the current state of the event + handler. Any term is allowed for Status. The + gen_event module uses Status as follows:

+ +

When sys:get_status/1,2 is called, gen_event + ensures that its return value contains Status in + place of the state term of the event handler.

 +

When an event handler terminates abnormally, gen_event + logs Status in place of the state term of the + event handler.

 + +

One use for this function is to return compact alternative + state representations to avoid that large state terms + are printed in log files.

 + Module:handle_call(Request, State) -> Result Handle a synchronous request. @@ -594,15 +662,77 @@ gen_event:stop -----> Module:terminate/2

Whenever an event manager receives a request sent using - gen_event:call/3,4, this function is called for + call/3,4, + this function is called for the specified event handler to handle the request.

-

Request is the Request argument of call.

+

Request is the Request argument of call/3,4.

+

State is the internal state of the event handler.

+

The return values are the same as for + + Module:handle_event/2 + except that they also contain a term Reply, which is the reply + to the client as the return value of call/3,4.

+ + + + + Module:handle_event(Event, State) -> Result + Handle an event. + + Event = term() + State = term() + Result = {ok,NewState} | {ok,NewState,hibernate} +   | {swap_handler,Args1,NewState,Handler2,Args2} + | remove_handler +  NewState = term() +  Args1 = Args2 = term() +  Handler2 = Module2 | {Module2,Id} +   Module2 = atom() +   Id = term() + + +

Whenever an event manager receives an event sent using + notify/2 or + sync_notify/2, + this function is called for each installed event handler to handle + the event.

+

Event is the Event argument of + notify/2/sync_notify/2.

State is the internal state of the event handler.

-

The return values are the same as for handle_event/2 - except they also contain a term Reply which is the reply - given back to the client as the return value of call.

+ + +

If {ok,NewState} or {ok,NewState,hibernate} + is returned, the event handler + remains in the event manager with the possible updated + internal state NewState.

+ + +

If {ok,NewState,hibernate} is returned, the event + manager also goes into hibernation (by calling + + proc_lib:hibernate/3), waiting for the next + event to occur. It is sufficient that one of the + event handlers return {ok,NewState,hibernate} for the + whole event manager process to hibernate.

+ + +

If {swap_handler,Args1,NewState,Handler2,Args2} is + returned, the event handler is replaced by Handler2 by + first calling Module:terminate(Args1,NewState) and then + Module2:init({Args2,Term}), where Term is the return + value of Module:terminate/2. For more information, see + swap_handler/3. +

+ + +

If remove_handler is returned, the event handler is + deleted by calling + Module:terminate(remove_handler,State).

+ + + Module:handle_info(Info, State) -> Result Handle an incoming message. @@ -610,7 +740,8 @@ gen_event:stop -----> Module:terminate/2 Info = term() State = term() Result = {ok,NewState} | {ok,NewState,hibernate} -  | {swap_handler,Args1,NewState,Handler2,Args2} | remove_handler +  | {swap_handler,Args1,NewState,Handler2,Args2} + | remove_handler  NewState = term()  Args1 = Args2 = term()  Handler2 = Module2 | {Module2,Id} @@ -622,10 +753,49 @@ gen_event:stop -----> Module:terminate/2 an event manager receives any other message than an event or a synchronous request (or a system message).

Info is the received message.

-

See Module:handle_event/2 for a description of State - and possible return values.

+

For a description of State and possible return values, see + + Module:handle_event/2.

+ + + + + Module:init(InitArgs) -> {ok,State} | {ok,State,hibernate} | {error,Reason} + Initialize an event handler. + + InitArgs = Args | {Args,Term} +  Args = Term = term() + State = term() + Reason = term() + + +

Whenever a new event handler is added to an event manager, + this function is called to initialize the event handler.

+

If the event handler is added because of a call to + add_handler/3 or + + add_sup_handler/3, InitArgs is + the Args argument of these functions.

+

If the event handler replaces another event handler because of + a call to + swap_handler/3 or + + swap_sup_handler/3, or because of a swap + return tuple from one of the other callback functions, + InitArgs is a tuple {Args,Term}, where Args is + the argument provided in the function call/return tuple and + Term is the result of terminating the old event handler, see + swap_handler/3.

+

If successful, the function returns {ok,State} + or {ok,State,hibernate}, where State is the + initial internal state of the event handler.

+

If {ok,State,hibernate} is returned, the event + manager goes into hibernation (by calling proc_lib:hibernate/3), + waiting for the next event to occur.

 + Module:terminate(Arg, State) -> term() Clean up before deletion. @@ -636,22 +806,25 @@ gen_event:stop -----> Module:terminate/2

Whenever an event handler is deleted from an event manager, - this function is called. It should be the opposite of - Module:init/1 and do any necessary cleaning up.

-

If the event handler is deleted due to a call to - gen_event:delete_handler, gen_event:swap_handler/3 - or gen_event:swap_sup_handler/3, Arg is + this function is called. It is to be the opposite of + Module:init/1 + and do any necessary cleaning up.

+

If the event handler is deleted because of a call to + delete_handler/3, + swap_handler/3, or + + swap_sup_handler/3, Arg is the Args argument of this function call.

Arg={stop,Reason} if the event handler has a supervised - connection to a process which has terminated with reason + connection to a process that has terminated with reason Reason.

Arg=stop if the event handler is deleted because the event manager is terminating.

-

The event manager will terminate if it is part of a supervision - tree and it is ordered by its supervisor to terminate. - Even if it is not part of a supervision tree, it will - terminate if it receives an 'EXIT' message from - its parent.

+

The event manager terminates if it is part of a supervision + tree and it is ordered by its supervisor to terminate. + Even if it is not part of a supervision tree, it + terminates if it receives an 'EXIT' message from + its parent.

Arg=remove_handler if the event handler is deleted because another callback function has returned remove_handler or {remove_handler,Reply}.

@@ -660,104 +833,20 @@ gen_event:stop -----> Module:terminate/2 or Arg={error,{'EXIT',Reason}} if a callback function failed.

State is the internal state of the event handler.

-

The function may return any term. If the event handler is - deleted due to a call to gen_event:delete_handler, - the return value of that function will be the return value of this +

The function can return any term. If the event handler is + deleted because of a call to gen_event:delete_handler/3, + the return value of that function becomes the return value of this function. If the event handler is to be replaced with another event - handler due to a swap, the return value will be passed to + handler because of a swap, the return value is passed to the init function of the new event handler. Otherwise the return value is ignored.

 - - Module:code_change(OldVsn, State, Extra) -> {ok, NewState} - Update the internal state during upgrade/downgrade. - - OldVsn = Vsn | {down, Vsn} -   Vsn = term() - State = NewState = term() - Extra = term() - - -

This function is called for an installed event handler which - should update its internal state during a release - upgrade/downgrade, i.e. when the instruction - {update,Module,Change,...} where - Change={advanced,Extra} is given in the .appup - file. See OTP Design Principles for more - information.

-

In the case of an upgrade, OldVsn is Vsn, and - in the case of a downgrade, OldVsn is - {down,Vsn}. Vsn is defined by the vsn - attribute(s) of the old version of the callback module - Module. If no such attribute is defined, the version - is the checksum of the BEAM file.

-

State is the internal state of the event handler.

-

Extra is passed as-is from the {advanced,Extra} - part of the update instruction.

-

The function should return the updated internal state.

- - - - Module:format_status(Opt, [PDict, State]) -> Status - Optional function for providing a term describing the - current event handler state. - - Opt = normal | terminate - PDict = [{Key, Value}] - State = term() - Status = term() - - - -

This callback is optional, so event handler modules need - not export it. If a handler does not export this function, - the gen_event module uses the handler state directly for - the purposes described below.

- -

This function is called by a gen_event process when:

- - One - of sys:get_status/1,2 - is invoked to get the gen_event status. Opt is set - to the atom normal for this case. - The event handler terminates abnormally and gen_event - logs an error. Opt is set to the - atom terminate for this case. - -

This function is useful for customising the form and - appearance of the event handler state for these cases. An - event handler callback module wishing to customise - the sys:get_status/1,2 return value as well as how - its state appears in termination error logs exports an - instance of format_status/2 that returns a term - describing the current state of the event handler.

-

PDict is the current value of the gen_event's - process dictionary.

-

State is the internal state of the event - handler.

-

The function should return Status, a term that - customises the details of the current state of the event - handler. Any term is allowed for Status. The - gen_event module uses Status as follows:

- - When sys:get_status/1,2 is called, gen_event - ensures that its return value contains Status in - place of the event handler's actual state term. - When an event handler terminates abnormally, gen_event - logs Status in place of the event handler's actual - state term. - -

One use for this function is to return compact alternative - state representations to avoid having large state terms - printed in logfiles.

- -
- SEE ALSO -

supervisor(3), - sys(3)

+ See Also +

supervisor(3), + sys(3)

 diff --git a/lib/stdlib/doc/src/gen_fsm.xml b/lib/stdlib/doc/src/gen_fsm.xml index 835e252704..de06987d38 100644 --- a/lib/stdlib/doc/src/gen_fsm.xml +++ b/lib/stdlib/doc/src/gen_fsm.xml @@ -29,29 +29,30 @@
gen_fsm - Generic Finite State Machine Behaviour + Generic finite state machine behavior.

There is a new behaviour gen_statem that is intended to replace gen_fsm for new code. - It has the same features and add some really useful. - This module will not be removed for the foreseeable future + gen_fsm will not be removed for the foreseeable future to keep old state machine implementations running.

-

A behaviour module for implementing a finite state machine. - A generic finite state machine process (gen_fsm) implemented - using this module will have a standard set of interface functions - and include functionality for tracing and error reporting. It will - also fit into an OTP supervision tree. Refer to - OTP Design Principles for more information. +

This behavior module provides a finite state machine. + A generic finite state machine process (gen_fsm) implemented + using this module has a standard set of interface functions + and includes functionality for tracing and error reporting. It + also fits into an OTP supervision tree. For more information, see + OTP Design Principles.

-

A gen_fsm assumes all specific parts to be located in a callback - module exporting a pre-defined set of functions. The relationship - between the behaviour functions and the callback functions can be - illustrated as follows:

+ +

A gen_fsm process assumes all specific parts to be located in a + callback module exporting a predefined set of functions. The relationship + between the behavior functions and the callback functions is as + follows:

+ 
 gen_fsm module                    Callback module
 --------------                    ---------------
@@ -73,34 +74,261 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4
 -                                 -----> Module:terminate/3
 
 -                                 -----> Module:code_change/4
-

If a callback function fails or returns a bad value, the gen_fsm - will terminate.

-

A gen_fsm handles system messages as documented in - sys(3). The sys module - can be used for debugging a gen_fsm.

-

Note that a gen_fsm does not trap exit signals automatically, - this must be explicitly initiated in the callback module.

+ +

If a callback function fails or returns a bad value, the gen_fsm + process terminates.

+ +

A gen_fsm process handles system messages as described in + sys(3). The sys module + can be used for debugging a gen_fsm process.

+ +

Notice that a gen_fsm process does not trap exit signals + automatically, this must be explicitly initiated in the callback + module.

+

Unless otherwise stated, all functions in this module fail if - the specified gen_fsm does not exist or if bad arguments are - given.

-

The gen_fsm process can go into hibernation - (see erlang(3)) if a callback - function specifies 'hibernate' instead of a timeout value. This - might be useful if the server is expected to be idle for a long - time. However this feature should be used with care as hibernation - implies at least two garbage collections (when hibernating and - shortly after waking up) and is not something you'd want to do - between each call to a busy state machine.

+ the specified gen_fsm process does not exist or if bad arguments + are specified.

+

The gen_fsm process can go into hibernation + (see + erlang:hibernate/3) if a callback function + specifies 'hibernate' instead of a time-out value. This + can be useful if the server is expected to be idle for a long + time. However, use this feature with care, as hibernation + implies at least two garbage collections (when hibernating and + shortly after waking up) and is not something you want to do + between each call to a busy state machine.

 + + + cancel_timer(Ref) -> RemainingTime | false + Cancel an internal timer in a generic FSM. + + Ref = reference() + RemainingTime = integer() + + +

Cancels an internal timer referred by Ref in the + gen_fsm process that calls this function.

+

Ref is a reference returned from + + send_event_after/2 or + start_timer/2.

+

If the timer has already timed out, but the event not yet + been delivered, it is cancelled as if it had not + timed out, so there is no false timer event after + returning from this function.

+

Returns the remaining time in milliseconds until the timer would + have expired if Ref referred to an active timer, otherwise + false.

+ + + + + enter_loop(Module, Options, StateName, StateData) + enter_loop(Module, Options, StateName, StateData, FsmName) + enter_loop(Module, Options, StateName, StateData, Timeout) + enter_loop(Module, Options, StateName, StateData, FsmName, Timeout) + Enter the gen_fsm receive loop. + + Module = atom() + Options = [Option] +  Option = {debug,Dbgs} +   Dbgs = [Dbg] +    Dbg = trace | log | statistics +     | {log_to_file,FileName} | {install,{Func,FuncState}} + StateName = atom() + StateData = term() + FsmName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Timeout = int() | infinity + + +

Makes an existing process into a gen_fsm process. + Does not return, + instead the calling process enters the gen_fsm receive + loop and becomes a gen_fsm process. The process must + have been started using one of the start functions in + proc_lib(3). The user is + responsible for any initialization of the process, including + registering a name for it.

+

This function is useful when a more complex initialization + procedure is needed than the gen_fsm behavior provides.

+

Module, Options, and FsmName have + the same meanings as when calling + start[_link]/3,4. + However, if FsmName is specified, the process must have + been registered accordingly before this function is + called.

+

StateName, StateData, and Timeout have + the same meanings as in the return value of + Module:init/1. + The callback module Module does not need to + export an init/1 function.

+

The function fails if the calling process was not started by a + proc_lib start function, or if it is not registered + according to FsmName.

+ + + + + reply(Caller, Reply) -> Result + Send a reply to a caller. + + Caller - see below + Reply = term() + Result = term() + + +

This function can be used by a gen_fsm process to + explicitly send a reply to a client process that called + + sync_send_event/2,3 or + + sync_send_all_state_event/2,3 + when the reply cannot be defined in the return value of + + Module:StateName/3 or + + Module:handle_sync_event/4.

+

Caller must be the From argument provided to + the callback function. Reply is any term + given back to the client as the return value of + sync_send_event/2,3 or + sync_send_all_state_event/2,3.

+

Return value Result is not further defined, and + is always to be ignored.

+ + + + + send_all_state_event(FsmRef, Event) -> ok + Send an event asynchronously to a generic FSM. + + FsmRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid() +  Name = Node = atom() +  GlobalName = ViaName = term() + Event = term() + + +

Sends an event asynchronously to the FsmRef of the + gen_fsm process and returns ok immediately. + The gen_fsm process calls + + Module:handle_event/3 to handle the event.

+

For a description of the arguments, see + send_event/2.

+

The difference between send_event/2 and + send_all_state_event/2 is which callback function is + used to handle the event. This function is useful when + sending events that are handled the same way in every state, + as only one handle_event clause is needed to handle + the event instead of one clause in each state name function.

+ + + + + send_event(FsmRef, Event) -> ok + Send an event asynchronously to a generic FSM. + + FsmRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid() +  Name = Node = atom() +  GlobalName = ViaName = term() + Event = term() + + +

Sends an event asynchronously to the FsmRef of the + gen_fsm process + and returns ok immediately. The gen_fsm process calls + + Module:StateName/2 to handle the event, where + StateName is the name of the current state of + the gen_fsm process.

+

FsmRef can be any of the following:

+ + The pid + Name, if the gen_fsm process is locally + registered + {Name,Node}, if the gen_fsm process is locally + registered at another node + {global,GlobalName}, if the gen_fsm process is + globally registered + {via,Module,ViaName}, if the gen_fsm process is + registered through an alternative process registry + +

Event is any term that is passed as one of + the arguments to Module:StateName/2.

+ + + + + send_event_after(Time, Event) -> Ref + Send a delayed event internally in a generic FSM. + + Time = integer() + Event = term() + Ref = reference() + + +

Sends a delayed event internally in the gen_fsm process + that calls this function after Time milliseconds. + Returns immediately a + reference that can be used to cancel the delayed send using + cancel_timer/1.

+

The gen_fsm process calls + + Module:StateName/2 to handle + the event, where StateName is the name of the current + state of the gen_fsm process at the time the delayed event is + delivered.

+

Event is any term that is passed as one of + the arguments to Module:StateName/2.

+ + + + + start(Module, Args, Options) -> Result + start(FsmName, Module, Args, Options) -> Result + Create a standalone gen_fsm process. + + FsmName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Module = atom() + Args = term() + Options = [Option] +  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} +   Dbgs = [Dbg] +    Dbg = trace | log | statistics +     | {log_to_file,FileName} | {install,{Func,FuncState}} +   SOpts = [term()] + Result = {ok,Pid} | ignore | {error,Error} +  Pid = pid() +  Error = {already_started,Pid} | term() + + +

Creates a standalone gen_fsm process, that is, a process that + is not part of a supervision tree and thus has no supervisor.

+

For a description of arguments and return values, see + start_link/3,4.

+ + + start_link(Module, Args, Options) -> Result start_link(FsmName, Module, Args, Options) -> Result - Create a gen_fsm process in a supervision tree. + Create a gen_fsm process in a supervision tree. + - FsmName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} + FsmName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName}  Name = atom()  GlobalName = ViaName = term() Module = atom() @@ -117,54 +345,64 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4  Error = {already_started,Pid} | term() -

Creates a gen_fsm process as part of a supervision tree. - The function should be called, directly or indirectly, by - the supervisor. It will, among other things, ensure that - the gen_fsm is linked to the supervisor.

-

The gen_fsm process calls Module:init/1 to - initialize. To ensure a synchronized start-up procedure, +

Creates a gen_fsm process as part of a supervision tree. + The function is to be called, directly or indirectly, by + the supervisor. For example, it ensures that + the gen_fsm process is linked to the supervisor.

+

The gen_fsm process calls + Module:init/1 to + initialize. To ensure a synchronized startup procedure, start_link/3,4 does not return until Module:init/1 has returned.

-

If FsmName={local,Name}, the gen_fsm is registered - locally as Name using register/2. - If FsmName={global,GlobalName}, the gen_fsm is - registered globally as GlobalName using - global:register_name/2. - If FsmName={via,Module,ViaName}, the gen_fsm will - register with the registry represented by Module. - The Module callback should export the functions - register_name/2, unregister_name/1, - whereis_name/1 and send/2, which should behave like the - corresponding functions in global. Thus, - {via,global,GlobalName} is a valid reference.

-

If no name is provided, - the gen_fsm is not registered.

+ + +

If FsmName={local,Name}, the gen_fsm process is + registered locally as Name using register/2.

+ + +

If FsmName={global,GlobalName}, the gen_fsm process + is registered globally as GlobalName using + + global:register_name/2.

+ + +

If FsmName={via,Module,ViaName}, the gen_fsm + process registers with the registry represented by Module. + The Module callback is to export the functions + register_name/2, unregister_name/1, + whereis_name/1, and send/2, which are to behave + like the corresponding functions in + global. + Thus, {via,global,GlobalName} is a valid reference.

+ + +

If no name is provided, the gen_fsm process is not + registered.

Module is the name of the callback module.

-

Args is an arbitrary term which is passed as +

Args is any term that is passed as the argument to Module:init/1.

-

If the option {timeout,Time} is present, the gen_fsm - is allowed to spend Time milliseconds initializing - or it will be terminated and the start function will return +

If option {timeout,Time} is present, the gen_fsm + process is allowed to spend Time milliseconds initializing + or it terminates and the start function returns {error,timeout}.

-

If the option {debug,Dbgs} is present, - the corresponding sys function will be called for each - item in Dbgs. See - sys(3).

-

If the option {spawn_opt,SOpts} is present, - SOpts will be passed as option list to - the spawn_opt BIF which is used to spawn the gen_fsm - process. See - erlang(3).

+

If option {debug,Dbgs} is present, the corresponding + sys function is called for each item in Dbgs; see + sys(3).

+

If option {spawn_opt,SOpts} is present, SOpts is + passed as option list to the spawn_opt BIF that is used to + spawn the gen_fsm process; see + + spawn_opt/2.

-

Using the spawn option monitor is currently not - allowed, but will cause the function to fail with reason +

Using spawn option monitor is not + allowed, it causes the function to fail with reason badarg.

 -

If the gen_fsm is successfully created and initialized - the function returns {ok,Pid}, where Pid is - the pid of the gen_fsm. If there already exists a process with - the specified FsmName, the function returns - {error,{already_started,Pid}} where Pid is +

If the gen_fsm process is successfully created and + initialized, the function returns {ok,Pid}, where Pid + is the pid of the gen_fsm process. If a process with the + specified FsmName exists already, the function returns + {error,{already_started,Pid}}, where Pid is the pid of that process.

If Module:init/1 fails with Reason, the function returns {error,Reason}. If @@ -173,129 +411,106 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 returns {error,Reason} or ignore, respectively.

 + - start(Module, Args, Options) -> Result - start(FsmName, Module, Args, Options) -> Result - Create a stand-alone gen_fsm process. + start_timer(Time, Msg) -> Ref + Send a time-out event internally in a generic FSM. - FsmName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Module = atom() - Args = term() - Options = [Option] -  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} -   Dbgs = [Dbg] -    Dbg = trace | log | statistics -     | {log_to_file,FileName} | {install,{Func,FuncState}} -   SOpts = [term()] - Result = {ok,Pid} | ignore | {error,Error} -  Pid = pid() -  Error = {already_started,Pid} | term() + Time = integer() + Msg = term() + Ref = reference() -

Creates a stand-alone gen_fsm process, i.e. a gen_fsm which - is not part of a supervision tree and thus has no supervisor.

-

See start_link/3,4 - for a description of arguments and return values.

+

Sends a time-out event internally in the gen_fsm + process that calls this function after Time milliseconds. + Returns immediately a + reference that can be used to cancel the timer using + cancel_timer/1.

+

The gen_fsm process calls + + Module:StateName/2 to handle + the event, where StateName is the name of the current + state of the gen_fsm process at the time the time-out + message is delivered.

+

Msg is any term that is passed in the + time-out message, {timeout, Ref, Msg}, as one of + the arguments to Module:StateName/2.

 + stop(FsmRef) -> ok stop(FsmRef, Reason, Timeout) -> ok Synchronously stop a generic FSM. - FsmRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() + FsmRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid()  Node = atom()  GlobalName = ViaName = term() Reason = term() Timeout = int()>0 | infinity -

Orders a generic FSM to exit with the given Reason - and waits for it to terminate. The gen_fsm will call - Module:terminate/3 - before exiting.

-

The function returns ok if the generic FSM terminates - with the expected reason. Any other reason than normal, - shutdown, or {shutdown,Term} will cause an +

Orders a generic finite state machine to exit with the specified + Reason and waits for it to terminate. The gen_fsm + process calls + Module:terminate/3 before exiting.

+

The function returns ok if the generic finite state machine + terminates with the expected reason. Any other reason than + normal, shutdown, or {shutdown,Term} causes an error report to be issued using - error_logger:format/2. - The default Reason is normal.

-

Timeout is an integer greater than zero which + + error_logger:format/2. + The default Reason is normal.

+

Timeout is an integer greater than zero that specifies how many milliseconds to wait for the generic FSM to terminate, or the atom infinity to wait indefinitely. The default value is infinity. If the - generic FSM has not terminated within the specified time, a - timeout exception is raised.

-

If the process does not exist, a noproc exception - is raised.

- - - - send_event(FsmRef, Event) -> ok - Send an event asynchronously to a generic FSM. - - FsmRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() -  Name = Node = atom() -  GlobalName = ViaName = term() - Event = term() - - -

Sends an event asynchronously to the gen_fsm FsmRef - and returns ok immediately. The gen_fsm will call - Module:StateName/2 to handle the event, where - StateName is the name of the current state of - the gen_fsm.

-

FsmRef can be:

- - the pid, - Name, if the gen_fsm is locally registered, - {Name,Node}, if the gen_fsm is locally - registered at another node, or - {global,GlobalName}, if the gen_fsm is globally - registered. - {via,Module,ViaName}, if the gen_fsm is registered - through an alternative process registry. - -

Event is an arbitrary term which is passed as one of - the arguments to Module:StateName/2.

+ generic finite state machine has not terminated within the specified + time, a timeout exception is raised.

+

If the process does not exist, a noproc exception + is raised.

 + - send_all_state_event(FsmRef, Event) -> ok - Send an event asynchronously to a generic FSM. + sync_send_all_state_event(FsmRef, Event) -> Reply + sync_send_all_state_event(FsmRef, Event, Timeout) -> Reply + Send an event synchronously to a generic FSM. - FsmRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() + FsmRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid()  Name = Node = atom()  GlobalName = ViaName = term() Event = term() + Timeout = int()>0 | infinity + Reply = term() -

Sends an event asynchronously to the gen_fsm FsmRef - and returns ok immediately. The gen_fsm will call - Module:handle_event/3 to handle the event.

-

See send_event/2 - for a description of the arguments.

-

The difference between send_event and - send_all_state_event is which callback function is - used to handle the event. This function is useful when - sending events that are handled the same way in every state, - as only one handle_event clause is needed to handle - the event instead of one clause in each state name function.

+

Sends an event to the FsmRef of the gen_fsm + process and waits until a reply arrives or a time-out occurs. + The gen_fsm process calls + + Module:handle_sync_event/4 to handle the event.

+

For a description of FsmRef and Event, see + send_event/2. + For a description of Timeout and Reply, see + + sync_send_event/3.

+

For a discussion about the difference between + sync_send_event and sync_send_all_state_event, see + + send_all_state_event/2.

 + sync_send_event(FsmRef, Event) -> Reply sync_send_event(FsmRef, Event, Timeout) -> Reply Send an event synchronously to a generic FSM. - FsmRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() + FsmRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid()  Name = Node = atom()  GlobalName = ViaName = term() Event = term() @@ -303,210 +518,231 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 Reply = term() -

Sends an event to the gen_fsm FsmRef and waits until a - reply arrives or a timeout occurs. The gen_fsm will call - Module:StateName/3 to handle the event, where +

Sends an event to the FsmRef of the gen_fsm + process and waits until a reply arrives or a time-out occurs. + The gen_fsm process calls + + Module:StateName/3 to handle the event, where StateName is the name of the current state of - the gen_fsm.

-

See send_event/2 - for a description of FsmRef and Event.

-

Timeout is an integer greater than zero which + the gen_fsm process.

+

For a description of FsmRef and Event, see + send_event/2.

+

Timeout is an integer greater than zero that specifies how many milliseconds to wait for a reply, or - the atom infinity to wait indefinitely. Default value - is 5000. If no reply is received within the specified time, + the atom infinity to wait indefinitely. Defaults + to 5000. If no reply is received within the specified time, the function call fails.

-

The return value Reply is defined in the return value +

Return value Reply is defined in the return value of Module:StateName/3.

-

The ancient behaviour of sometimes consuming the server + +

The ancient behavior of sometimes consuming the server exit message if the server died during the call while - linked to the client has been removed in OTP R12B/Erlang 5.6.

+ linked to the client was removed in Erlang 5.6/OTP R12B.

+ + + +
+ Callback Functions +

The following functions are to be exported from a gen_fsm + callback module.

+ +

state name denotes a state of the state machine.

+ +

state data denotes the internal state of the Erlang process + that implements the state machine.

+
+ + - sync_send_all_state_event(FsmRef, Event) -> Reply - sync_send_all_state_event(FsmRef, Event, Timeout) -> Reply - Send an event synchronously to a generic FSM. + Module:code_change(OldVsn, StateName, StateData, Extra) -> {ok, NextStateName, NewStateData} + Update the internal state data during upgrade/downgrade. + - FsmRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() -  Name = Node = atom() -  GlobalName = ViaName = term() - Event = term() - Timeout = int()>0 | infinity - Reply = term() + OldVsn = Vsn | {down, Vsn} +   Vsn = term() + StateName = NextStateName = atom() + StateData = NewStateData = term() + Extra = term() -

Sends an event to the gen_fsm FsmRef and waits until a - reply arrives or a timeout occurs. The gen_fsm will call - Module:handle_sync_event/4 to handle the event.

-

See send_event/2 - for a description of FsmRef and Event. See - sync_send_event/3 - for a description of Timeout and Reply.

-

See - send_all_state_event/2 - for a discussion about the difference between - sync_send_event and sync_send_all_state_event.

+

This function is called by a gen_fsm process when it is to + update its internal state data during a release upgrade/downgrade, + that is, when instruction {update,Module,Change,...}, + where Change={advanced,Extra}, is given in + the appup file; see section + + Release Handling Instructions in OTP Design Principles.

+

For an upgrade, OldVsn is Vsn, and for a downgrade, + OldVsn is {down,Vsn}. Vsn is defined by the + vsn attribute(s) of the old version of the callback module + Module. If no such attribute is defined, the version is + the checksum of the Beam file.

+

StateName is the current state name and StateData the + internal state data of the gen_fsm process.

+

Extra is passed "as is" from the {advanced,Extra} + part of the update instruction.

+

The function is to return the new current state name and + updated internal data.

 + - reply(Caller, Reply) -> Result - Send a reply to a caller. + Module:format_status(Opt, [PDict, StateData]) -> Status + Optional function for providing a term describing the + current gen_fsm process status. - Caller - see below - Reply = term() - Result = term() + Opt = normal | terminate + PDict = [{Key, Value}] + StateData = term() + Status = term() -

This function can be used by a gen_fsm to explicitly send a - reply to a client process that called - sync_send_event/2,3 - or - sync_send_all_state_event/2,3, - when the reply cannot be defined in the return value of - Module:State/3 or Module:handle_sync_event/4.

-

Caller must be the From argument provided to - the callback function. Reply is an arbitrary term, - which will be given back to the client as the return value of - sync_send_event/2,3 or - sync_send_all_state_event/2,3.

-

The return value Result is not further defined, and - should always be ignored.

+ +

This callback is optional, so callback modules need not + export it. The gen_fsm module provides a default + implementation of this function that returns the callback + module state data.

+ +

This function is called by a gen_fsm process in the + following situations:

+ + One of + sys:get_status/1,2 + is invoked to get the gen_fsm status. Opt is set to + the atom normal for this case. + The gen_fsm process terminates abnormally and logs an + error. Opt is set to the atom terminate for + this case. + +

This function is useful for changing the form and + appearance of the gen_fsm status for these cases. A callback + module wishing to change the sys:get_status/1,2 + return value as well as how its status appears in + termination error logs, exports an instance + of format_status/2 that returns a term describing the + current status of the gen_fsm process.

+

PDict is the current value of the process dictionary of the + gen_fsm process.

+

StateData is the internal state data of the + gen_fsm process.

+

The function is to return Status, a term that + change the details of the current state and status of + the gen_fsm process. There are no restrictions on the + form Status can take, but for + the sys:get_status/1,2 case (when Opt + is normal), the recommended form for + the Status value is [{data, [{"StateData", + Term}]}], where Term provides relevant details of + the gen_fsm state data. Following this recommendation is not + required, but it makes the callback module status + consistent with the rest of the sys:get_status/1,2 + return value.

+

One use for this function is to return compact alternative + state data representations to avoid that large state terms + are printed in log files.

 + - send_event_after(Time, Event) -> Ref - Send a delayed event internally in a generic FSM. + Module:handle_event(Event, StateName, StateData) -> Result + Handle an asynchronous event. - Time = integer() Event = term() - Ref = reference() - - -

Sends a delayed event internally in the gen_fsm that calls - this function after Time ms. Returns immediately a - reference that can be used to cancel the delayed send using - cancel_timer/1.

-

The gen_fsm will call Module:StateName/2 to handle - the event, where StateName is the name of the current - state of the gen_fsm at the time the delayed event is - delivered.

-

Event is an arbitrary term which is passed as one of - the arguments to Module:StateName/2.

- - - - start_timer(Time, Msg) -> Ref - Send a timeout event internally in a generic FSM. - - Time = integer() - Msg = term() - Ref = reference() + StateName = atom() + StateData = term() + Result = {next_state,NextStateName,NewStateData} +   | {next_state,NextStateName,NewStateData,Timeout} +   | {next_state,NextStateName,NewStateData,hibernate} +   | {stop,Reason,NewStateData} +  NextStateName = atom() +  NewStateData = term() +  Timeout = int()>0 | infinity +  Reason = term() -

Sends a timeout event internally in the gen_fsm that calls - this function after Time ms. Returns immediately a - reference that can be used to cancel the timer using - cancel_timer/1.

-

The gen_fsm will call Module:StateName/2 to handle - the event, where StateName is the name of the current - state of the gen_fsm at the time the timeout message is - delivered.

-

Msg is an arbitrary term which is passed in the - timeout message, {timeout, Ref, Msg}, as one of - the arguments to Module:StateName/2.

+

Whenever a gen_fsm process receives an event sent using + + send_all_state_event/2, + this function is called to handle the event.

+

StateName is the current state name of the gen_fsm + process.

+

For a description of the other arguments and possible return values, + see + Module:StateName/2.

 + - cancel_timer(Ref) -> RemainingTime | false - Cancel an internal timer in a generic FSM. + Module:handle_info(Info, StateName, StateData) -> Result + Handle an incoming message. - Ref = reference() - RemainingTime = integer() + Info = term() + StateName = atom() + StateData = term() + Result = {next_state,NextStateName,NewStateData} +   | {next_state,NextStateName,NewStateData,Timeout} +   | {next_state,NextStateName,NewStateData,hibernate} +   | {stop,Reason,NewStateData} +  NextStateName = atom() +  NewStateData = term() +  Timeout = int()>0 | infinity +  Reason = normal | term() -

Cancels an internal timer referred by Ref in the - gen_fsm that calls this function.

-

Ref is a reference returned from - send_event_after/2 - or - start_timer/2.

-

If the timer has already timed out, but the event not yet - been delivered, it is cancelled as if it had not - timed out, so there will be no false timer event after - returning from this function.

-

Returns the remaining time in ms until the timer would - have expired if Ref referred to an active timer, - false otherwise.

+

This function is called by a gen_fsm process when it receives + any other message than a synchronous or asynchronous event (or a + system message).

+

Info is the received message.

+

For a description of the other arguments and possible return values, + see + Module:StateName/2.

 + - enter_loop(Module, Options, StateName, StateData) - enter_loop(Module, Options, StateName, StateData, FsmName) - enter_loop(Module, Options, StateName, StateData, Timeout) - enter_loop(Module, Options, StateName, StateData, FsmName, Timeout) - Enter the gen_fsm receive loop + Module:handle_sync_event(Event, From, StateName, StateData) -> Result + Handle a synchronous event. - Module = atom() - Options = [Option] -  Option = {debug,Dbgs} -   Dbgs = [Dbg] -    Dbg = trace | log | statistics -     | {log_to_file,FileName} | {install,{Func,FuncState}} + Event = term() + From = {pid(),Tag} StateName = atom() StateData = term() - FsmName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Timeout = int() | infinity + Result = {reply,Reply,NextStateName,NewStateData} +   | {reply,Reply,NextStateName,NewStateData,Timeout} +   | {reply,Reply,NextStateName,NewStateData,hibernate} +   | {next_state,NextStateName,NewStateData} +   | {next_state,NextStateName,NewStateData,Timeout} +   | {next_state,NextStateName,NewStateData,hibernate} +   | {stop,Reason,Reply,NewStateData} | {stop,Reason,NewStateData} +  Reply = term() +  NextStateName = atom() +  NewStateData = term() +  Timeout = int()>0 | infinity +  Reason = term() -

Makes an existing process into a gen_fsm. Does not return, - instead the calling process will enter the gen_fsm receive - loop and become a gen_fsm process. The process must - have been started using one of the start functions in - proc_lib, see - proc_lib(3). The user is - responsible for any initialization of the process, including - registering a name for it.

-

This function is useful when a more complex initialization - procedure is needed than the gen_fsm behaviour provides.

-

Module, Options and FsmName have - the same meanings as when calling - start[_link]/3,4. - However, if FsmName is specified, the process must have - been registered accordingly before this function is - called.

-

StateName, StateData and Timeout have - the same meanings as in the return value of - Module:init/1. - Also, the callback module Module does not need to - export an init/1 function.

-

Failure: If the calling process was not started by a - proc_lib start function, or if it is not registered - according to FsmName.

+

Whenever a gen_fsm process receives an event sent using + + sync_send_all_state_event/2,3, + this function is called to handle the event.

+

StateName is the current state name of the gen_fsm + process.

+

For a description of the other arguments and possible return values, + see + Module:StateName/3.

 - -
- CALLBACK FUNCTIONS -

The following functions should be exported from a gen_fsm - callback module.

-

In the description, the expression state name is used to - denote a state of the state machine. state data is used - to denote the internal state of the Erlang process which - implements the state machine.

-
- Module:init(Args) -> Result - Initialize process and internal state name and state data. + Initialize process and internal state name and state data. + Args = term() Result = {ok,StateName,StateData} | {ok,StateName,StateData,Timeout} -   | {ok,StateName,StateData,hibernate} +   | {ok,StateName,StateData,hibernate}   | {stop,Reason} | ignore  StateName = atom()  StateData = term() @@ -515,33 +751,36 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 -

Whenever a gen_fsm is started using - gen_fsm:start/3,4 or - gen_fsm:start_link/3,4, +

Whenever a gen_fsm process is started using + start/3,4 or + start_link/3,4, this function is called by the new process to initialize.

Args is the Args argument provided to the start function.

-

If initialization is successful, the function should return - {ok,StateName,StateData}, - {ok,StateName,StateData,Timeout} or {ok,StateName,StateData,hibernate}, - where StateName +

If initialization is successful, the function is to return + {ok,StateName,StateData}, + {ok,StateName,StateData,Timeout}, or + {ok,StateName,StateData,hibernate}, where StateName is the initial state name and StateData the initial - state data of the gen_fsm.

-

If an integer timeout value is provided, a timeout will occur + state data of the gen_fsm process.

+

If an integer time-out value is provided, a time-out occurs unless an event or a message is received within Timeout - milliseconds. A timeout is represented by the atom - timeout and should be handled by - the Module:StateName/2 callback functions. The atom + milliseconds. A time-out is represented by the atom + timeout and is to be handled by the + + Module:StateName/2 callback functions. The atom infinity can be used to wait indefinitely, this is the default value.

-

If hibernate is specified instead of a timeout value, the process will go - into hibernation when waiting for the next message to arrive (by calling - proc_lib:hibernate/3).

-

If something goes wrong during the initialization - the function should return {stop,Reason}, where - Reason is any term, or ignore.

+

If hibernate is specified instead of a time-out value, the + process goes into hibernation when waiting for the next message + to arrive (by calling + proc_lib:hibernate/3).

+

If the initialization fails, the function returns + {stop,Reason}, where Reason is any term, + or ignore.

 + Module:StateName(Event, StateData) -> Result Handle an asynchronous event. @@ -549,8 +788,8 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 Event = timeout | term() StateData = term() Result = {next_state,NextStateName,NewStateData} -   | {next_state,NextStateName,NewStateData,Timeout} -   | {next_state,NextStateName,NewStateData,hibernate} +   | {next_state,NextStateName,NewStateData,Timeout} +   | {next_state,NextStateName,NewStateData,hibernate}   | {stop,Reason,NewStateData}  NextStateName = atom()  NewStateData = term() @@ -558,56 +797,33 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4  Reason = term() -

There should be one instance of this function for each - possible state name. Whenever a gen_fsm receives an event - sent using - gen_fsm:send_event/2, +

There is to be one instance of this function for each + possible state name. Whenever a gen_fsm process receives + an event sent using + send_event/2, the instance of this function with the same name as the current state name StateName is called to handle - the event. It is also called if a timeout occurs.

-

Event is either the atom timeout, if a timeout + the event. It is also called if a time-out occurs.

+

Event is either the atom timeout, if a time-out has occurred, or the Event argument provided to send_event/2.

-

StateData is the state data of the gen_fsm.

+

StateData is the state data of the gen_fsm process.

If the function returns {next_state,NextStateName,NewStateData}, - {next_state,NextStateName,NewStateData,Timeout} or - {next_state,NextStateName,NewStateData,hibernate}, - the gen_fsm will continue executing with the current state + {next_state,NextStateName,NewStateData,Timeout}, or + {next_state,NextStateName,NewStateData,hibernate}, the + gen_fsm process continues executing with the current state name set to NextStateName and with the possibly - updated state data NewStateData. See - Module:init/1 for a description of Timeout and hibernate.

+ updated state data NewStateData. For a description of + Timeout and hibernate, see + Module:init/1.

If the function returns {stop,Reason,NewStateData}, - the gen_fsm will call + the gen_fsm process calls Module:terminate(Reason,StateName,NewStateData) and - terminate.

- - - - Module:handle_event(Event, StateName, StateData) -> Result - Handle an asynchronous event. - - Event = term() - StateName = atom() - StateData = term() - Result = {next_state,NextStateName,NewStateData} -   | {next_state,NextStateName,NewStateData,Timeout} -   | {next_state,NextStateName,NewStateData,hibernate} -   | {stop,Reason,NewStateData} -  NextStateName = atom() -  NewStateData = term() -  Timeout = int()>0 | infinity -  Reason = term() - - -

Whenever a gen_fsm receives an event sent using - gen_fsm:send_all_state_event/2, - this function is called to handle the event.

-

StateName is the current state name of the gen_fsm.

-

See Module:StateName/2 for a description of the other - arguments and possible return values.

+ terminates.

 + Module:StateName(Event, From, StateData) -> Result Handle a synchronous event. @@ -616,11 +832,11 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 From = {pid(),Tag} StateData = term() Result = {reply,Reply,NextStateName,NewStateData} -   | {reply,Reply,NextStateName,NewStateData,Timeout} -   | {reply,Reply,NextStateName,NewStateData,hibernate} +   | {reply,Reply,NextStateName,NewStateData,Timeout} +   | {reply,Reply,NextStateName,NewStateData,hibernate}   | {next_state,NextStateName,NewStateData} -   | {next_state,NextStateName,NewStateData,Timeout} -   | {next_state,NextStateName,NewStateData,hibernate} +   | {next_state,NextStateName,NewStateData,Timeout} +   | {next_state,NextStateName,NewStateData,hibernate}   | {stop,Reason,Reply,NewStateData} | {stop,Reason,NewStateData}  Reply = term()  NextStateName = atom() @@ -629,102 +845,56 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4  Reason = normal | term() -

There should be one instance of this function for each - possible state name. Whenever a gen_fsm receives an event - sent using - gen_fsm:sync_send_event/2,3, +

There is to be one instance of this function for each + possible state name. Whenever a gen_fsm process receives an + event sent using + sync_send_event/2,3, the instance of this function with the same name as the current state name StateName is called to handle the event.

Event is the Event argument provided to - sync_send_event.

+ sync_send_event/2,3.

From is a tuple {Pid,Tag} where Pid is - the pid of the process which called sync_send_event/2,3 + the pid of the process that called sync_send_event/2,3 and Tag is a unique tag.

-

StateData is the state data of the gen_fsm.

-

If the function returns - {reply,Reply,NextStateName,NewStateData}, - {reply,Reply,NextStateName,NewStateData,Timeout} or - {reply,Reply,NextStateName,NewStateData,hibernate}, - Reply will be given back to From as the return - value of sync_send_event/2,3. The gen_fsm then - continues executing with the current state name set to - NextStateName and with the possibly updated state data - NewStateData. See Module:init/1 for a - description of Timeout and hibernate.

-

If the function returns - {next_state,NextStateName,NewStateData}, - {next_state,NextStateName,NewStateData,Timeout} or - {next_state,NextStateName,NewStateData,hibernate}, - the gen_fsm will continue executing in NextStateName - with NewStateData. Any reply to From must be - given explicitly using - gen_fsm:reply/2.

-

If the function returns - {stop,Reason,Reply,NewStateData}, Reply will be - given back to From. If the function returns - {stop,Reason,NewStateData}, any reply to From - must be given explicitly using gen_fsm:reply/2. - The gen_fsm will then call - Module:terminate(Reason,StateName,NewStateData) and - terminate.

- - - - Module:handle_sync_event(Event, From, StateName, StateData) -> Result - Handle a synchronous event. - - Event = term() - From = {pid(),Tag} - StateName = atom() - StateData = term() - Result = {reply,Reply,NextStateName,NewStateData} -   | {reply,Reply,NextStateName,NewStateData,Timeout} -   | {reply,Reply,NextStateName,NewStateData,hibernate} -   | {next_state,NextStateName,NewStateData} -   | {next_state,NextStateName,NewStateData,Timeout} -   | {next_state,NextStateName,NewStateData,hibernate} -   | {stop,Reason,Reply,NewStateData} | {stop,Reason,NewStateData} -  Reply = term() -  NextStateName = atom() -  NewStateData = term() -  Timeout = int()>0 | infinity -  Reason = term() - - -

Whenever a gen_fsm receives an event sent using - gen_fsm:sync_send_all_state_event/2,3, - this function is called to handle the event.

-

StateName is the current state name of the gen_fsm.

-

See Module:StateName/3 for a description of the other - arguments and possible return values.

- - - - Module:handle_info(Info, StateName, StateData) -> Result - Handle an incoming message. - - Info = term() - StateName = atom() - StateData = term() - Result = {next_state,NextStateName,NewStateData} -   | {next_state,NextStateName,NewStateData,Timeout} -   | {next_state,NextStateName,NewStateData,hibernate} -   | {stop,Reason,NewStateData} -  NextStateName = atom() -  NewStateData = term() -  Timeout = int()>0 | infinity -  Reason = normal | term() - - -

This function is called by a gen_fsm when it receives any - other message than a synchronous or asynchronous event (or a - system message).

-

Info is the received message.

-

See Module:StateName/2 for a description of the other - arguments and possible return values.

+

StateData is the state data of the gen_fsm process.

+ + +

If {reply,Reply,NextStateName,NewStateData}, + {reply,Reply,NextStateName,NewStateData,Timeout}, or + {reply,Reply,NextStateName,NewStateData,hibernate} is + returned, Reply is given back to From as the return + value of sync_send_event/2,3. The gen_fsm process + then continues executing with the current state name set to + NextStateName and with the possibly updated state data + NewStateData. For a description of Timeout and + hibernate, see + + Module:init/1.

+ + +

If {next_state,NextStateName,NewStateData}, + {next_state,NextStateName,NewStateData,Timeout}, or + {next_state,NextStateName,NewStateData,hibernate} is + returned, the gen_fsm process continues executing in + NextStateName with NewStateData. + Any reply to From must be specified explicitly using + reply/2.

+ + +

If the function returns + {stop,Reason,Reply,NewStateData}, Reply is + given back to From. If the function returns + {stop,Reason,NewStateData}, any reply to From + must be specified explicitly using reply/2. + The gen_fsm process then calls + Module:terminate(Reason,StateName,NewStateData) and + terminates.

+ + + Module:terminate(Reason, StateName, StateData) Clean up before termination. @@ -734,134 +904,56 @@ gen_fsm:sync_send_all_state_event -----> Module:handle_sync_event/4 StateData = term() -

This function is called by a gen_fsm when it is about to - terminate. It should be the opposite of Module:init/1 - and do any necessary cleaning up. When it returns, the gen_fsm - terminates with Reason. The return value is ignored.

+

This function is called by a gen_fsm process when it is about + to terminate. It is to be the opposite of + Module:init/1 + and do any necessary cleaning up. When it returns, the gen_fsm + process terminates with Reason. The return value is ignored. +

Reason is a term denoting the stop reason, StateName is the current state name, and - StateData is the state data of the gen_fsm.

-

Reason depends on why the gen_fsm is terminating. If + StateData is the state data of the gen_fsm process.

+

Reason depends on why the gen_fsm process is + terminating. If it is because another callback function has returned a stop - tuple {stop,..}, Reason will have the value - specified in that tuple. If it is due to a failure, + tuple {stop,..}, Reason has the value + specified in that tuple. If it is because of a failure, Reason is the error reason.

-

If the gen_fsm is part of a supervision tree and is ordered - by its supervisor to terminate, this function will be called +

If the gen_fsm process is part of a supervision tree and is + ordered by its supervisor to terminate, this function is called with Reason=shutdown if the following conditions apply:

- the gen_fsm has been set to trap exit signals, and - the shutdown strategy as defined in the supervisor's - child specification is an integer timeout value, not - brutal_kill. + +

The gen_fsm process has been set to trap exit signals.

+ + +

The shutdown strategy as defined in the child specification of + the supervisor is an integer time-out value, not + brutal_kill.

+ -

Even if the gen_fsm is not part of a supervision tree, - this function will be called if it receives an 'EXIT' - message from its parent. Reason will be the same as in - the 'EXIT' message.

-

Otherwise, the gen_fsm will be immediately terminated.

-

Note that for any other reason than normal, - shutdown, or {shutdown,Term} the gen_fsm is - assumed to terminate due to an error and - an error report is issued using - error_logger:format/2.

- - - - Module:code_change(OldVsn, StateName, StateData, Extra) -> {ok, NextStateName, NewStateData} - Update the internal state data during upgrade/downgrade. - - OldVsn = Vsn | {down, Vsn} -   Vsn = term() - StateName = NextStateName = atom() - StateData = NewStateData = term() - Extra = term() - - -

This function is called by a gen_fsm when it should update - its internal state data during a release upgrade/downgrade, - i.e. when the instruction {update,Module,Change,...} - where Change={advanced,Extra} is given in - the appup file. See - OTP Design Principles.

-

In the case of an upgrade, OldVsn is Vsn, and - in the case of a downgrade, OldVsn is - {down,Vsn}. Vsn is defined by the vsn - attribute(s) of the old version of the callback module - Module. If no such attribute is defined, the version is - the checksum of the BEAM file.

-

StateName is the current state name and - StateData the internal state data of the gen_fsm.

-

Extra is passed as-is from the {advanced,Extra} - part of the update instruction.

-

The function should return the new current state name and - updated internal data.

- - - - Module:format_status(Opt, [PDict, StateData]) -> Status - Optional function for providing a term describing the - current gen_fsm status. - - Opt = normal | terminate - PDict = [{Key, Value}] - StateData = term() - Status = term() - - - -

This callback is optional, so callback modules need not - export it. The gen_fsm module provides a default - implementation of this function that returns the callback - module state data.

- -

This function is called by a gen_fsm process when:

- - One - of sys:get_status/1,2 - is invoked to get the gen_fsm status. Opt is set to - the atom normal for this case. - The gen_fsm terminates abnormally and logs an - error. Opt is set to the atom terminate for - this case. - -

This function is useful for customising the form and - appearance of the gen_fsm status for these cases. A callback - module wishing to customise the sys:get_status/1,2 - return value as well as how its status appears in - termination error logs exports an instance - of format_status/2 that returns a term describing the - current status of the gen_fsm.

-

PDict is the current value of the gen_fsm's - process dictionary.

-

StateData is the internal state data of the - gen_fsm.

-

The function should return Status, a term that - customises the details of the current state and status of - the gen_fsm. There are no restrictions on the - form Status can take, but for - the sys:get_status/1,2 case (when Opt - is normal), the recommended form for - the Status value is [{data, [{"StateData", - Term}]}] where Term provides relevant details of - the gen_fsm state data. Following this recommendation isn't - required, but doing so will make the callback module status - consistent with the rest of the sys:get_status/1,2 - return value.

-

One use for this function is to return compact alternative - state data representations to avoid having large state terms - printed in logfiles.

+

Even if the gen_fsm process is not part of a + supervision tree, + this function is called if it receives an 'EXIT' + message from its parent. Reason is the same as in + the 'EXIT' message.

+

Otherwise, the gen_fsm process terminates immediately.

+

Notice that for any other reason than normal, + shutdown, or {shutdown,Term} the gen_fsm process + is assumed to terminate because of an error and an error report is + issued using + error_logger:format/2.
- SEE ALSO -

gen_event(3), - gen_server(3), - gen_statem(3), - supervisor(3), - proc_lib(3), - sys(3)

+ See Also +

gen_event(3), + gen_server(3), + gen_statem(3), + proc_lib(3), + supervisor(3), + sys(3)

 diff --git a/lib/stdlib/doc/src/gen_server.xml b/lib/stdlib/doc/src/gen_server.xml index 10dc978afc..4a7dd60858 100644 --- a/lib/stdlib/doc/src/gen_server.xml +++ b/lib/stdlib/doc/src/gen_server.xml @@ -29,18 +29,21 @@
gen_server - Generic Server Behaviour + Generic server behavior. -

A behaviour module for implementing the server of a client-server - relation. A generic server process (gen_server) implemented using - this module will have a standard set of interface functions and - include functionality for tracing and error reporting. It will - also fit into an OTP supervision tree. Refer to - OTP Design Principles for more information.

-

A gen_server assumes all specific parts to be located in a - callback module exporting a pre-defined set of functions. - The relationship between the behaviour functions and the callback - functions can be illustrated as follows:

+

This behavior module provides the server of a client-server + relation. A generic server process (gen_server) implemented using + this module has a standard set of interface functions and + includes functionality for tracing and error reporting. It also + fits into an OTP supervision tree. For more information, see section + + gen_server Behaviour in OTP Design Principles.

+ +

A gen_server process assumes all specific parts to be located in + a callback module exporting a predefined set of functions. + The relationship between the behavior functions and the callback + functions is as follows:

+ 
 gen_server module            Callback module
 -----------------            ---------------
@@ -59,175 +62,65 @@ gen_server:abcast     -----> Module:handle_cast/2
 
 -                     -----> Module:terminate/2
 
--                     -----> Module:code_change/3
-

If a callback function fails or returns a bad value, - the gen_server will terminate.

-

A gen_server handles system messages as documented in - sys(3). The sys module - can be used for debugging a gen_server.

-

Note that a gen_server does not trap exit signals automatically, - this must be explicitly initiated in the callback module.

+- -----> Module:code_change/3 + +

If a callback function fails or returns a bad value, the + gen_server process terminates.

+ +

A gen_server process handles system messages as described in + sys(3). The sys module + can be used for debugging a gen_server process.

+ +

Notice that a gen_server process does not trap exit signals + automatically, this must be explicitly initiated in the callback + module.

+

Unless otherwise stated, all functions in this module fail if - the specified gen_server does not exist or if bad arguments are - given.

- -

The gen_server process can go into hibernation - (see erlang(3)) if a callback - function specifies 'hibernate' instead of a timeout value. This - might be useful if the server is expected to be idle for a long - time. However this feature should be used with care as hibernation - implies at least two garbage collections (when hibernating and - shortly after waking up) and is not something you'd want to do - between each call to a busy server.

+ the specified gen_server process does not exist or if bad + arguments are specified.

+

The gen_server process can go into hibernation + (see + erlang:hibernate/3) if a callback + function specifies 'hibernate' instead of a time-out value. This + can be useful if the server is expected to be idle for a long + time. However, use this feature with care, as hibernation + implies at least two garbage collections (when hibernating and + shortly after waking up) and is not something you want to do + between each call to a busy server.

 + - start_link(Module, Args, Options) -> Result - start_link(ServerName, Module, Args, Options) -> Result - Create a gen_server process in a supervision tree. - - ServerName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Module = atom() - Args = term() - Options = [Option] -  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} -   Dbgs = [Dbg] -    Dbg = trace | log | statistics | {log_to_file,FileName} | {install,{Func,FuncState}} -   SOpts = [term()] - Result = {ok,Pid} | ignore | {error,Error} -  Pid = pid() -  Error = {already_started,Pid} | term() - - -

Creates a gen_server process as part of a supervision tree. - The function should be called, directly or indirectly, by - the supervisor. It will, among other things, ensure that - the gen_server is linked to the supervisor.

-

The gen_server process calls Module:init/1 to - initialize. To ensure a synchronized start-up procedure, - start_link/3,4 does not return until - Module:init/1 has returned.

-

If ServerName={local,Name} the gen_server is - registered locally as Name using register/2. - If ServerName={global,GlobalName} the gen_server is - registered globally as GlobalName using - global:register_name/2. If no name is provided, - the gen_server is not registered. - If ServerName={via,Module,ViaName}, the gen_server will - register with the registry represented by Module. - The Module callback should export the functions - register_name/2, unregister_name/1, - whereis_name/1 and send/2, which should behave like the - corresponding functions in global. Thus, - {via,global,GlobalName} is a valid reference.

-

Module is the name of the callback module.

-

Args is an arbitrary term which is passed as - the argument to Module:init/1.

-

If the option {timeout,Time} is present, - the gen_server is allowed to spend Time milliseconds - initializing or it will be terminated and the start function - will return {error,timeout}. -

-

If the option {debug,Dbgs} is present, - the corresponding sys function will be called for each - item in Dbgs. See - sys(3).

-

If the option {spawn_opt,SOpts} is present, - SOpts will be passed as option list to - the spawn_opt BIF which is used to spawn - the gen_server. See - erlang(3).

- -

Using the spawn option monitor is currently not - allowed, but will cause the function to fail with reason - badarg.

- -

If the gen_server is successfully created and initialized - the function returns {ok,Pid}, where Pid is - the pid of the gen_server. If there already exists a process - with the specified ServerName the function returns - {error,{already_started,Pid}}, where Pid is - the pid of that process.

-

If Module:init/1 fails with Reason, - the function returns {error,Reason}. If - Module:init/1 returns {stop,Reason} or - ignore, the process is terminated and the function - returns {error,Reason} or ignore, respectively.

- - - - start(Module, Args, Options) -> Result - start(ServerName, Module, Args, Options) -> Result - Create a stand-alone gen_server process. - - ServerName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() -  GlobalName = ViaName = term() - Module = atom() - Args = term() - Options = [Option] -  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} -   Dbgs = [Dbg] -    Dbg = trace | log | statistics | {log_to_file,FileName} | {install,{Func,FuncState}} -   SOpts = [term()] - Result = {ok,Pid} | ignore | {error,Error} -  Pid = pid() -  Error = {already_started,Pid} | term() - - -

Creates a stand-alone gen_server process, i.e. a gen_server - which is not part of a supervision tree and thus has no - supervisor.

-

See start_link/3,4 - for a description of arguments and return values.

- - - - stop(ServerRef) -> ok - stop(ServerRef, Reason, Timeout) -> ok - Synchronously stop a generic server. + abcast(Name, Request) -> abcast + abcast(Nodes, Name, Request) -> abcast + Send an asynchronous request to many generic servers. - ServerRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() + Nodes = [Node]  Node = atom() -  GlobalName = ViaName = term() - Reason = term() - Timeout = int()>0 | infinity + Name = atom() + Request = term() -

Orders a generic server to exit with the - given Reason and waits for it to terminate. The - gen_server will call - Module:terminate/2 - before exiting.

-

The function returns ok if the server terminates - with the expected reason. Any other reason than normal, - shutdown, or {shutdown,Term} will cause an - error report to be issued using - error_logger:format/2. - The default Reason is normal.

-

Timeout is an integer greater than zero which - specifies how many milliseconds to wait for the server to - terminate, or the atom infinity to wait - indefinitely. The default value is infinity. If the - server has not terminated within the specified time, a - timeout exception is raised.

-

If the process does not exist, a noproc exception - is raised.

+

Sends an asynchronous request to the gen_server processes + locally registered as Name at the specified nodes. The function + returns immediately and ignores nodes that do not exist, or + where the gen_server Name does not exist. + The gen_server processes call + + Module:handle_cast/2 to handle the request.

+

For a description of the arguments, see + multi_call/2,3,4.

 + call(ServerRef, Request) -> Reply call(ServerRef, Request, Timeout) -> Reply Make a synchronous call to a generic server. - ServerRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() + ServerRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid()  Node = atom()  GlobalName = ViaName = term() Request = term() @@ -235,47 +128,126 @@ gen_server:abcast -----> Module:handle_cast/2 Reply = term() -

Makes a synchronous call to the gen_server ServerRef +

Makes a synchronous call to the ServerRef of the + gen_server process by sending a request and waiting until a reply arrives or a - timeout occurs. The gen_server will call - Module:handle_call/3 to handle the request.

-

ServerRef can be:

+ time-out occurs. The gen_server process calls + + Module:handle_call/3 to handle the request.

+

ServerRef can be any of the following:

- the pid, - Name, if the gen_server is locally registered, - {Name,Node}, if the gen_server is locally - registered at another node, or - {global,GlobalName}, if the gen_server is - globally registered. - {via,Module,ViaName}, if the gen_server is - registered through an alternative process registry. + The pid + Name, if the gen_server process is locally + registered + {Name,Node}, if the gen_server process is locally + registered at another node + {global,GlobalName}, if the gen_server process is + globally registered + {via,Module,ViaName}, if the gen_server process is + registered through an alternative process registry -

Request is an arbitrary term which is passed as one of +

Request is any term that is passed as one of the arguments to Module:handle_call/3.

-

Timeout is an integer greater than zero which +

Timeout is an integer greater than zero that specifies how many milliseconds to wait for a reply, or - the atom infinity to wait indefinitely. Default value - is 5000. If no reply is received within the specified time, + the atom infinity to wait indefinitely. Defaults to + 5000. If no reply is received within the specified time, the function call fails. If the caller catches the failure and continues running, and the server is just late with the reply, - it may arrive at any time later into the caller's message queue. + it can arrive at any time later into the message queue of the caller. The caller must in this case be prepared for this and discard any such garbage messages that are two element tuples with a reference as the first element.

The return value Reply is defined in the return value of Module:handle_call/3.

-

The call may fail for several reasons, including timeout and - the called gen_server dying before or during the call.

-

The ancient behaviour of sometimes consuming the server +

The call can fail for many reasons, including time-out and the + called gen_server process dying before or during the call.

+ +

The ancient behavior of sometimes consuming the server exit message if the server died during the call while - linked to the client has been removed in OTP R12B/Erlang 5.6.

+ linked to the client was removed in Erlang 5.6/OTP R12B.

+ + + + cast(ServerRef, Request) -> ok + Send an asynchronous request to a generic server. + + ServerRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid() +  Node = atom() +  GlobalName = ViaName = term() + Request = term() + + +

Sends an asynchronous request to the ServerRef of the + gen_server process + and returns ok immediately, ignoring + if the destination node or gen_server process does not exist. + The gen_server process calls + + Module:handle_cast/2 to handle the request.

+

For a description of ServerRef, see + call/2,3.

+

Request is any term that is passed as one + of the arguments to Module:handle_cast/2.

+ + + + + enter_loop(Module, Options, State) + enter_loop(Module, Options, State, ServerName) + enter_loop(Module, Options, State, Timeout) + enter_loop(Module, Options, State, ServerName, Timeout) + Enter the gen_server receive loop. + + Module = atom() + Options = [Option] +  Option = {debug,Dbgs} +   Dbgs = [Dbg] +    Dbg = trace | log | statistics +     | {log_to_file,FileName} | {install,{Func,FuncState}} + State = term() + ServerName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Timeout = int() | infinity + + +

Makes an existing process into a gen_server process. Does not + return, instead the calling process enters the gen_server + process receive + loop and becomes a gen_server process. The process + must have been started using one of the start functions in + proc_lib(3). The user is + responsible for any initialization of the process, including + registering a name for it.

+

This function is useful when a more complex initialization procedure + is needed than the gen_server process behavior provides.

+

Module, Options, and ServerName have + the same meanings as when calling + start[_link]/3,4. + However, if ServerName is specified, the process must + have been registered accordingly before this function + is called.

+

State and Timeout have the same meanings as in + the return value of + Module:init/1. + The callback module Module does not need to + export an init/1 function.

+

The function fails if the calling process was not started by a + proc_lib start function, or if it is not registered + according to ServerName.

+ + + multi_call(Name, Request) -> Result multi_call(Nodes, Name, Request) -> Result multi_call(Nodes, Name, Request, Timeout) -> Result - Make a synchronous call to several generic servers. + Make a synchronous call to many generic servers. Nodes = [Node]  Node = atom() @@ -288,203 +260,339 @@ gen_server:abcast -----> Module:handle_cast/2 BadNodes = [Node] -

Makes a synchronous call to all gen_servers locally +

Makes a synchronous call to all gen_server processes locally registered as Name at the specified nodes by first - sending a request to every node and then waiting for - the replies. The gen_servers will call - Module:handle_call/3 to handle the request.

-

The function returns a tuple {Replies,BadNodes} where + sending a request to every node and then waits for + the replies. The gen_server process calls + + Module:handle_call/3 to handle the request.

+

The function returns a tuple {Replies,BadNodes}, where Replies is a list of {Node,Reply} and BadNodes is a list of node that either did not exist, - or where the gen_server Name did not exist or did not + or where the gen_server Name did not exist or did not reply.

Nodes is a list of node names to which the request - should be sent. Default value is the list of all known nodes + is to be sent. Default value is the list of all known nodes [node()|nodes()].

Name is the locally registered name of each - gen_server.

-

Request is an arbitrary term which is passed as one of + gen_server process.

+

Request is any term that is passed as one of the arguments to Module:handle_call/3.

-

Timeout is an integer greater than zero which +

Timeout is an integer greater than zero that specifies how many milliseconds to wait for each reply, or - the atom infinity to wait indefinitely. Default value - is infinity. If no reply is received from a node within + the atom infinity to wait indefinitely. Defaults + to infinity. If no reply is received from a node within the specified time, the node is added to BadNodes.

-

When a reply Reply is received from the gen_server at - a node Node, {Node,Reply} is added to +

When a reply Reply is received from the gen_server + process at a node Node, {Node,Reply} is added to Replies. Reply is defined in the return value of Module:handle_call/3.

-

If one of the nodes is not capable of process monitors, - for example C or Java nodes, and the gen_server is not started - when the requests are sent, but starts within 2 seconds, - this function waits the whole Timeout, - which may be infinity.

+

If one of the nodes cannot process monitors, for example, + C or Java nodes, and the gen_server process is not started + when the requests are sent, but starts within 2 seconds, + this function waits the whole Timeout, + which may be infinity.

This problem does not exist if all nodes are Erlang nodes.

 -

To prevent late answers (after the timeout) from polluting - the caller's message queue, a middleman process is used to - do the actual calls. Late answers will then be discarded +

To prevent late answers (after the time-out) from polluting + the message queue of the caller, a middleman process is used to + do the calls. Late answers are then discarded when they arrive to a terminated process.

 + - cast(ServerRef, Request) -> ok - Send an asynchronous request to a generic server. + reply(Client, Reply) -> Result + Send a reply to a client. - ServerRef = Name | {Name,Node} | {global,GlobalName} - | {via,Module,ViaName} | pid() -  Node = atom() -  GlobalName = ViaName = term() - Request = term() + Client - see below + Reply = term() + Result = term() -

Sends an asynchronous request to the gen_server - ServerRef and returns ok immediately, ignoring - if the destination node or gen_server does not exist. - The gen_server will call Module:handle_cast/2 to - handle the request.

-

See call/2,3 for a - description of ServerRef.

-

Request is an arbitrary term which is passed as one - of the arguments to Module:handle_cast/2.

+

This function can be used by a gen_server process to + explicitly send a reply to a client that called + call/2,3 or + multi_call/2,3,4, + when the reply cannot be defined in the return value of + + Module:handle_call/3.

+

Client must be the From argument provided to + the callback function. Reply is any term + given back to the client as the return value of + call/2,3 or multi_call/2,3,4.

+

The return value Result is not further defined, and + is always to be ignored.

 + - abcast(Name, Request) -> abcast - abcast(Nodes, Name, Request) -> abcast - Send an asynchronous request to several generic servers. + start(Module, Args, Options) -> Result + start(ServerName, Module, Args, Options) -> Result + Create a standalone gen_server process. - Nodes = [Node] -  Node = atom() - Name = atom() - Request = term() + ServerName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Module = atom() + Args = term() + Options = [Option] +  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} +   Dbgs = [Dbg] +    Dbg = trace | log | statistics | {log_to_file,FileName} | {install,{Func,FuncState}} +   SOpts = [term()] + Result = {ok,Pid} | ignore | {error,Error} +  Pid = pid() +  Error = {already_started,Pid} | term() -

Sends an asynchronous request to the gen_servers locally - registered as Name at the specified nodes. The function - returns immediately and ignores nodes that do not exist, or - where the gen_server Name does not exist. - The gen_servers will call Module:handle_cast/2 to - handle the request.

-

See - multi_call/2,3,4 - for a description of the arguments.

+

Creates a standalone gen_server process, that is, a + gen_server process that is not part of a supervision tree + and thus has no supervisor.

+

For a description of arguments and return values, see + start_link/3,4.

 + - reply(Client, Reply) -> Result - Send a reply to a client. + start_link(Module, Args, Options) -> Result + start_link(ServerName, Module, Args, Options) -> Result + Create a gen_server process in a supervision tree. + - Client - see below - Reply = term() - Result = term() + ServerName = {local,Name} | {global,GlobalName} +   | {via,Module,ViaName} +  Name = atom() +  GlobalName = ViaName = term() + Module = atom() + Args = term() + Options = [Option] +  Option = {debug,Dbgs} | {timeout,Time} | {spawn_opt,SOpts} +   Dbgs = [Dbg] +    Dbg = trace | log | statistics | {log_to_file,FileName} | {install,{Func,FuncState}} +   SOpts = [term()] + Result = {ok,Pid} | ignore | {error,Error} +  Pid = pid() +  Error = {already_started,Pid} | term() -

This function can be used by a gen_server to explicitly send - a reply to a client that called call/2,3 or - multi_call/2,3,4, when the reply cannot be defined in - the return value of Module:handle_call/3.

-

Client must be the From argument provided to - the callback function. Reply is an arbitrary term, - which will be given back to the client as the return value of - call/2,3 or multi_call/2,3,4.

-

The return value Result is not further defined, and - should always be ignored.

+

Creates a gen_server process as part of a supervision tree. + This function is to be called, directly or indirectly, by + the supervisor. For example, it ensures that + the gen_server process is linked to the supervisor.

+

The gen_server process calls + Module:init/1 to + initialize. To ensure a synchronized startup procedure, + start_link/3,4 does not return until + Module:init/1 has returned.

+ + +

If ServerName={local,Name}, the gen_server process + is registered locally as Name using register/2.

+ + +

If ServerName={global,GlobalName}, the gen_server + process id registered globally as GlobalName using + + global:register_name/2 If no name is + provided, the gen_server process is not registered.

+ + +

If ServerName={via,Module,ViaName}, the gen_server + process registers with the registry represented by Module. + The Module callback is to export the functions + register_name/2, unregister_name/1, + whereis_name/1, and send/2, which are to behave + like the corresponding functions in + global. + Thus, {via,global,GlobalName} is a valid reference.

+ + +

Module is the name of the callback module.

+

Args is any term that is passed as + the argument to + Module:init/1.

+ + +

If option {timeout,Time} is present, the gen_server + process is allowed to spend Time milliseconds + initializing or it is terminated and the start function + returns {error,timeout}.

+ + +

If option {debug,Dbgs} is present, + the corresponding sys function is called for each + item in Dbgs; see + sys(3).

+ + +

If option {spawn_opt,SOpts} is present, + SOpts is passed as option list to + the spawn_opt BIF, which is used to spawn + the gen_server process; see + + spawn_opt/2.

+ + + +

Using spawn option monitor is not + allowed, it causes the function to fail with reason + badarg.

+ +

If the gen_server process is successfully created and + initialized, the function returns {ok,Pid}, where Pid + is the pid of the gen_server process. If a process with the + specified ServerName exists already, the function returns + {error,{already_started,Pid}}, where Pid is + the pid of that process.

+

If Module:init/1 fails with Reason, + the function returns {error,Reason}. If + Module:init/1 returns {stop,Reason} or + ignore, the process is terminated and the function + returns {error,Reason} or ignore, respectively.

 + - enter_loop(Module, Options, State) - enter_loop(Module, Options, State, ServerName) - enter_loop(Module, Options, State, Timeout) - enter_loop(Module, Options, State, ServerName, Timeout) - Enter the gen_server receive loop + stop(ServerRef) -> ok + stop(ServerRef, Reason, Timeout) -> ok + Synchronously stop a generic server. - Module = atom() - Options = [Option] -  Option = {debug,Dbgs} -   Dbgs = [Dbg] -    Dbg = trace | log | statistics -     | {log_to_file,FileName} | {install,{Func,FuncState}} - State = term() - ServerName = {local,Name} | {global,GlobalName} - | {via,Module,ViaName} -  Name = atom() + ServerRef = Name | {Name,Node} | {global,GlobalName} +   | {via,Module,ViaName} | pid() +  Node = atom()  GlobalName = ViaName = term() - Timeout = int() | infinity + Reason = term() + Timeout = int()>0 | infinity -

Makes an existing process into a gen_server. Does not return, - instead the calling process will enter the gen_server receive - loop and become a gen_server process. The process - must have been started using one of the start - functions in proc_lib, see - proc_lib(3). The user is - responsible for any initialization of the process, including - registering a name for it.

-

This function is useful when a more complex initialization - procedure is needed than the gen_server behaviour provides.

-

Module, Options and ServerName have - the same meanings as when calling - gen_server:start[_link]/3,4. - However, if ServerName is specified, the process must - have been registered accordingly before this function - is called.

-

State and Timeout have the same meanings as in - the return value of - Module:init/1. - Also, the callback module Module does not need to - export an init/1 function.

-

Failure: If the calling process was not started by a - proc_lib start function, or if it is not registered - according to ServerName.

+

Orders a generic server to exit with the specified Reason + and waits for it to terminate. The gen_server process calls + + Module:terminate/2 before exiting.

+

The function returns ok if the server terminates + with the expected reason. Any other reason than normal, + shutdown, or {shutdown,Term} causes an + error report to be issued using + + error_logger:format/2. + The default Reason is normal.

+

Timeout is an integer greater than zero that + specifies how many milliseconds to wait for the server to + terminate, or the atom infinity to wait + indefinitely. Defaults to infinity. If the + server has not terminated within the specified time, a + timeout exception is raised.

+

If the process does not exist, a noproc exception + is raised.
- CALLBACK FUNCTIONS + Callback Functions

The following functions - should be exported from a gen_server callback module.

+ are to be exported from a gen_server callback module.

+ - Module:init(Args) -> Result - Initialize process and internal state. + Module:code_change(OldVsn, State, Extra) -> {ok, NewState} | {error, Reason} + Update the internal state during upgrade/downgrade. - Args = term() - Result = {ok,State} | {ok,State,Timeout} | {ok,State,hibernate} -  | {stop,Reason} | ignore -  State = term() -  Timeout = int()>=0 | infinity -  Reason = term() + OldVsn = Vsn | {down, Vsn} +   Vsn = term() + State = NewState = term() + Extra = term() + Reason = term() - -

Whenever a gen_server is started using - gen_server:start/3,4 or - gen_server:start_link/3,4, - this function is called by the new process to initialize.

-

Args is the Args argument provided to the start - function.

-

If the initialization is successful, the function should - return {ok,State}, {ok,State,Timeout} or {ok,State,hibernate}, where - State is the internal state of the gen_server.

-

If an integer timeout value is provided, a timeout will occur - unless a request or a message is received within - Timeout milliseconds. A timeout is represented by - the atom timeout which should be handled by - the handle_info/2 callback function. The atom - infinity can be used to wait indefinitely, this is - the default value.

-

If hibernate is specified instead of a timeout value, the process will go - into hibernation when waiting for the next message to arrive (by calling - proc_lib:hibernate/3).

-

If something goes wrong during the initialization - the function should return {stop,Reason} where - Reason is any term, or ignore.

+

This function is called by a gen_server process when it is + to update its internal state during a release upgrade/downgrade, + that is, when the instruction {update,Module,Change,...}, + where Change={advanced,Extra}, is specifed in + the appup file. For more information, see section + + Release Handling Instructions in OTP Design Principles.

+

For an upgrade, OldVsn is Vsn, and + for a downgrade, OldVsn is + {down,Vsn}. Vsn is defined by the vsn + attribute(s) of the old version of the callback module + Module. If no such attribute is defined, the version + is the checksum of the Beam file.

+

State is the internal state of the gen_server + process.

+

Extra is passed "as is" from the {advanced,Extra} + part of the update instruction.

+

If successful, the function must return the updated + internal state.

+

If the function returns {error,Reason}, the ongoing + upgrade fails and rolls back to the old release.

 + + + Module:format_status(Opt, [PDict, State]) -> Status + Optional function for providing a term describing the + current gen_server status. + + Opt = normal | terminate + PDict = [{Key, Value}] + State = term() + Status = term() + + + +

This callback is optional, so callback modules need not + export it. The gen_server module provides a default + implementation of this function that returns the callback + module state.

+ +

This function is called by a gen_server process in the + following situations:

+ + +

One of + sys:get_status/1,2 + is invoked to get the gen_server status. Opt is set + to the atom normal.

+ + +

The gen_server process terminates abnormally and logs an + error. Opt is set to the atom terminate.

+ + +

This function is useful for changing the form and + appearance of the gen_server status for these cases. A + callback module wishing to change + the sys:get_status/1,2 return value, as well as how + its status appears in termination error logs, exports an + instance of format_status/2 that returns a term + describing the current status of the gen_server process.

+

PDict is the current value of the process dictionary of + the gen_server process..

+

State is the internal state of the gen_server + process.

+

The function is to return Status, a term that + changes the details of the current state and status of + the gen_server process. There are no restrictions on the + form Status can take, but for + the sys:get_status/1,2 case (when Opt + is normal), the recommended form for + the Status value is [{data, [{"State", + Term}]}], where Term provides relevant details of + the gen_server state. Following this recommendation is not + required, but it makes the callback module status + consistent with the rest of the sys:get_status/1,2 + return value.

+

One use for this function is to return compact alternative + state representations to avoid that large state terms are + printed in log files.

+ + + Module:handle_call(Request, From, State) -> Result Handle a synchronous request. @@ -493,9 +601,9 @@ gen_server:abcast -----> Module:handle_cast/2 From = {pid(),Tag} State = term() Result = {reply,Reply,NewState} | {reply,Reply,NewState,Timeout} -   | {reply,Reply,NewState,hibernate} +   | {reply,Reply,NewState,hibernate}   | {noreply,NewState} | {noreply,NewState,Timeout} -   | {noreply,NewState,hibernate} +   | {noreply,NewState,hibernate}   | {stop,Reason,Reply,NewState} | {stop,Reason,NewState}  Reply = term()  NewState = term() @@ -503,38 +611,52 @@ gen_server:abcast -----> Module:handle_cast/2  Reason = term() -

Whenever a gen_server receives a request sent using - gen_server:call/2,3 or - gen_server:multi_call/2,3,4, +

Whenever a gen_server process receives a request sent using + call/2,3 or + multi_call/2,3,4, this function is called to handle the request.

Request is the Request argument provided to call or multi_call.

-

From is a tuple {Pid,Tag} where Pid is +

From is a tuple {Pid,Tag}, where Pid is the pid of the client and Tag is a unique tag.

-

State is the internal state of the gen_server.

-

If the function returns {reply,Reply,NewState}, - {reply,Reply,NewState,Timeout} or - {reply,Reply,NewState,hibernate}, Reply will be - given back to From as the return value of - call/2,3 or included in the return value of - multi_call/2,3,4. The gen_server then continues - executing with the possibly updated internal state - NewState. See Module:init/1 for a description - of Timeout and hibernate.

-

If the functions returns {noreply,NewState}, - {noreply,NewState,Timeout} or {noreply,NewState,hibernate}, - the gen_server will - continue executing with NewState. Any reply to - From must be given explicitly using - gen_server:reply/2.

-

If the function returns {stop,Reason,Reply,NewState}, - Reply will be given back to From. If - the function returns {stop,Reason,NewState}, any reply - to From must be given explicitly using - gen_server:reply/2. The gen_server will then call - Module:terminate(Reason,NewState) and terminate.

+

State is the internal state of the gen_server + process.

+ + +

If {reply,Reply,NewState} is returned, + {reply,Reply,NewState,Timeout} or + {reply,Reply,NewState,hibernate}, Reply is + given back to From as the return value of + call/2,3 or included in the return value of + multi_call/2,3,4. The gen_server process then + continues executing with the possibly updated internal state + NewState.

+

For a description of Timeout and hibernate, see + Module:init/1.

+ + +

If {noreply,NewState} is returned, + {noreply,NewState,Timeout}, or + {noreply,NewState,hibernate}, the gen_server + process continues executing with NewState. Any reply to + From must be specified explicitly using + reply/2.

+ + +

If {stop,Reason,Reply,NewState} is returned, + Reply is given back to From.

+ + +

If {stop,Reason,NewState} is returned, any reply + to From must be specified explicitly using + reply/2. + The gen_server process then calls + Module:terminate(Reason,NewState) and terminates.

+ + + Module:handle_cast(Request, State) -> Result Handle an asynchronous request. @@ -549,37 +671,82 @@ gen_server:abcast -----> Module:handle_cast/2  Reason = term() -

Whenever a gen_server receives a request sent using - gen_server:cast/2 or - gen_server:abcast/2,3, +

Whenever a gen_server process receives a request sent using + cast/2 or + abcast/2,3, this function is called to handle the request.

-

See Module:handle_call/3 for a description of - the arguments and possible return values.

+

For a description of the arguments and possible return values, see + + Module:handle_call/3.

 + Module:handle_info(Info, State) -> Result Handle an incoming message. Info = timeout | term() State = term() - Result = {noreply,NewState} | {noreply,NewState,Timeout} -   | {noreply,NewState,hibernate} + Result = {noreply,NewState} | {noreply,NewState,Timeout} +   | {noreply,NewState,hibernate}   | {stop,Reason,NewState}  NewState = term()  Timeout = int()>=0 | infinity  Reason = normal | term() -

This function is called by a gen_server when a timeout - occurs or when it receives any other message than a +

This function is called by a gen_server process when a + time-out occurs or when it receives any other message than a synchronous or asynchronous request (or a system message).

-

Info is either the atom timeout, if a timeout +

Info is either the atom timeout, if a time-out has occurred, or the received message.

-

See Module:handle_call/3 for a description of - the other arguments and possible return values.

+

For a description of the other arguments and possible return values, + see + Module:handle_call/3.

+ + + + + Module:init(Args) -> Result + Initialize process and internal state. + + Args = term() + Result = {ok,State} | {ok,State,Timeout} | {ok,State,hibernate} +  | {stop,Reason} | ignore +  State = term() +  Timeout = int()>=0 | infinity +  Reason = term() + + +

Whenever a gen_server process is started using + start/3,4 or + start_link/3,4, + this function is called by the new process to initialize.

+

Args is the Args argument provided to the start + function.

+

If the initialization is successful, the function is to + return {ok,State}, {ok,State,Timeout}, or + {ok,State,hibernate}, where State is the internal + state of the gen_server process.

+

If an integer time-out value is provided, a time-out occurs + unless a request or a message is received within + Timeout milliseconds. A time-out is represented by + the atom timeout, which is to be handled by the + + Module:handle_info/2 callback function. The atom + infinity can be used to wait indefinitely, this is + the default value.

+

If hibernate is specified instead of a time-out value, + the process goes into + hibernation when waiting for the next message to arrive (by calling + + proc_lib:hibernate/3).

+

If the initialization fails, the function is to return + {stop,Reason}, where Reason is any term, or + ignore.

 + Module:terminate(Reason, State) Clean up before termination. @@ -588,137 +755,57 @@ gen_server:abcast -----> Module:handle_cast/2 State = term() -

This function is called by a gen_server when it is about to - terminate. It should be the opposite of Module:init/1 +

This function is called by a gen_server process when it is + about to terminate. It is to be the opposite of + Module:init/1 and do any necessary cleaning up. When it returns, - the gen_server terminates with Reason. The return - value is ignored.

-

Reason is a term denoting the stop reason and - State is the internal state of the gen_server.

-

Reason depends on why the gen_server is terminating. - If it is because another callback function has returned a - stop tuple {stop,..}, Reason will have - the value specified in that tuple. If it is due to a failure, + the gen_server process terminates with Reason. + The return value is ignored.

+

Reason is a term denoting the stop reason and State + is the internal state of the gen_server process.

+

Reason depends on why the gen_server process is + terminating. If it is because another callback function has returned + a stop tuple {stop,..}, Reason has + the value specified in that tuple. If it is because of a failure, Reason is the error reason.

-

If the gen_server is part of a supervision tree and is - ordered by its supervisor to terminate, this function will be +

If the gen_server process is part of a supervision tree and + is ordered by its supervisor to terminate, this function is called with Reason=shutdown if the following conditions apply:

- the gen_server has been set to trap exit signals, and - the shutdown strategy as defined in the supervisor's - child specification is an integer timeout value, not - brutal_kill. + +

The gen_server process has been set to trap exit + signals.

+ + +

The shutdown strategy as defined in the child specification + of the supervisor is an integer time-out value, not + brutal_kill.

+ -

Even if the gen_server is not part of a supervision tree, - this function will be called if it receives an 'EXIT' - message from its parent. Reason will be the same as in - the 'EXIT' message.

-

Otherwise, the gen_server will be immediately terminated.

-

Note that for any other reason than normal, - shutdown, or {shutdown,Term} the gen_server is - assumed to terminate due to an error and - an error report is issued using - error_logger:format/2.

- - - - Module:code_change(OldVsn, State, Extra) -> {ok, NewState} | {error, Reason} - Update the internal state during upgrade/downgrade. - - OldVsn = Vsn | {down, Vsn} -   Vsn = term() - State = NewState = term() - Extra = term() - Reason = term() - - -

This function is called by a gen_server when it should - update its internal state during a release upgrade/downgrade, - i.e. when the instruction {update,Module,Change,...} - where Change={advanced,Extra} is given in - the appup file. See - OTP Design Principles - for more information.

-

In the case of an upgrade, OldVsn is Vsn, and - in the case of a downgrade, OldVsn is - {down,Vsn}. Vsn is defined by the vsn - attribute(s) of the old version of the callback module - Module. If no such attribute is defined, the version - is the checksum of the BEAM file.

-

State is the internal state of the gen_server.

-

Extra is passed as-is from the {advanced,Extra} - part of the update instruction.

-

If successful, the function shall return the updated - internal state.

-

If the function returns {error,Reason}, the ongoing - upgrade will fail and roll back to the old release.

- - - - Module:format_status(Opt, [PDict, State]) -> Status - Optional function for providing a term describing the - current gen_server status. - - Opt = normal | terminate - PDict = [{Key, Value}] - State = term() - Status = term() - - - -

This callback is optional, so callback modules need not - export it. The gen_server module provides a default - implementation of this function that returns the callback - module state.

- -

This function is called by a gen_server process when:

- - One - of sys:get_status/1,2 - is invoked to get the gen_server status. Opt is set - to the atom normal for this case. - The gen_server terminates abnormally and logs an - error. Opt is set to the atom terminate for this - case. - -

This function is useful for customising the form and - appearance of the gen_server status for these cases. A - callback module wishing to customise - the sys:get_status/1,2 return value as well as how - its status appears in termination error logs exports an - instance of format_status/2 that returns a term - describing the current status of the gen_server.

-

PDict is the current value of the gen_server's - process dictionary.

-

State is the internal state of the gen_server.

-

The function should return Status, a term that - customises the details of the current state and status of - the gen_server. There are no restrictions on the - form Status can take, but for - the sys:get_status/1,2 case (when Opt - is normal), the recommended form for - the Status value is [{data, [{"State", - Term}]}] where Term provides relevant details of - the gen_server state. Following this recommendation isn't - required, but doing so will make the callback module status - consistent with the rest of the sys:get_status/1,2 - return value.

-

One use for this function is to return compact alternative - state representations to avoid having large state terms - printed in logfiles.

+

Even if the gen_server process is not part of a + supervision tree, this function is called if it receives an + 'EXIT' message from its parent. Reason is the same + as in the 'EXIT' message.

+

Otherwise, the gen_server process terminates immediately.

+

Notice that for any other reason than normal, + shutdown, or {shutdown,Term}, the gen_server + process is assumed to terminate because of an error and + an error report is issued using + + error_logger:format/2.
- SEE ALSO -

gen_event(3), - gen_fsm(3), - gen_statem(3), - supervisor(3), - proc_lib(3), - sys(3)

+ See Also +

gen_event(3), + gen_fsm(3), + gen_statem(3), + proc_lib(3), + supervisor(3), + sys(3)

 diff --git a/lib/stdlib/doc/src/gen_statem.xml b/lib/stdlib/doc/src/gen_statem.xml index 0e7d6e53e9..c57a31fa21 100644 --- a/lib/stdlib/doc/src/gen_statem.xml +++ b/lib/stdlib/doc/src/gen_statem.xml @@ -400,7 +400,7 @@ handle_event(_, _, State, Data) ->

The gen_statem is globally registered in - kernel:global. + global.

{via,RegMod,ViaName} @@ -413,7 +413,7 @@ handle_event(_, _, State, Data) -> register_name/2, unregister_name/1, whereis_name/1, and send/2, which are to behave like the corresponding functions in - kernel:global. + global. Thus, {via,global,GlobalName} is the same as {global,GlobalName}.

diff --git a/lib/stdlib/doc/src/introduction.xml b/lib/stdlib/doc/src/introduction.xml new file mode 100644 index 0000000000..5bf545c65f --- /dev/null +++ b/lib/stdlib/doc/src/introduction.xml @@ -0,0 +1,72 @@ + + + + +
+ + 1999 + 2013 + Ericsson AB. All Rights Reserved. + + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + Introduction + + + + + + 2016-03-04 + PA1 + introduction.xml +
+ +
+ Scope +

The Standard Erlang Libraries application, STDLIB, is mandatory + in the sense that the minimal system based on Erlang/OTP consists of + STDLIB and Kernel.

+ +

STDLIB contains the following functional areas:

+ + + Erlang shell + Command interface + Query interface + Interface to standard Erlang I/O servers + Interface to the Erlang built-in term storage BIFs + Regular expression matching functions for strings and binaries + Finite state machine + Event handling + Functions for the server of a client-server relation + Function to control applications in a distributed manner + Start and control of slave nodes + Operations on finite sets and relations represented as sets + Library for handling binary data + Disk-based term storage + List processing + Maps processing + +
+ +
+ Prerequisites +

It is assumed that the reader is familiar with the Erlang programming + language.

+
+ + + diff --git a/lib/stdlib/doc/src/io.xml b/lib/stdlib/doc/src/io.xml index 9ae50ed90c..11a64c7f8a 100644 --- a/lib/stdlib/doc/src/io.xml +++ b/lib/stdlib/doc/src/io.xml @@ -29,48 +29,50 @@
io - Standard I/O Server Interface Functions + Standard I/O server interface functions.

This module provides an interface to standard Erlang I/O servers. The output functions all return ok if they are successful, or exit if they are not.

-

In the following description, all functions have an optional + +

All functions in this module have an optional parameter IoDevice. If included, it must be the pid of a - process which handles the IO protocols. Normally, it is the + process that handles the I/O protocols. Normally, it is the IoDevice returned by - file:open/2.

-

For a description of the IO protocols refer to the STDLIB User's Guide.

- - -

As of R13A, data supplied to the put_chars function should be in the - unicode:chardata() format. This means that programs - supplying binaries to this function need to convert them to UTF-8 - before trying to output the data on an IO device.

- -

If an IO device is set in binary mode, the functions get_chars and get_line may return binaries - instead of lists. The binaries will, as of R13A, be encoded in - UTF-8.

+ file:open/2.

-

To work with binaries in ISO-latin-1 encoding, use the file module instead.

- -

For conversion functions between character encodings, see the unicode module.

+

For a description of the I/O protocols, see section + The Erlang I/O Protocol + in the User's Guide.

+ +

As from Erlang/OTP R13A, data supplied to function + put_chars/2 + is to be in the + unicode:chardata() format. This means that programs + supplying binaries to this function must convert them to UTF-8 + before trying to output the data on an I/O device.

+

If an I/O device is set in binary mode, functions + get_chars/2,3 and + get_line/1,2 + can return binaries instead of lists. + The binaries are, as from Erlang/OTP R13A, + encoded in UTF-8.

+

To work with binaries in ISO Latin-1 encoding, use the + file module instead.

+

For conversion functions between character encodings, see the + unicode module.

 - -

An IO device. Either standard_io, standard_error, a - registered name, or a pid handling IO protocols (returned from - file:open/2).

+

An I/O device, either standard_io, standard_error, a + registered name, or a pid handling I/O protocols (returned from + file:open/2). +

@@ -96,7 +98,7 @@ -

What the I/O-server sends when there is no data.

 +

What the I/O server sends when there is no data.

 @@ -104,329 +106,93 @@ - Get the number of columns of an IO device - -

Retrieves the number of columns of the - IoDevice (i.e. the width of a terminal). The function - only succeeds for terminal devices, for all other IO devices - the function returns {error, enotsup}

- - - - - - Write a list of characters - -

Writes the characters of CharData to the I/O server - (IoDevice).

- - - - - - Write a newline - -

Writes new line to the standard output (IoDevice).

- - - - - - Read a specified number of characters - - -

Reads Count characters from standard input - (IoDevice), prompting it with Prompt. It - returns:

- - Data - -

The input characters. If the IO device supports Unicode, - the data may represent codepoints larger than 255 (the - latin1 range). If the I/O server is set to deliver - binaries, they will be encoded in UTF-8 (regardless of if - the IO device actually supports Unicode or not).

- - eof - -

End of file was encountered.

- - {error, ErrorDescription} - -

Other (rare) error condition, for instance {error, estale} - if reading from an NFS file system.

- - - - - - - - Read a line - - -

Reads a line from the standard input (IoDevice), - prompting it with Prompt. It returns:

- - Data - -

The characters in the line terminated by a LF (or end of - file). If the IO device supports Unicode, - the data may represent codepoints larger than 255 (the - latin1 range). If the I/O server is set to deliver - binaries, they will be encoded in UTF-8 (regardless of if - the IO device actually supports Unicode or not).

- - eof - -

End of file was encountered.

- - {error, ErrorDescription} - -

Other (rare) error condition, for instance {error, estale} - if reading from an NFS file system.

- - - - - - - - Get the supported options and values from an I/O-server + Get the number of columns of an I/O device. -

This function requests all available options and their current values for a specific IO device. Example:

-
-1> {ok,F} = file:open("/dev/null",[read]).
-{ok,<0.42.0>}
-2> io:getopts(F).
-[{binary,false},{encoding,latin1}]
-

Here the file I/O-server returns all available options for a file, - which are the expected ones, encoding and binary. The standard shell however has some more options:

-
-3> io:getopts().
-[{expand_fun,#Fun<group.0.120017273>},
- {echo,true},
- {binary,false},
- {encoding,unicode}]
-

This example is, as can be seen, run in an environment where the terminal supports Unicode input and output.

+

Retrieves the number of columns of the + IoDevice (that is, the width of a terminal). + The function succeeds for terminal devices and returns + {error, enotsup} for all other I/O devices.

 - - - Get user requested printable character range - -

Return the user requested range of printable Unicode characters.

-

The user can request a range of characters that are to be considered printable in heuristic detection of strings by the shell and by the formatting functions. This is done by supplying +pc <range> when starting Erlang.

-

Currently the only valid values for <range> are latin1 and unicode. latin1 means that only code points below 256 (with the exception of control characters etc) will be considered printable. unicode means that all printable characters in all unicode character ranges are considered printable by the io functions.

-

By default, Erlang is started so that only the latin1 range of characters will indicate that a list of integers is a string.

-

The simplest way to utilize the setting is to call io_lib:printable_list/1, which will use the return value of this function to decide if a list is a string of printable characters or not.

-

In the future, this function may return more values and ranges. It is recommended to use the io_lib:printable_list/1 function to avoid compatibility problems.

 - - - - - - Set options - -

Set options for the standard IO device (IoDevice).

-

Possible options and values vary depending on the actual - IO device. For a list of supported options and their current values - on a specific IO device, use the getopts/1 function.

- -

The options and values supported by the current OTP IO devices are:

- - binary, list or {binary, boolean()} - -

If set in binary mode (binary or {binary, true}), the I/O server sends binary data (encoded in UTF-8) as answers to the get_line, get_chars and, if possible, get_until requests (see the I/O protocol description in STDLIB User's Guide for details). The immediate effect is that get_chars/2,3 and get_line/1,2 return UTF-8 binaries instead of lists of chars for the affected IO device.

-

By default, all IO devices in OTP are set in list mode, but the I/O functions can handle any of these modes and so should other, user written, modules behaving as clients to I/O-servers.

-

This option is supported by the standard shell (group.erl), the 'oldshell' (user.erl) and the file I/O servers.

- - {echo, boolean()} - -

Denotes if the terminal should echo input. Only supported for the standard shell I/O-server (group.erl)

- - {expand_fun, expand_fun()} - -

Provide a function for tab-completion (expansion) - like the Erlang shell. This function is called - when the user presses the TAB key. The expansion is - active when calling line-reading functions such as - get_line/1,2.

-

The function is called with the current line, upto - the cursor, as a reversed string. It should return a - three-tuple: {yes|no, string(), [string(), ...]}. The - first element gives a beep if no, otherwise the - expansion is silent, the second is a string that will be - entered at the cursor position, and the third is a list of - possible expansions. If this list is non-empty, the list - will be printed and the current input line will be written - once again.

-

Trivial example (beep on anything except empty line, which - is expanded to "quit"):

- - fun("") -> {yes, "quit", []}; - (_) -> {no, "", ["quit"]} end -

This option is supported by the standard shell only (group.erl).

- - {encoding, latin1 | unicode} - -

Specifies how characters are input or output from or to the actual IO device, implying that i.e. a terminal is set to handle Unicode input and output or a file is set to handle UTF-8 data encoding.

-

The option does not affect how data is returned from the I/O functions or how it is sent in the I/O-protocol, it only affects how the IO device is to handle Unicode characters towards the "physical" device.

-

The standard shell will be set for either Unicode or latin1 encoding when the system is started. The actual encoding is set with the help of the LANG or LC_CTYPE environment variables on Unix-like system or by other means on other systems. The bottom line is that the user can input Unicode characters and the IO device will be in {encoding, unicode} mode if the IO device supports it. The mode can be changed, if the assumption of the runtime system is wrong, by setting this option.

-

The IO device used when Erlang is started with the "-oldshell" or "-noshell" flags is by default set to latin1 encoding, meaning that any characters beyond codepoint 255 will be escaped and that input is expected to be plain 8-bit ISO-latin-1. If the encoding is changed to Unicode, input and output from the standard file descriptors will be in UTF-8 (regardless of operating system).

-

Files can also be set in {encoding, unicode}, meaning that data is written and read as UTF-8. More encodings are possible for files, see below.

-

{encoding, unicode | latin1} is supported by both the standard shell (group.erl including werl on Windows®), the 'oldshell' (user.erl) and the file I/O servers.

- - {encoding, utf8 | utf16 | utf32 | {utf16,big} | {utf16,little} | {utf32,big} | {utf32,little}} - -

For disk files, the encoding can be set to various UTF variants. This will have the effect that data is expected to be read as the specified encoding from the file and the data will be written in the specified encoding to the disk file.

-

{encoding, utf8} will have the same effect as {encoding, unicode} on files.

-

The extended encodings are only supported on disk files (opened by the file:open/2 function)

- - - - - - - - Write a term - -

Writes the term Term to the standard output - (IoDevice).

- - - - - Read a term - - -

Reads a term Term from the standard input - (IoDevice), prompting it with Prompt. It - returns:

- - {ok, Term} - -

The parsing was successful.

- - eof - -

End of file was encountered.

- - {error, ErrorInfo} - -

The parsing failed.

- - {error, ErrorDescription} - -

Other (rare) error condition, for instance {error, estale} - if reading from an NFS file system.

- - - - - - - - Read a term - - -

Reads a term Term from IoDevice, prompting it - with Prompt. Reading starts at location - StartLocation. The argument - Options is passed on as the Options - argument of the erl_scan:tokens/4 function. It returns:

- - {ok, Term, EndLocation} - -

The parsing was successful.

- - {eof, EndLocation} - -

End of file was encountered.

- - {error, ErrorInfo, ErrorLocation} - -

The parsing failed.

- - {error, ErrorDescription} - -

Other (rare) error condition, for instance {error, estale} - if reading from an NFS file system.

- - - - - - - - - Write formatted output + + + + Write formatted output. -

Writes the items in Data ([]) on the standard - output (IoDevice) in accordance with Format. - Format contains plain characters which are copied to +

Writes the items in Data ([]) on the + standard output (IoDevice) in accordance with + Format. Format contains + plain characters that are copied to the output device, and control sequences for formatting, see - below. If Format is an atom or a binary, it is first - converted to a list with the aid of atom_to_list/1 - or binary_to_list/1.

+ below. If Format is an atom or a binary, it is + first converted to a list with the aid of atom_to_list/1 or + binary_to_list/1. Example:

 1> io:fwrite("Hello world!~n", []).
 Hello world!
 ok
-

The general format of a control sequence is ~F.P.PadModC. - The character C determines the type of control sequence +

The general format of a control sequence is ~F.P.PadModC.

+

Character C determines the type of control sequence to be used, F and P are optional numeric arguments. If F, P, or Pad is *, the next argument in Data is used as the numeric value of F or P.

-

F is the field width of the printed argument. A - negative value means that the argument will be left justified - within the field, otherwise it will be right justified. If no - field width is specified, the required print width will be - used. If the field width specified is too small, then the - whole field will be filled with * characters.

-

P is the precision of the printed argument. A - default value is used if no precision is specified. The - interpretation of precision depends on the control sequences. - Unless otherwise specified, the argument within is used - to determine print width.

-

Pad is the padding character. This is the character - used to pad the printed representation of the argument so that - it conforms to the specified field width and precision. Only - one padding character can be specified and, whenever - applicable, it is used for both the field width and precision. - The default padding character is ' ' (space).

-

Mod is the control sequence modifier. It is either a - single character (currently only t, for Unicode - translation, and l, for stopping p and - P from detecting printable characters, are supported) - that changes the interpretation of Data.

-

The following control sequences are available:

+ + +

F is the field width of the printed argument. A + negative value means that the argument is left-justified + within the field, otherwise right-justified. If no + field width is specified, the required print width is + used. If the field width specified is too small, the + whole field is filled with * characters.

+ + +

P is the precision of the printed argument. A + default value is used if no precision is specified. The + interpretation of precision depends on the control sequences. + Unless otherwise specified, argument within is used + to determine print width.

+ + +

Pad is the padding character. This is the character + used to pad the printed representation of the argument so that + it conforms to the specified field width and precision. Only + one padding character can be specified and, whenever + applicable, it is used for both the field width and precision. + The default padding character is ' ' (space).

+ + +

Mod is the control sequence modifier. It is either a + single character (t, for Unicode + translation, and l, for stopping p and + P from detecting printable characters) + that changes the interpretation of Data.

+ + +

Available control sequences:

~ -

The character ~ is written.

+

Character ~ is written.

 c -

The argument is a number that will be interpreted as an +

The argument is a number that is interpreted as an ASCII code. The precision is the number of times the - character is printed and it defaults to the field width, - which in turn defaults to 1. The following example - illustrates:

+ character is printed and defaults to the field width, + which in turn defaults to 1. Example:

 1> io:fwrite("|~10.5c|~-10.5c|~5c|~n", [$a, $b, $c]).
 |     aaaaa|bbbbb     |ccccc|
 ok

If the Unicode translation modifier (t) is in effect, the integer argument can be any number representing a - valid Unicode codepoint, otherwise it should be an integer + valid Unicode codepoint, otherwise it is to be an integer less than or equal to 255, otherwise it is masked with 16#FF:

 2> io:fwrite("~tc~n",[1024]).
@@ -435,29 +201,28 @@ ok
 3> io:fwrite("~c~n",[1024]).
 ^@
 ok
- f -

The argument is a float which is written as +

The argument is a float that is written as [-]ddd.ddd, where the precision is the number of digits after the decimal point. The default precision is 6 - and it cannot be less than 1.

+ and it cannot be < 1.

 e -

The argument is a float which is written as +

The argument is a float that is written as [-]d.ddde+-ddd, where the precision is the number of digits written. The default precision is 6 and it - cannot be less than 2.

+ cannot be < 2.

 g -

The argument is a float which is written as f, if +

The argument is a float that is written as f, if it is >= 0.1 and < 10000.0. Otherwise, it is written in the e format. The precision is the number of - significant digits. It defaults to 6 and should not be - less than 2. If the absolute value of the float does not + significant digits. It defaults to 6 and is not to be + < 2. If the absolute value of the float does not allow it to be written in the f format with the desired number of significant digits, it is also written in the e format.

@@ -471,8 +236,9 @@ ok the argument is unicode:chardata(), meaning that binaries are in UTF-8. The characters are printed without quotes. The string is first truncated - by the given precision and then padded and justified - to the given field width. The default precision is the field width.

+ by the specified precision and then padded and justified to the + specified field width. The default precision is the field width. +

This format can be used for printing any object and truncating the output so it fits a specified field:

@@ -484,7 +250,8 @@ ok
 3> io:fwrite("|~-10.8s|~n", [io_lib:write({hey, hey, hey})]).
 |{hey,hey  |
 ok
-

A list with integers larger than 255 is considered an error if the Unicode translation modifier is not given:

+

A list with integers > 255 is considered an error if the + Unicode translation modifier is not specified:

 4> io:fwrite("~ts~n",[[1024]]).
 \x{400}
@@ -497,8 +264,8 @@ ok
           
             
Writes data with the standard syntax. This is used to
               output Erlang terms. Atoms are printed within quotes if
-              they contain embedded non-printable characters, and
-              floats are printed accurately as the shortest, correctly
+              they contain embedded non-printable characters.
+              Floats are printed accurately as the shortest, correctly
               rounded string.

           
           p
@@ -506,11 +273,11 @@ ok
             
Writes the data with standard syntax in the same way as
               ~w, but breaks terms whose printed representation
               is longer than one line into many lines and indents each
-              line sensibly. Left justification is not supported.
+              line sensibly. Left-justification is not supported.
               It also tries to detect lists of
               printable characters and to output these as strings. The
               Unicode translation modifier is used for determining
-              what characters are printable. For example:

+              what characters are printable, for example:

             
 1> T = [{attributes,[[{id,age,1.50000},{mode,explicit},
 {typename,"INTEGER"}], [{id,cho},{mode,explicit},{typename,'Cho'}]]},
@@ -531,12 +298,13 @@ ok
  {tag,{'PRIVATE',3}},
  {mode,implicit}]
 ok

-            
The field width specifies the maximum line length. It
-              defaults to 80. The precision specifies the initial
+            
The field width specifies the maximum line length.
+              Defaults to 80. The precision specifies the initial
               indentation of the term. It defaults to the number of
-              characters printed on this line in the same call to
-              io:fwrite or io:format. For example, using
-              T above:

+              characters printed on this line in the same call to
+              write/1 or
+              format/1,2,3.
+              For example, using T above:

             
 4> io:fwrite("Here T = ~62p~n", [T]).
 Here T = [{attributes,[[{id,age,1.5},
@@ -549,8 +317,8 @@ Here T = [{attributes,[[{id,age,1.5},
           {tag,{'PRIVATE',3}},
           {mode,implicit}]
 ok

-            
When the modifier l is given no detection of
-              printable character lists will take place. For example:

+            
When the modifier l is specified, no detection of
+              printable character lists takes place, for example:

             
 5> S = [{a,"a"}, {b, "b"}].
 6> io:fwrite("~15p~n", [S]).
@@ -561,9 +329,9 @@ ok
 [{a,[97]},
  {b,[98]}]
 ok

-            
Binaries that look like UTF-8 encoded strings will be
+            
Binaries that look like UTF-8 encoded strings are
               output with the string syntax if the Unicode translation
-              modifier is given:

+              modifier is specified:

             
 9> io:fwrite("~p~n",[[1024]]).
 [1024]
@@ -578,7 +346,7 @@ ok

           W
           
             
Writes data in the same way as ~w, but takes an
-              extra argument which is the maximum depth to which terms
+              extra argument that is the maximum depth to which terms
               are printed. Anything below this depth is replaced with
               .... For example, using T above:

             
@@ -587,17 +355,17 @@ ok

 [{id,cho},{mode,...},{...}]]},{typename,'Person'},
 {tag,{'PRIVATE',3}},{mode,implicit}]
 ok
-

If the maximum depth has been reached, then it is - impossible to read in the resultant output. Also, the +

If the maximum depth is reached, it cannot + be read in the resultant output. Also, the ,... form in a tuple denotes that there are more elements in the tuple but these are below the print depth.

 P

Writes data in the same way as ~p, but takes an - extra argument which is the maximum depth to which terms + extra argument that is the maximum depth to which terms are printed. Anything below this depth is replaced with - .... For example:

+ ..., for example:

 9> io:fwrite("~62P~n", [T,9]).
 [{attributes,[[{id,age,1.5},{mode,explicit},{typename,...}],
@@ -609,9 +377,9 @@ ok
 B -

Writes an integer in base 2..36, the default base is +

Writes an integer in base 2-36, the default base is 10. A leading dash is printed for negative integers.

-

The precision field selects base. For example:

+

The precision field selects base, for example:

 1> io:fwrite("~.16B~n", [31]).
 1F
@@ -629,7 +397,7 @@ ok
prefix to insert before the number, but after the leading dash, if any.

The prefix can be a possibly deep list of characters or - an atom.

+ an atom. Example:

 1> io:fwrite("~X~n", [31,"10#"]).
 10#31
@@ -641,7 +409,7 @@ ok
#

Like B, but prints the number with an Erlang style - #-separated base prefix.

+ #-separated base prefix. Example:

 1> io:fwrite("~.10#~n", [31]).
 10#31
@@ -671,14 +439,14 @@ ok

Ignores the next term.

 -

Returns:

+

The function returns:

ok

The formatting succeeded.

 -

If an error occurs, there is no output. For example:

+

If an error occurs, there is no output. Example:

 1> io:fwrite("~s ~w ~i ~w ~c ~n",['abc def', 'abc def', {foo, 1},{foo, 1}, 65]).
 abc def 'abc def'  {foo,1} A
@@ -692,45 +460,57 @@ ok
      in function  io:o_request/2

In this example, an attempt was made to output the single character 65 with the aid of the string formatting directive - "~s".

+ "~s".

 + - Read formatted input + Read formatted input. -

Reads characters from the standard input (IoDevice), - prompting it with Prompt. Interprets the characters in - accordance with Format. Format contains control - sequences which directs the interpretation of the input.

-

Format may contain:

+

Reads characters from the standard input + (IoDevice), prompting it with + Prompt. Interprets the characters in accordance + with Format. Format contains + control sequences that directs the interpretation of the input.

+

Format can contain the following:

-

White space characters (SPACE, TAB and NEWLINE) which - cause input to be read to the next non-white space - character.

+

Whitespace characters (Space, Tab, and + Newline) that cause input to be read to the next + non-whitespace character.

 -

Ordinary characters which must match the next input +

Ordinary characters that must match the next input character.

 -

Control sequences, which have the general format - ~*FMC. The character * is an optional - return suppression character. It provides a method to - specify a field which is to be omitted. F is the - field width of the input field, M is an optional - translation modifier (of which t is the only currently - supported, meaning Unicode translation) and C - determines the type of control sequence.

- -

Unless otherwise specified, leading white-space is + ~*FMC, where:

+ + +

Character * is an optional return suppression + character. It provides a method to specify a field that + is to be omitted.

+ + +

F is the field width of the input field.

+ + +

M is an optional translation modifier (of which + t is the only supported, meaning Unicode + translation).

+ + +

C determines the type of control sequence.

+ + +

Unless otherwise specified, leading whitespace is ignored for all control sequences. An input field cannot - be more than one line wide. The following control - sequences are available:

+ be more than one line wide.

+

Available control sequences:

~ @@ -742,22 +522,22 @@ ok u -

An unsigned integer in base 2..36 is expected. The +

An unsigned integer in base 2-36 is expected. The field width parameter is used to specify base. Leading - white-space characters are not skipped.

+ whitespace characters are not skipped.

 -

An optional sign character is expected. A sign - character - gives the return value -1. Sign + character - gives return value -1. Sign character + or none gives 1. The field width - parameter is ignored. Leading white-space characters + parameter is ignored. Leading whitespace characters are not skipped.

 # -

An integer in base 2..36 with Erlang-style base - prefix (for example "16#ffff") is expected.

+

An integer in base 2-36 with Erlang-style base + prefix (for example, "16#ffff") is expected.

 f @@ -766,18 +546,15 @@ ok s -

A string of non-white-space characters is read. If a +

A string of non-whitespace characters is read. If a field width has been specified, this number of - characters are read and all trailing white-space + characters are read and all trailing whitespace characters are stripped. An Erlang string (list of characters) is returned.

- -

If Unicode translation is in effect (~ts), - characters larger than 255 are accepted, otherwise - not. With the translation modifier, the list - returned may as a consequence also contain - integers larger than 255:

- +

If Unicode translation is in effect (~ts), + characters > 255 are accepted, otherwise + not. With the translation modifier, the returned + list can as a consequence also contain integers > 255:

 1> io:fread("Prompt> ","~s").
 Prompt> <Characters beyond latin1 range not printable in this medium>
@@ -785,22 +562,23 @@ Prompt> <Characters beyond latin1 range not printable in this medium&g
 2> io:fread("Prompt> ","~ts").
 Prompt> <Characters beyond latin1 range not printable in this medium>
 {ok,[[1091,1085,1080,1094,1086,1076,1077]]}
- a

Similar to s, but the resulting string is converted into an atom.

-

The Unicode translation modifier is not allowed (atoms can not contain characters beyond the latin1 range).

+

The Unicode translation modifier is not allowed (atoms + cannot contain characters beyond the latin1 range).

 c

The number of characters equal to the field width are read (default is 1) and returned as an Erlang string. - However, leading and trailing white-space characters + However, leading and trailing whitespace characters are not omitted as they are with s. All characters are returned.

-

The Unicode translation modifier works as with s:

+

The Unicode translation modifier works as with s: + 

 1> io:fread("Prompt> ","~c").
 Prompt> <Character beyond latin1 range not printable in this medium>
@@ -808,21 +586,20 @@ Prompt> <Character beyond latin1 range not printable in this medium>
 2> io:fread("Prompt> ","~tc").
 Prompt> <Character beyond latin1 range not printable in this medium>
 {ok,[[1091]]}
- l -

Returns the number of characters which have been - scanned up to that point, including white-space +

Returns the number of characters that have been + scanned up to that point, including whitespace characters.

 -

It returns:

+

The function returns:

{ok, Terms} -

The read was successful and Terms is the list - of successfully matched and read items.

+

The read was successful and Terms is + the list of successfully matched and read items.

 eof @@ -835,13 +612,14 @@ Prompt> <Character beyond latin1 range not printable in this medium> {error, ErrorDescription} -

The read operation failed and the parameter - ErrorDescription gives a hint about the error.

+

The read operation failed and parameter + ErrorDescription gives a hint about + the error.

 -

Examples:

+

Examples:

 20> io:fread('enter>', "~f~f~f").
 enter>1.9 35.5e3 15.0
@@ -854,104 +632,127 @@ enter>:   alan   :   joe
       
     
+
     
-      
-      
-      Get the number of rows of an IO device
+      
+      
+      Read a specified number of characters.
+      
       
-          
Retrieves the number of rows of the 
-          IoDevice (i.e. the height of a terminal). The function
-          only succeeds for terminal devices, for all other IO devices
-          the function returns {error, enotsup}

+        
Reads Count characters from standard input
+          (IoDevice), prompting it with
+          Prompt.

+        
The function returns:

+        
+          Data
+          
+            
The input characters. If the I/O device supports Unicode,
+              the data can represent codepoints > 255 (the
+              latin1 range). If the I/O server is set to deliver
+              binaries, they are encoded in UTF-8 (regardless of whether
+              the I/O device supports Unicode).

+          
+          eof
+          
+            
End of file was encountered.

+          
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+             if reading from an NFS file system.

+	  
+        
       
     
+
     
-      
-      
-      
-      
-      Read and tokenize Erlang expressions
+      
+      
+      Read a line.
       
       
-        
Reads data from the standard input (IoDevice),
-          prompting it with Prompt. Reading starts at location
-          StartLocation (1). The argument Options
-          is passed on as the Options argument of the
-          erl_scan:tokens/4 function. The data is tokenized as if
-          it were a
-          sequence of Erlang expressions until a final dot (.) is
-          reached. This token is also returned. It returns:

+        
Reads a line from the standard input (IoDevice),
+          prompting it with Prompt.

+        
The function returns:

         
-          {ok, Tokens, EndLocation}
+          Data
           
-            
The tokenization succeeded.

-          
-          {eof, EndLocation}
-          
-            
End of file was encountered by the tokenizer.

+            
The characters in the line terminated by a line feed (or end of
+              file). If the I/O device supports Unicode,
+              the data can represent codepoints > 255 (the
+              latin1 range). If the I/O server is set to deliver
+              binaries, they are encoded in UTF-8 (regardless of if
+              the I/O device supports Unicode).

           
           eof
           
-            
End of file was encountered by the I/O-server.

+            
End of file was encountered.

           
-          {error, ErrorInfo, ErrorLocation}
+          {error, ErrorDescription}
           
-            
An error occurred while tokenizing.

-          
-	  {error, ErrorDescription}
-	  
-	    
Other (rare) error condition, for instance {error, estale}
-	    if reading from an NFS file system.

+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

 	  
         
-        
Example:

-        
-23> io:scan_erl_exprs('enter>').
-enter>abc(), "hey".
-{ok,[{atom,1,abc},{'(',1},{')',1},{',',1},{string,1,"hey"},{dot,1}],2}
-24> io:scan_erl_exprs('enter>').
-enter>1.0er.
-{error,{1,erl_scan,{illegal,float}},2}

       
     
+
     
-      
-      
-      
-      
-      Read and tokenize an Erlang form
-      
+      
+      
+      Get the supported options and values from an I/O server.
+      
       
-        
Reads data from the standard input (IoDevice),
-          prompting it with Prompt. Starts reading
-          at location StartLocation (1). The
-          argument Options is passed on as the
-          Options argument of the erl_scan:tokens/4
-          function. The data is tokenized as if it were an
-          Erlang form - one of the valid Erlang expressions in an
-          Erlang source file - until a final dot (.) is reached.
-          This last token is also returned. The return values are the
-          same as for scan_erl_exprs/1,2,3 above.

+      
Requests all available options and their current
+        values for a specific I/O device, for example:

+
+1> {ok,F} = file:open("/dev/null",[read]).
+{ok,<0.42.0>}
+2> io:getopts(F).
+[{binary,false},{encoding,latin1}]

+      
Here the file I/O server returns all available options for a file,
+        which are the expected ones, encoding and binary.
+        However, the standard shell has some more options:

+
+3> io:getopts().
+[{expand_fun,#Fun<group.0.120017273>},
+ {echo,true},
+ {binary,false},
+ {encoding,unicode}]

+      
This example is, as can be seen, run in an environment where the
+        terminal supports Unicode input and output.

       
     
+
+    
+      
+      
+      Write a newline.
+      
+        
Writes new line to the standard output
+          (IoDevice).

+      
+    
+
     
       
       
       
       
-      Read, tokenize and parse Erlang expressions
+      Read, tokenize, and parse Erlang expressions.
       
       
       
         
Reads data from the standard input
           (IoDevice), prompting it with
           Prompt. Starts reading at location
-          StartLocation (1). The argument
-          Options is passed on as the
-          Options argument of the erl_scan:tokens/4
-          function. The data is tokenized and parsed as if it were a
-          sequence of Erlang expressions until a final dot (.) is reached.
-          It returns:

+          StartLocation (1). Argument
+          Options is passed on as argument
+          Options of function 
+          erl_scan:tokens/4. The data is tokenized and parsed
+          as if it was a sequence of Erlang expressions until a final dot
+          (.) is reached.

+        
The function returns:

         
           {ok, ExprList, EndLocation}
           
@@ -963,17 +764,17 @@ enter>1.0er.
           
           eof
           
-            
End of file was encountered by the I/O-server.

+            
End of file was encountered by the I/O server.

           
           {error, ErrorInfo, ErrorLocation}
           
             
An error occurred while tokenizing or parsing.

           
-	  {error, ErrorDescription}
-	  
-	    
Other (rare) error condition, for instance {error, estale}
-	    if reading from an NFS file system.

-	  
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

+          
         
         
Example:

         
@@ -985,24 +786,25 @@ enter>abc("hey".
 {error,{1,erl_parse,["syntax error before: ",["'.'"]]},2}

       
     
+
     
       
       
       
       
-      Read, tokenize and parse an Erlang form
+      Read, tokenize, and parse an Erlang form.
       
       
       
         
Reads data from the standard input (IoDevice),
           prompting it with Prompt. Starts reading at
-          location StartLocation (1). The argument
-          Options is passed on as the
-          Options argument of the erl_scan:tokens/4
-          function. The data is tokenized and parsed as if
-          it were an Erlang form - one of the valid Erlang expressions
-          in an Erlang source file - until a final dot (.) is reached. It
-          returns:

+          location StartLocation (1). Argument
+          Options is passed on as argument
+          Options of function 
+          erl_scan:tokens/4. The data is tokenized and parsed
+          as if it was an Erlang form (one of the valid Erlang expressions
+          in an Erlang source file) until a final dot (.) is reached.

+        
The function returns:

         
           {ok, AbsForm, EndLocation}
           
@@ -1014,32 +816,353 @@ enter>abc("hey".
           
           eof
           
-            
End of file was encountered by the I/O-server.

+            
End of file was encountered by the I/O server.

           
           {error, ErrorInfo, ErrorLocation}
           
             
An error occurred while tokenizing or parsing.

           
-	  {error, ErrorDescription}
-	  
-	    
Other (rare) error condition, for instance {error, estale}
-	    if reading from an NFS file system.

-	  
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

+          
+        
+      
+    
+
+    
+      
+      Get user-requested printable character range.
+      
+        
Returns the user-requested range of printable Unicode characters.

+        
The user can request a range of characters that are to be considered
+          printable in heuristic detection of strings by the shell and by the
+          formatting functions. This is done by supplying
+          +pc <range> when starting Erlang.

+        
The only valid values for <range> are
+          latin1 and unicode. latin1 means that only code
+          points < 256 (except control characters, and so on)
+          are considered printable. unicode means that all printable
+          characters in all Unicode character ranges are considered printable
+          by the I/O functions.

+        
By default, Erlang is started so that only the latin1 range
+          of characters indicate that a list of integers is a string.

+        
The simplest way to use the setting is to call
+          
+          io_lib:printable_list/1, which uses the return
+          value of this function to decide if a list is a string of printable
+          characters.

+        
+          
In a future release, this function may return more values and
+            ranges. To avoid compatibility problems, it is recommended to use
+            function 
+            io_lib:printable_list/1.

+      
+    
+
+    
+      
+      
+      Write a list of characters.
+      
+        
Writes the characters of CharData to the I/O
+          server (IoDevice).

+      
+    
+
+    
+      
+      
+      Read a term.
+      
+      
+        
Reads a term Term from the standard input
+          (IoDevice), prompting it with
+          Prompt.

+        
The function returns:

+        
+          {ok, Term}
+          
+            
The parsing was successful.

+          
+          eof
+          
+            
End of file was encountered.

+          
+          {error, ErrorInfo}
+          
+            
The parsing failed.

+          
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

+          
+        
+      
+    
+
+    
+      
+      
+      Read a term.
+      
+      
+        
Reads a term Term from
+          IoDevice, prompting it
+          with Prompt. Reading starts at location
+          StartLocation. Argument
+          Options is passed on as argument Options
+          of function 
+          erl_scan:tokens/4.

+        
The function returns:

+        
+          {ok, Term, EndLocation}
+          
+            
The parsing was successful.

+          
+          {eof, EndLocation}
+          
+            
End of file was encountered.

+          
+          {error, ErrorInfo,
+            ErrorLocation}
+          
+            
The parsing failed.

+          
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

+          
+        
+      
+    
+
+    
+      
+      
+      Get the number of rows of an I/O device.
+      
+          
Retrieves the number of rows of IoDevice
+          (that is, the height of a terminal). The function
+          only succeeds for terminal devices, for all other I/O devices
+          the function returns {error, enotsup}.

+      
+    
+
+    
+      
+      
+      
+      
+      Read and tokenize Erlang expressions.
+      
+      
+        
Reads data from the standard input (IoDevice),
+          prompting it with Prompt. Reading starts at location
+          StartLocation (1). Argument Options
+          is passed on as argument Options of function
+          
+          erl_scan:tokens/4. The data is tokenized as if it
+          were a sequence of Erlang expressions until a final dot (.) is
+          reached. This token is also returned.

+        
The function returns:

+        
+          {ok, Tokens, EndLocation}
+          
+            
The tokenization succeeded.

+          
+          {eof, EndLocation}
+          
+            
End of file was encountered by the tokenizer.

+          
+          eof
+          
+            
End of file was encountered by the I/O server.

+          
+          {error, ErrorInfo, ErrorLocation}
+          
+            
An error occurred while tokenizing.

+          
+          {error, ErrorDescription}
+          
+            
Other (rare) error condition, such as {error, estale}
+              if reading from an NFS file system.

+          
+        
+        
Example:

+        
+23> io:scan_erl_exprs('enter>').
+enter>abc(), "hey".
+{ok,[{atom,1,abc},{'(',1},{')',1},{',',1},{string,1,"hey"},{dot,1}],2}
+24> io:scan_erl_exprs('enter>').
+enter>1.0er.
+{error,{1,erl_scan,{illegal,float}},2}

+      
+    
+
+    
+      
+      
+      
+      
+      Read and tokenize an Erlang form.
+      
+      
+        
Reads data from the standard input (IoDevice),
+          prompting it with Prompt. Starts reading
+          at location StartLocation (1).
+          Argument Options is passed on as argument
+          Options of function 
+          erl_scan:tokens/4. The data is tokenized as if it
+          was an Erlang form (one of the valid Erlang expressions in an
+          Erlang source file) until a final dot (.) is reached.
+          This last token is also returned.

+        
The return values are the same as for
+          
+          scan_erl_exprs/1,2,3,4.

+      
+    
+
+    
+      
+      
+      Set options.
+      
+        
Set options for the standard I/O device
+          (IoDevice).

+        
Possible options and values vary depending on the
+          I/O device. For a list of supported options and their current values
+          on a specific I/O device, use function
+          getopts/1.

+        
The options and values supported by the OTP I/O devices
+          are as follows:

+        
+          binary, list, or {binary, boolean()}
+          
+            
If set in binary mode (binary or {binary, true}),
+              the I/O server sends binary data (encoded in UTF-8) as answers
+              to the get_line, get_chars, and, if possible,
+              get_until requests (for details, see section
+              The Erlang I/O Protocol)
+              in the User's Guide). The immediate effect is that
+              get_chars/2,3 and
+              get_line/1,2
+              return UTF-8 binaries instead of lists of characters
+              for the affected I/O device.

+            
By default, all I/O devices in OTP are set in list mode.
+              However, the I/O functions can handle any of these modes and so
+              should other, user-written, modules behaving as clients to I/O
+              servers.

+            
This option is supported by the standard shell
+              (group.erl), the 'oldshell' (user.erl), and the
+              file I/O servers.

+          
+          {echo, boolean()}
+          
+            
Denotes if the terminal is to echo input. Only supported for
+              the standard shell I/O server (group.erl)

+          
+          {expand_fun, expand_fun()}
+          
+            
Provides a function for tab-completion (expansion)
+              like the Erlang shell. This function is called
+              when the user presses the Tab key. The expansion is
+              active when calling line-reading functions, such as
+              get_line/1,2.

+            
The function is called with the current line, up to
+              the cursor, as a reversed string. It is to return a
+              three-tuple: {yes|no, string(), [string(), ...]}. The
+              first element gives a beep if no, otherwise the
+              expansion is silent; the second is a string that will be
+              entered at the cursor position; the third is a list of
+              possible expansions. If this list is not empty,
+              it is printed and the current input line is written
+              once again.

+            
Trivial example (beep on anything except empty line, which
+              is expanded to "quit"):

+            
+fun("") -> {yes, "quit", []};
+   (_) -> {no, "", ["quit"]} end
+            
This option is only supported by the standard shell
+              (group.erl).

+          
+          {encoding, latin1 | unicode}
+          
+            
Specifies how characters are input or output from or to the I/O
+              device, implying that, for example, a terminal is set to handle
+              Unicode input and output or a file is set to handle UTF-8 data
+              encoding.

+            
The option does not affect how data is returned from the
+              I/O functions or how it is sent in the I/O protocol, it only
+              affects how the I/O device is to handle Unicode characters to the
+              "physical" device.

+            
The standard shell is set for unicode or latin1
+              encoding when
+              the system is started. The encoding is set with the help of the
+              LANG or LC_CTYPE environment variables on Unix-like
+              system or by other means on other systems.
+              So, the user can input Unicode characters and the I/O device
+              is in {encoding, unicode} mode if the I/O device supports
+              it. The mode can be changed, if the assumption of the runtime
+              system is wrong, by setting this option.

+            
The I/O device used when Erlang is started with the "-oldshell"
+              or "-noshell" flags is by default set to latin1 encoding,
+              meaning that any characters > codepoint 255 are escaped
+              and that input is expected to be plain 8-bit ISO Latin-1.
+              If the encoding is changed to Unicode, input and output from
+              the standard file descriptors are in UTF-8 (regardless of
+              operating system).

+            
Files can also be set in {encoding, unicode}, meaning
+              that data is written and read as UTF-8. More encodings are
+              possible for files, see below.

+            
{encoding, unicode | latin1} is supported by both the
+              standard shell (group.erl including werl on
+              Windows), the 'oldshell' (user.erl), and the file I/O
+              servers.

+          
+          {encoding, utf8 | utf16 | utf32 | {utf16,big} |
+            {utf16,little} | {utf32,big} | {utf32,little}}
+          
+            
For disk files, the encoding can be set to various UTF variants.
+              This has the effect that data is expected to be read as the
+              specified encoding from the file, and the data is written in the
+              specified encoding to the disk file.

+            
{encoding, utf8} has the same effect as
+              {encoding, unicode} on files.

+            
The extended encodings are only supported on disk files
+              (opened by function
+              
+              file:open/2).

+          
         
       
     
+
+    
+      
+      
+      Write a term.
+      
+        
Writes term Term to the standard output
+          (IoDevice).

+      
+    
   
 
   

     Standard Input/Output
-    
All Erlang processes have a default standard IO device. This
+    
All Erlang processes have a default standard I/O device. This
       device is used when no IoDevice argument is specified in
-      the above function calls. However, it is sometimes desirable to
-      use an explicit IoDevice argument which refers to the
-      default IO device. This is the case with functions that can
-      access either a file or the default IO device. The atom
+      the function calls in this module. However, it is sometimes desirable to
+      use an explicit IoDevice argument that refers to the
+      default I/O device. This is the case with functions that can
+      access either a file or the default I/O device. The atom
       standard_io has this special meaning. The following example
       illustrates this:

+
     
 27> io:read('enter>').
 enter>foo.
@@ -1047,30 +1170,37 @@ enter>foo.
 28> io:read(standard_io, 'enter>').
 enter>bar.
 {ok,bar}

+
     
There is always a process registered under the name of
       user. This can be used for sending output to the user.

   

+
  

     Standard Error
-    
In certain situations, especially when the standard output is redirected, access to an I/O-server specific for error messages might be convenient. The IO device standard_error can be used to direct output to whatever the current operating system considers a suitable IO device for error output. Example on a Unix-like operating system:

+    
In certain situations, especially when the standard output is
+      redirected, access to an I/O server specific for error messages can be
+      convenient. The I/O device standard_error can be used to direct
+      output to whatever the current operating system considers a suitable
+      I/O device for error output. Example on a Unix-like operating system:

+
 
 $ erl -noshell -noinput -eval 'io:format(standard_error,"Error: ~s~n",["error 11"]),'\
 'init:stop().' > /dev/null
 Error: error 11

-
-
-
   

 
   

     Error Information
-    
The ErrorInfo mentioned above is the standard
-      ErrorInfo structure which is returned from all IO modules.
-      It has the format:

+    
The ErrorInfo mentioned in this module is the standard
+      ErrorInfo structure that is returned from all I/O modules.
+      It has the following format:

+
     
 {ErrorLocation, Module, ErrorDescriptor}
-    
A string which describes the error is obtained with the following
+
+    
A string that describes the error is obtained with the following
       call:

+
     
 Module:format_error(ErrorDescriptor)
   

diff --git a/lib/stdlib/doc/src/io_lib.xml b/lib/stdlib/doc/src/io_lib.xml
index b22ec15a0c..931e50f6f2 100644
--- a/lib/stdlib/doc/src/io_lib.xml
+++ b/lib/stdlib/doc/src/io_lib.xml
@@ -29,14 +29,16 @@
io_lib - IO Library Functions + I/O library functions.

This module contains functions for converting to and from strings (lists of characters). They are used for implementing the - functions in the io module. There is no guarantee that the + functions in the io module. + There is no guarantee that the character lists returned from some of the functions are flat, - they can be deep lists. lists:flatten/1 can be used for - flattening deep lists.

+ they can be deep lists. Function + lists:flatten/1 + can be used for flattening deep lists.

 @@ -45,7 +47,8 @@ -

A continuation as returned by fread/3.

+

A continuation as returned by + fread/3.

 @@ -62,338 +65,377 @@ -

Description:

+

Where:

control_char is the type of control - sequence: $P, $w, and so on;

+ sequence: $P, $w, and so on.

args is a list of the arguments used by the control sequence, or an empty list if the control sequence - does not take any arguments;

+ does not take any arguments.

 -

width is the field width;

+

width is the field width.

 -

adjust is the adjustment;

+

adjust is the adjustment.

precision is the precision of the printed - argument;

+ argument.

 -

pad_char is the padding character;

+

pad_char is the padding character.

 -

encoding is set to true if the translation - modifier t is present;

+

encoding is set to true if translation + modifier t is present.

 -

strings is set to false if the modifier +

strings is set to false if modifier l is present.

 + - - Write a newline + + Build the output text for a preparsed format list. -

Returns a character list which represents a new line - character.

+

For details, see + scan_format/2.

 + - - - Write a term + + Test for a list of characters. -

Returns a character list which represents Term. The - Depth (-1) argument controls the depth of the - structures written. When the specified depth is reached, - everything below this level is replaced by "...". For - example:

- 
-1> lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9})).
-"{1,[2],[3],[4,5],6,7,8,9}"
-2> lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9}, 5)).
-"{1,[2],[3],[...],...}"
+

Returns true if Term is a flat list of + characters in the Unicode range, otherwise false.

 + - - - Pretty print a term + + Test for a deep list of characters. -

Also returns a list of characters which represents - Term, but breaks representations which are longer than - one line into many lines and indents each line sensibly. It - also tries to detect and output lists of printable characters - as strings. Column is the starting column (1), - LineLength the maximum line length (80), and - Depth (-1) the maximum print depth.

+

Returns true if Term is a, possibly deep, + list of characters in the Unicode range, otherwise false.

 + - - - Write formatted output + + Test for a deep list of characters. -

Returns a character list which represents Data - formatted in accordance with Format. See - io:fwrite/1,2,3 for a detailed - description of the available formatting options. A fault is - generated if there is an error in the format string or - argument list.

+

Returns true if Term is a, possibly deep, + list of characters in the ISO Latin-1 range, otherwise + false.

+ + -

If (and only if) the Unicode translation modifier is used - in the format string (i.e. ~ts or ~tc), the resulting list - may contain characters beyond the ISO-latin-1 character - range (in other words, numbers larger than 255). If so, the - result is not an ordinary Erlang string(), but can well be - used in any context where Unicode data is allowed.

- + + + + Write formatted output. + +

Returns a character list that represents Data + formatted in accordance with Format. + For a detailed description of the available formatting options, see + io:fwrite/1,2,3. + If the format string or argument list contains an error, a fault is + generated.

+

If and only if the Unicode translation modifier is used in the + format string (that is, ~ts or ~tc), the resulting list + can contain characters beyond the ISO Latin-1 character range + (that is, numbers > 255). If so, the + result is not an ordinary Erlang string(), but can well be + used in any context where Unicode data is allowed.

 + - Read formatted input + Read formatted input. -

Tries to read String in accordance with the control - sequences in Format. See - io:fread/3 for a detailed - description of the available formatting options. It is - assumed that String contains whole lines. It returns:

+

Tries to read String in accordance with the + control sequences in Format. + For a detailed description of the available formatting options, see + io:fread/3. It is + assumed that String contains whole lines.

+

The function returns:

- {ok, InputList, LeftOverChars} + {ok, InputList, + LeftOverChars} -

The string was read. InputList is the list of - successfully matched and read items, and - LeftOverChars are the input characters not used.

+

The string was read. InputList is the list + of successfully matched and read items, and + LeftOverChars are the input characters not + used.

 - {more, RestFormat, Nchars, InputStack} + {more, RestFormat, Nchars, + InputStack} -

The string was read, but more input is needed in order - to complete the original format string. RestFormat - is the remaining format string, Nchars the number +

The string was read, but more input is needed to complete the + original format string. RestFormat is the + remaining format string, Nchars is the number of characters scanned, and InputStack is the reversed list of inputs matched up to that point.

 {error, What} -

The read operation failed and the parameter What +

The read operation failed and parameter What gives a hint about the error.

 -

Example:

+

Example:

 3> io_lib:fread("~f~f~f", "15.6 17.3e-6 24.5").
 {ok,[15.6,1.73e-5,24.5],[]}
 + Re-entrant formatted reader

This is the re-entrant formatted reader. The continuation of - the first call to the functions must be []. Refer to - Armstrong, Virding, Williams, 'Concurrent Programming in - Erlang', Chapter 13 for a complete description of how the - re-entrant input scheme works.

+ the first call to the functions must be []. For a complete + description of how the re-entrant input scheme works, see + Armstrong, Virding, Williams: 'Concurrent Programming in + Erlang', Chapter 13.

The function returns:

- {done, Result, LeftOverChars} + {done, Result, + LeftOverChars} -

The input is complete. The result is one of the - following:

+

The input is complete. The result is one of the following:

{ok, InputList} -

The string was read. InputList is the list of - successfully matched and read items, and - LeftOverChars are the remaining characters.

+

The string was read. InputList is the + list of successfully matched and read items, and + LeftOverChars are the remaining + characters.

 eof -

End of file has been encountered. +

End of file was encountered. LeftOverChars are the input characters not used.

 {error, What} -

An error occurred and the parameter What gives - a hint about the error.

+

An error occurred and parameter What + gives a hint about the error.

 {more, Continuation}

More data is required to build a term. - Continuation must be passed to fread/3, + Continuation must be passed to fread/3 when more data becomes available.

 + - - Write an atom + + Indentation after printing string. -

Returns the list of characters needed to print the atom - Atom.

+

Returns the indentation if String has been + printed, starting at StartIndent.

 + - - Write a string + + Test for a list of ISO Latin-1 characters. -

Returns the list of characters needed to print - String as a string.

+

Returns true if Term is a flat list of + characters in the ISO Latin-1 range, otherwise false.

 + - - Write a string + + Write a newline. -

Returns the list of characters needed to print - String as a string. Non-Latin-1 - characters are escaped.

+

Returns a character list that represents a new line character.

 + - - Write an ISO-latin-1 string + + + Pretty print a term. -

Returns the list of characters needed to print - Latin1String as a string.

+

Returns a list of characters that represents + Term, but breaks representations longer + than one line into many lines and indents each line sensibly. + Also tries to detect and output lists of printable characters + as strings.

+ + Column is the starting column; defaults + to 1. + LineLength is the maximum line length; + defaults to 80. + Depth is the maximum print depth; + defaults to -1, which means no limitation. + + - - Write a character + + Test for a list of printable ISO Latin-1 characters. -

Returns the list of characters needed to print a character - constant in the Unicode character set.

+

Returns true if Term is a flat list of + printable ISO Latin-1 characters, otherwise false.

 + - - Write a character + + Test for a list of printable characters. -

Returns the list of characters needed to print a character - constant in the Unicode character set. Non-Latin-1 characters - are escaped.

+

Returns true if Term is a flat list of + printable characters, otherwise false.

+

What is a printable character in this case is determined by + startup flag +pc to the Erlang VM; see + + io:printable_range/0 and + erl(1).

 + - - Write an ISO-latin-1 character + + Test for a list of printable Unicode characters. -

Returns the list of characters needed to print a character - constant in the ISO-latin-1 character set.

+

Returns true if Term is a flat list of + printable Unicode characters, otherwise false.

 + - Parse all control sequences in the format string + Parse all control sequences in the format string. -

Returns a list corresponding to the given format string, +

Returns a list corresponding to the specified format string, where control sequences have been replaced with - corresponding tuples. This list can be passed to io_lib:build_text/1 to have - the same effect as io_lib:format(Format, Args), or to - io_lib:unscan_format/1 - in order to get the corresponding pair of Format and - Args (with every * and corresponding argument - expanded to numeric values).

+ corresponding tuples. This list can be passed to:

+ + +

build_text/1 + to have the same effect as format(Format, Args)

+ + +

+ unscan_format/1 to get the corresponding pair + of Format and Args (with every * and + corresponding argument expanded to numeric values)

+ +

A typical use of this function is to replace unbounded-size control sequences like ~w and ~p with the depth-limited variants ~W and ~P before - formatting to text, e.g. in a logger.

+ formatting to text in, for example, a logger.

 + - Revert a pre-parsed format list to a plain character list - and a list of arguments - -

See io_lib:scan_format/2 for - details.

- - - - - Build the output text for a pre-parsed format list + Revert a preparsed format list to a plain character list + and a list of arguments. -

See io_lib:scan_format/2 for - details.

+

For details, see + scan_format/2.

 + - - Indentation after printing string + + + Write a term. -

Returns the indentation if String has been printed, - starting at StartIndent.

+

Returns a character list that represents Term. + Argument Depth controls the depth of the + structures written. When the specified depth is reached, + everything below this level is replaced by "...". + Depth defaults to -1, which means + no limitation.

+

Example:

+ 
+1> lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9})).
+"{1,[2],[3],[4,5],6,7,8,9}"
+2> lists:flatten(io_lib:write({1,[2],[3],[4,5],6,7,8,9}, 5)).
+"{1,[2],[3],[...],...}"
 + - - Test for a list of characters + + Write an atom. -

Returns true if Term is a flat list of - characters in the Unicode range, otherwise it returns false.

+

Returns the list of characters needed to print atom + Atom.

 + - - Test for a list of ISO-latin-1 characters + + Write a character. -

Returns true if Term is a flat list of - characters in the ISO-latin-1 range, otherwise it returns false.

+

Returns the list of characters needed to print a character + constant in the Unicode character set.

 + - - Test for a deep list of characters + + Write a character. -

Returns true if Term is a, possibly deep, list - of characters in the Unicode range, otherwise it returns false.

+

Returns the list of characters needed to print a character + constant in the Unicode character set. Non-Latin-1 characters + are escaped.

 + - - Test for a deep list of characters + + Write an ISO Latin-1 character. -

Returns true if Term is a, possibly deep, list - of characters in the ISO-latin-1 range, otherwise it returns false.

+

Returns the list of characters needed to print a character + constant in the ISO Latin-1 character set.

 + - - Test for a list of printable characters + + Write an ISO Latin-1 string. -

Returns true if Term is a flat list of - printable characters, otherwise it returns false.

-

What is a printable character in this case is determined by the - +pc start up flag to the Erlang VM. See - io:printable_range/0 - and erl(1).

+

Returns the list of characters needed to print + Latin1String as a string.

 + - - Test for a list of printable ISO-latin-1 characters + + Write a string. -

Returns true if Term is a flat list of - printable ISO-latin-1 characters, otherwise it returns false.

+

Returns the list of characters needed to print + String as a string.

 + - - Test for a list of printable Unicode characters + + Write a string. -

Returns true if Term is a flat list of - printable Unicode characters, otherwise it returns false.

+

Returns the list of characters needed to print + String as a string. Non-Latin-1 + characters are escaped.

 diff --git a/lib/stdlib/doc/src/io_protocol.xml b/lib/stdlib/doc/src/io_protocol.xml index f2a669a49a..84b5f62c7f 100644 --- a/lib/stdlib/doc/src/io_protocol.xml +++ b/lib/stdlib/doc/src/io_protocol.xml @@ -23,7 +23,7 @@ - The Erlang I/O-protocol + The Erlang I/O Protocol Patrik Nyblom @@ -34,183 +34,217 @@ io_protocol.xml
- -

The I/O-protocol in Erlang specifies a way for a client to communicate -with an I/O server and vice versa. The I/O server is a process that handles -the requests and performs the requested task on e.g. an IO device. The -client is any Erlang process wishing to read or write data from/to the -IO device.

- -

The common I/O-protocol has been present in OTP since the -beginning, but has been fairly undocumented and has also somewhat -evolved over the years. In an addendum to Robert Virdings rationale -the original I/O-protocol is described. This document describes the -current I/O-protocol.

- -

The original I/O-protocol was simple and flexible. Demands for spacial -and execution time efficiency has triggered extensions to the protocol -over the years, making the protocol larger and somewhat less easy to -implement than the original. It can certainly be argued that the -current protocol is too complex, but this text describes how it looks -today, not how it should have looked.

- -

The basic ideas from the original protocol still hold. The I/O server -and client communicate with one single, rather simplistic protocol and -no server state is ever present in the client. Any I/O server can be -used together with any client code and client code need not be aware -of the actual IO device the I/O server communicates with.

- -
-Protocol Basics - -

As described in Robert's paper, I/O servers and clients communicate using -io_request/io_reply tuples as follows:

- -

{io_request, From, ReplyAs, Request}
-{io_reply, ReplyAs, Reply}

- -

The client sends an io_request tuple to the I/O server and -the server eventually sends a corresponding io_reply tuple.

- - -From is the pid() of the client, the process which -the I/O server sends the IO reply to. - -ReplyAs can be any datum and is returned in the corresponding -io_reply. The io module monitors -the I/O server, and uses the monitor reference as the ReplyAs datum. -A more complicated client -could have several outstanding I/O requests to the same I/O server and -would then use different references (or something else) to differentiate among -the incoming IO replies. The ReplyAs element should be considered -opaque by the I/O server. Note that the pid() of the I/O server is not -explicitly present in the io_reply tuple. The reply can be sent from any -process, not necessarily the actual I/O server. The ReplyAs element is -the only thing that connects one I/O request with an I/O-reply. - -Request and Reply are described below. - - -

When an I/O server receives an io_request tuple, it acts upon the actual -Request part and eventually sends an io_reply tuple with the corresponding -Reply part.

-
-
-Output Requests - -

To output characters on an IO device, the following Requests exist:

- -

-{put_chars, Encoding, Characters}
-{put_chars, Encoding, Module, Function, Args} -

- -Encoding is either unicode or latin1, meaning that the - characters are (in case of binaries) encoded as either UTF-8 or - ISO-latin-1 (pure bytes). A well behaved I/O server should also - return error if list elements contain integers > 255 when - Encoding is set to latin1. Note that this does not in any way tell - how characters should be put on the actual IO device or how the - I/O server should handle them. Different I/O servers may handle the - characters however they want, this simply tells the I/O server which - format the data is expected to have. In the Module/Function/Args - case, Encoding tells which format the designated function - produces. Note that byte-oriented data is simplest sent using the ISO-latin-1 - encoding. - -Characters are the data to be put on the IO device. If Encoding is - latin1, this is an iolist(). If Encoding is unicode, this is an - Erlang standard mixed Unicode list (one integer in a list per - character, characters in binaries represented as UTF-8). - -Module, Function, and Args denote a function which will be called to - produce the data (like io_lib:format/2). Args is a list of arguments - to the function. The function should produce data in the given - Encoding. The I/O server should call the function as - apply(Mod, Func, Args) and will put the returned data on the IO device as if it was sent - in a {put_chars, Encoding, Characters} request. If the function - returns anything else than a binary or list or throws an exception, - an error should be sent back to the client. - - -

The I/O server replies to the client with an io_reply tuple where the Reply -element is one of:

-

-ok
-{error, Error} -

- - -Error describes the error to the client, which may do whatever - it wants with it. The Erlang io - module typically returns it as is. - - -

For backward compatibility the following Requests should also be -handled by an I/O server (these requests should not be present after -R15B of OTP):

-

-{put_chars, Characters}
-{put_chars, Module, Function, Args} -

- -

These should behave as {put_chars, latin1, Characters} and -{put_chars, latin1, Module, Function, Args} respectively.

-
-
-Input Requests - -

To read characters from an IO device, the following Requests exist:

- -

{get_until, Encoding, Prompt, Module, Function, ExtraArgs}

- - -Encoding denotes how data is to be sent back to the client and - what data is sent to the function denoted by - Module/Function/ExtraArgs. If the function supplied returns data as a - list, the data is converted to this encoding. If however the - function supplied returns data in some other format, no conversion - can be done and it is up to the client supplied function to return - data in a proper way. If Encoding is latin1, lists of integers - 0..255 or binaries containing plain bytes are sent back to the - client when possible; if Encoding is unicode, lists with integers in - the whole Unicode range or binaries encoded in UTF-8 are sent to the - client. The user supplied function will always see lists of integers, never - binaries, but the list may contain numbers > 255 if the Encoding is - unicode. - -Prompt is a list of characters (not mixed, no binaries) or an atom - to be output as a prompt for input on the IO device. Prompt is - often ignored by the I/O server and if set to '' it should always - be ignored (and result in nothing being written to the IO device). - -

Module, Function, and ExtraArgs denote a function and arguments to - determine when enough data is written. The function should take two - additional arguments, the last state, and a list of characters. The - function should return one of:

-

-{done, Result, RestChars}
-{more, Continuation} -

-

The Result can be any Erlang term, but if it is a list(), the - I/O server may convert it to a binary() of appropriate format before - returning it to the client, if the I/O server is set in binary mode (see - below).

- -

The function will be called with the data the I/O server finds on - its IO device, returning {done, Result, RestChars} when enough data is - read (in which case Result is sent to the client and RestChars is - kept in the I/O server as a buffer for subsequent input) or - {more, Continuation}, indicating that more characters are needed to - complete the request. The Continuation will be sent as the state in - subsequent calls to the function when more characters are - available. When no more characters are available, the function - shall return {done, eof, Rest}. - The initial state is the empty list and the data when an - end of file is reached on the IO device is the atom eof. An emulation - of the get_line request could be (inefficiently) implemented using - the following functions:

- +

The I/O protocol in Erlang enables bi-directional communication between + clients and servers.

+ + + +

The I/O server is a process that handles the requests and performs + the requested task on, for example, an I/O device.

+ + +

The client is any Erlang process wishing to read or write data from/to + the I/O device.

+ + + +

The common I/O protocol has been present in OTP since the beginning, but + has been undocumented and has also evolved over the years. In an + addendum to Robert Virding's rationale, the original I/O protocol is + described. This section describes the current I/O protocol.

+ +

The original I/O protocol was simple and flexible. Demands for memory + efficiency and execution time efficiency have triggered extensions + to the protocol over the years, making the protocol larger and somewhat + less easy to implement than the original. It can certainly be argued that + the current protocol is too complex, but this section describes how it + looks today, not how it should have looked.

+ +

The basic ideas from the original protocol still hold. The I/O server + and client communicate with one single, rather simplistic protocol and no + server state is ever present in the client. Any I/O server can be used + together with any client code, and the client code does not need to be + aware of the I/O device that the I/O server communicates with.

+ +
+ Protocol Basics +

As described in Robert's paper, I/O servers and clients communicate + using io_request/io_reply tuples as follows:

+ + 
+{io_request, From, ReplyAs, Request}
+{io_reply, ReplyAs, Reply}
+ +

The client sends an io_request tuple to the I/O server and the + server eventually sends a corresponding io_reply tuple.

+ + + +

From is the pid() of the client, the process which + the I/O server sends the I/O reply to.

+ + +

ReplyAs can be any datum and is returned in the + corresponding io_reply. The + io module monitors the + the I/O server and uses the monitor reference as the ReplyAs + datum. A more complicated client can have many outstanding I/O + requests to the same I/O server and can use different references (or + something else) to differentiate among the incoming I/O replies. + Element ReplyAs is to be considered opaque by the I/O + server.

+

Notice that the pid() of the I/O server is not explicitly + present in tuple io_reply. The reply can be sent from any + process, not necessarily the actual I/O server.

+ + +

Request and Reply are described below.

+ + + +

When an I/O server receives an io_request tuple, it acts upon the + Request part and eventually sends an io_reply tuple with + the corresponding Reply part.

+
+ +
+ Output Requests +

To output characters on an I/O device, the following Requests + exist:

+ + 
+{put_chars, Encoding, Characters}
+{put_chars, Encoding, Module, Function, Args}
+ + + +

Encoding is unicode or latin1, meaning that the + characters are (in case of binaries) encoded as UTF-8 or ISO Latin-1 + (pure bytes). A well-behaved I/O server is also to return an error + indication if list elements contain integers > 255 + when Encoding is set to latin1.

+

Notice that this does not in any way tell how characters are to be + put on the I/O device or handled by the I/O server. Different I/O + servers can handle the characters however they want, this only tells + the I/O server which format the data is expected to have. In the + Module/Function/Args case, Encoding tells + which format the designated function produces.

+

Notice also that byte-oriented data is simplest sent using the ISO + Latin-1 encoding.

+ + +

Characters are the data to be put on the I/O device. If + Encoding is latin1, this is an iolist(). If + Encoding is unicode, this is an Erlang standard mixed + Unicode list (one integer in a list per character, characters in + binaries represented as UTF-8).

+ + +

Module, Function, and Args denote a function + that is called to produce the data (like + io_lib:format/2). +

+

Args is a list of arguments to the function. The function is + to produce data in the specified Encoding. The I/O server is + to call the function as apply(Mod, Func, Args) and put the + returned data on the I/O device as if it was sent in a + {put_chars, Encoding, Characters} request. If the function + returns anything else than a binary or list, or throws an exception, + an error is to be sent back to the client.

+ + + +

The I/O server replies to the client with an io_reply tuple, where + element Reply is one of:

+ + 
+ok
+{error, Error}
+ + + Error describes the error to the client, which can do + whatever it wants with it. The + io module typically + returns it "as is". + + +

For backward compatibility, the following Requests are also to be + handled by an I/O server (they are not to be present after + Erlang/OTP R15B):

+ + 
+{put_chars, Characters}
+{put_chars, Module, Function, Args}
+ +

These are to behave as {put_chars, latin1, Characters} and + {put_chars, latin1, Module, Function, Args}, respectively.

+
+ +
+ Input Requests +

To read characters from an I/O device, the following Requests + exist:

+ + 
+{get_until, Encoding, Prompt, Module, Function, ExtraArgs}
+ + + +

Encoding denotes how data is to be sent back to the client + and what data is sent to the function denoted by + Module/Function/ExtraArgs. If the function + supplied returns data as a list, the data is converted to this + encoding. If the function supplied returns data in some other format, + no conversion can be done, and it is up to the client-supplied + function to return data in a proper way.

+

If Encoding is latin1, lists of integers 0..255 + or binaries containing plain bytes are sent back to the client when + possible. If Encoding is unicode, lists with integers + in the whole Unicode range or binaries encoded in UTF-8 are sent to + the client. The user-supplied function always sees lists of + integers, never binaries, but the list can contain numbers > 255 + if Encoding is unicode.

+ + +

Prompt is a list of characters (not mixed, no binaries) or an + atom to be output as a prompt for input on the I/O device. + Prompt is often ignored by the I/O server; if set to '', + it is always to be ignored (and results in nothing being written to + the I/O device).

+ + +

Module, Function, and ExtraArgs denote a + function and arguments to determine when enough data is written. The + function is to take two more arguments, the last state, and a list of + characters. The function is to return one of:

+ 
+{done, Result, RestChars}
+{more, Continuation}
+

Result can be any Erlang term, but if it is a list(), + the I/O server can convert it to a binary() of appropriate + format before returning it to the client, if the I/O server is set in + binary mode (see below).

+

The function is called with the data the I/O server finds on its I/O + device, returning one of:

+ + +

{done, Result, RestChars} when enough data is read. In + this case Result is sent to the client and RestChars + is kept in the I/O server as a buffer for later input.

+ + +

{more, Continuation}, which indicates that more + characters are needed to complete the request.

+ + +

Continuation is sent as the state in later calls to the + function when more characters are available. When no more characters + are available, the function must return {done, eof, Rest}. The + initial state is the empty list. The data when an end of file is + reached on the IO device is the atom eof.

+

An emulation of the get_line request can be (inefficiently) + implemented using the following functions:

+ -module(demo). -export([until_newline/3, get_line/1]). @@ -234,226 +268,253 @@ get_line(IoServer) -> receive {io_reply, IoServer, Data} -> Data - end. - -

Note especially that the last element in the Request tuple ([$\n]) - is appended to the argument list when the function is called. The - function should be called like - apply(Module, Function, [ State, Data | ExtraArgs ]) by the I/O server

- - - -

A fixed number of characters is requested using this Request:

-

-{get_chars, Encoding, Prompt, N} -

- - -Encoding and Prompt as for get_until. - -N is the number of characters to be read from the IO device. - - -

A single line (like in the example above) is requested with this Request:

-

-{get_line, Encoding, Prompt} -

- - -Encoding and Prompt as above. - - -

Obviously, the get_chars and get_line could be implemented with the -get_until request (and indeed they were originally), but demands for -efficiency has made these additions necessary.

- -

The I/O server replies to the client with an io_reply tuple where the Reply -element is one of:

-

-Data
-eof
-{error, Error} -

- - -Data is the characters read, in either list or binary form - (depending on the I/O server mode, see below). -Error describes the error to the client, which may do whatever it - wants with it. The Erlang io - module typically returns it as is. -eof is returned when input end is reached and no more data is -available to the client process. - - -

For backward compatibility the following Requests should also be -handled by an I/O server (these reqeusts should not be present after -R15B of OTP):

- -

-{get_until, Prompt, Module, Function, ExtraArgs}
-{get_chars, Prompt, N}
-{get_line, Prompt}
-

- -

These should behave as {get_until, latin1, Prompt, Module, Function, -ExtraArgs}, {get_chars, latin1, Prompt, N} and {get_line, latin1, -Prompt} respectively.

-
-
-I/O-server Modes - -

Demands for efficiency when reading data from an I/O server has not -only lead to the addition of the get_line and get_chars requests, but -has also added the concept of I/O server options. No options are -mandatory to implement, but all I/O servers in the Erlang standard -libraries honor the binary option, which allows the Data element of the -io_reply tuple to be a binary instead of a list when possible. -If the data is sent as a binary, Unicode data will be sent in the -standard Erlang Unicode -format, i.e. UTF-8 (note that the function of the get_until request still gets -list data regardless of the I/O server mode).

- -

Note that i.e. the get_until request allows for a function with the data specified as always being a list. Also the return value data from such a function can be of any type (as is indeed the case when an io:fread request is sent to an I/O server). The client has to be prepared for data received as answers to those requests to be in a variety of forms, but the I/O server should convert the results to binaries whenever possible (i.e. when the function supplied to get_until actually returns a list). The example shown later in this text does just that.

- -

An I/O-server in binary mode will affect the data sent to the client, -so that it has to be able to handle binary data. For convenience, it -is possible to set and retrieve the modes of an I/O server using the -following I/O requests:

- -

-{setopts, Opts} -

- - - -Opts is a list of options in the format recognized by proplists (and - of course by the I/O server itself). - -

As an example, the I/O server for the interactive shell (in group.erl) -understands the following options:

-

-{binary, boolean()} (or binary/list)
-{echo, boolean()}
-{expand_fun, fun()}
-{encoding, unicode/latin1} (or unicode/latin1) -

- -

- of which the binary and encoding options are common for all -I/O servers in OTP, while echo and expand are valid only for this -I/O server. It is worth noting that the unicode option notifies how -characters are actually put on the physical IO device, i.e. if the -terminal per se is Unicode aware, it does not affect how characters -are sent in the I/O-protocol, where each request contains encoding -information for the provided or returned data.

- -

The I/O server should send one of the following as Reply:

-

-ok
-{error, Error} -

- -

An error (preferably enotsup) is to be expected if the option is -not supported by the I/O server (like if an echo option is sent in a -setopts request to a plain file).

- -

To retrieve options, this request is used:

-

-getopts -

- -

The getopts request asks for a complete list of all options -supported by the I/O server as well as their current values.

- -

The I/O server replies:

-

-OptList
-{error, Error} -

- - -OptList is a list of tuples {Option, Value} where Option is always - an atom. - -
-
-Multiple I/O Requests - -

The Request element can in itself contain several Requests by using -the following format:

-

-{requests, Requests} -

- -Requests is a list of valid io_request tuples for the protocol, they - shall be executed in the order in which they appear in the list and - the execution should continue until one of the requests result in an - error or the list is consumed. The result of the last request is - sent back to the client. - - -

The I/O server can for a list of requests send any of the valid results in -the reply:

- -

-ok
-{ok, Data}
-{ok, Options}
-{error, Error} -

-

- depending on the actual requests in the list.

-
-
-Optional I/O Requests - -

The following I/O request is optional to implement and a client -should be prepared for an error return:

-

-{get_geometry, Geometry} -

- -Geometry is either the atom rows or the atom columns. - -

The I/O server should send the Reply as:

-

-{ok, N}
-{error, Error} -

- - -N is the number of character rows or columns the IO device has, if - applicable to the IO device the I/O server handles, otherwise {error, - enotsup} is a good answer. - -
-
-Unimplemented Request Types - -

If an I/O server encounters a request it does not recognize (i.e. the -io_request tuple is in the expected format, but the actual Request is -unknown), the I/O server should send a valid reply with the error tuple:

-

-{error, request} -

- -

This makes it possible to extend the protocol with optional requests -and for the clients to be somewhat backwards compatible.

-
-
-An Annotated and Working Example I/O Server - -

An I/O server is any process capable of handling the I/O protocol. There is -no generic I/O server behavior, but could well be. The framework is -simple enough, a process handling incoming requests, usually both -I/O-requests and other IO device-specific requests (for i.e. positioning, -closing etc.).

- -

Our example I/O server stores characters in an ETS table, making up a -fairly crude ram-file (it is probably not useful, but working).

- -

The module begins with the usual directives, a function to start the -I/O server and a main loop handling the requests:

- - + end. +

Notice that the last element in the Request tuple + ([$\n]) is appended to the argument list when the function is + called. The function is to be called like + apply(Module, Function, [ State, Data | ExtraArgs ]) by the + I/O server.

+ + + +

A fixed number of characters is requested using the following + Request:

+ + 
+{get_chars, Encoding, Prompt, N}
+ + + +

Encoding and Prompt as for get_until.

+ + +

N is the number of characters to be read from the I/O + device.

+ + + +

A single line (as in former example) is requested with the + following Request:

+ + 
+{get_line, Encoding, Prompt}
+ + + Encoding and Prompt as for get_until. + + +

Clearly, get_chars and get_line could be implemented with + the get_until request (and indeed they were originally), but + demands for efficiency have made these additions necessary.

+ +

The I/O server replies to the client with an io_reply tuple, where + element Reply is one of:

+ + 
+Data
+eof
+{error, Error}
+ + + +

Data is the characters read, in list or binary form + (depending on the I/O server mode, see the next section).

+ + +

eof is returned when input end is reached and no more data is + available to the client process.

+ + +

Error describes the error to the client, which can do + whatever it wants with it. The + io module typically + returns it as is.

+ + + +

For backward compatibility, the following Requests are also to be + handled by an I/O server (they are not to be present after + Erlang/OTP R15B):

+ + 
+{get_until, Prompt, Module, Function, ExtraArgs}
+{get_chars, Prompt, N}
+{get_line, Prompt}
+ +

These are to behave as + {get_until, latin1, Prompt, Module, Function, ExtraArgs}, + {get_chars, latin1, Prompt, N}, and + {get_line, latin1, Prompt}, respectively.

+
+ +
+ I/O Server Modes +

Demands for efficiency when reading data from an I/O server has not only + lead to the addition of the get_line and get_chars requests, + but has also added the concept of I/O server options. No options are + mandatory to implement, but all I/O servers in the Erlang standard + libraries honor the binary option, which allows element + Data of the io_reply tuple to be a binary instead of a list + when possible. If the data is sent as a binary, Unicode data is + sent in the standard Erlang Unicode format, that is, UTF-8 (notice that + the function of the get_until request still gets list data + regardless of the I/O server mode).

+ +

Notice that the get_until request allows for a function with the + data specified as always being a list. Also, the return value data from + such a function can be of any type (as is indeed the case when an + io:fread/2,3 + request is sent to an I/O server). + The client must be prepared for data received as + answers to those requests to be in various forms. However, the I/O + server is to convert the results to binaries whenever possible (that is, + when the function supplied to get_until returns a list). This is + done in the example in section + An Annotated and Working Example I/O Server. +

+ +

An I/O server in binary mode affects the data sent to the client, so that + it must be able to handle binary data. For convenience, the modes of an + I/O server can be set and retrieved using the following I/O requests:

+ + 
+{setopts, Opts}
+ + + Opts is a list of options in the format recognized by the + proplists module + (and by the I/O server). + + +

As an example, the I/O server for the interactive shell (in + group.erl) understands the following options:

+ + 
+{binary, boolean()} (or binary/list)
+{echo, boolean()}
+{expand_fun, fun()}
+{encoding, unicode/latin1} (or unicode/latin1)
+ +

Options binary and encoding are common for all I/O servers + in OTP, while echo and expand are valid only for this I/O + server. Option unicode notifies how characters are put on the + physical I/O device, that is, if the terminal itself is Unicode-aware. + It does not affect how characters are sent in the I/O protocol, where + each request contains encoding information for the provided or returned + data.

+ +

The I/O server is to send one of the following as Reply:

+ + 
+ok
+{error, Error}
+ +

An error (preferably enotsup) is to be expected if the option is + not supported by the I/O server (like if an echo option is sent in + a setopts request to a plain file).

+ +

To retrieve options, the following request is used:

+ + 
+getopts
+ +

This request asks for a complete list of all options supported by the + I/O server as well as their current values.

+ +

The I/O server replies:

+ + 
+OptList
+{error, Error}
+ + + OptList is a list of tuples {Option, Value}, where + Option always is an atom. + +
+ +
+ Multiple I/O Requests +

The Request element can in itself contain many Requests + by using the following format:

+ + 
+{requests, Requests}
+ + + Requests is a list of valid io_request tuples for the + protocol. They must be executed in the order that they appear in + the list. The execution is to continue until one of the requests results + in an error or the list is consumed. The result of the last request is + sent back to the client. + + +

The I/O server can, for a list of requests, send any of the following + valid results in the reply, depending on the requests in the list:

+ + 
+ok
+{ok, Data}
+{ok, Options}
+{error, Error}
+
+ +
+ Optional I/O Request +

The following I/O request is optional to implement and a client is to + be prepared for an error return:

+ + 
+{get_geometry, Geometry}
+ + + Geometry is the atom rows or the atom + columns. + + +

The I/O server is to send the Reply as:

+ + 
+{ok, N}
+{error, Error}
+ + + N is the number of character rows or columns that the I/O + device has, if applicable to the I/O device handled by the I/O server, + otherwise {error, enotsup} is a good answer. + +
+ +
+ Unimplemented Request Types +

If an I/O server encounters a request that it does not recognize (that + is, the io_request tuple has the expected format, but the + Request is unknown), the I/O server is to send a valid reply with + the error tuple:

+ + 
+{error, request}
+ +

This makes it possible to extend the protocol with optional requests + and for the clients to be somewhat backward compatible.

+
+ +
+ An Annotated and Working Example I/O Server + +

An I/O server is any process capable of handling the I/O protocol. There + is no generic I/O server behavior, but could well be. The framework is + simple, a process handling incoming requests, usually both I/O-requests + and other I/O device-specific requests (positioning, closing, and so on). +

+ +

The example I/O server stores characters in an ETS table, making + up a fairly crude RAM file.

+ +

The module begins with the usual directives, a function to start the + I/O server and a main loop handling the requests:

+ + -module(ets_io_server). -export([start_link/0, init/0, loop/1, until_newline/3, until_enough/3]). @@ -490,39 +551,34 @@ loop(State) -> ?MODULE:loop(State#state{position = 0}); _Unknown -> ?MODULE:loop(State) - end. - - -

The main loop receives messages from the client (which might be using -the io module to send requests). -For each request the function -request/2 is called and a reply is eventually sent using the reply/3 -function.

+ end. -

The "private" message {From, rewind} results in the -current position in the pseudo-file to be reset to 0 (the beginning of -the "file"). This is a typical example of IO device-specific -messages not being part of the I/O-protocol. It is usually a bad idea -to embed such private messages in io_request tuples, as that might be -confusing to the reader.

+

The main loop receives messages from the client (which can use the + the io module to send + requests). For each request, the function request/2 is called and a + reply is eventually sent using function reply/3.

-

Let us look at the reply function first...

+

The "private" message {From, rewind} results in the + current position in the pseudo-file to be reset to 0 (the beginning + of the "file"). This is a typical example of I/O device-specific + messages not being part of the I/O protocol. It is usually a bad idea to + embed such private messages in io_request tuples, as that can + confuse the reader.

- +

First, we examine the reply function:

+ reply(From, ReplyAs, Reply) -> - From ! {io_reply, ReplyAs, Reply}. + From ! {io_reply, ReplyAs, Reply}. - +

It sends the io_reply tuple back to the client, providing element + ReplyAs received in the request along with the result of the + request, as described earlier.

-

Simple enough, it sends the io_reply tuple back to the client, -providing the ReplyAs element received in the request along with the -result of the request, as described above.

+

We need to handle some requests. First the requests for writing + characters:

-

Now look at the different requests we need to handle. First the -requests for writing characters:

- - + request({put_chars, Encoding, Chars}, State) -> put_chars(unicode:characters_to_list(Chars,Encoding),State); request({put_chars, Encoding, Module, Function, Args}, State) -> @@ -531,23 +587,22 @@ request({put_chars, Encoding, Module, Function, Args}, State) -> catch _:_ -> {error, {error,Function}, State} - end; - + end; -

The Encoding tells us how the characters in the request are -represented. We want to store the characters as lists in the -ETS table, so we convert them to lists using the -unicode:characters_to_list/2 function. The conversion function -conveniently accepts the encoding types unicode or latin1, so we can -use Encoding directly.

+

The Encoding says how the characters in the request are + represented. We want to store the characters as lists in the ETS + table, so we convert them to lists using function + unicode:characters_to_list/2. + The conversion function conveniently accepts the encoding types + unicode and latin1, so we can use Encoding directly.

-

When Module, Function and Arguments are provided, we simply apply it -and do the same thing with the result as if the data was provided -directly.

+

When Module, Function, and Arguments are provided, + we apply it and do the same with the result as if the data was provided + directly.

-

Let us handle the requests for retrieving data too:

+

We handle the requests for retrieving data:

- + request({get_until, Encoding, _Prompt, M, F, As}, State) -> get_until(Encoding, M, F, As, State); request({get_chars, Encoding, _Prompt, N}, State) -> @@ -555,17 +610,16 @@ request({get_chars, Encoding, _Prompt, N}, State) -> get_until(Encoding, ?MODULE, until_enough, [N], State); request({get_line, Encoding, _Prompt}, State) -> %% To simplify the code, get_line is implemented using get_until - get_until(Encoding, ?MODULE, until_newline, [$\n], State); - + get_until(Encoding, ?MODULE, until_newline, [$\n], State); -

Here we have cheated a little by more or less only implementing -get_until and using internal helpers to implement get_chars and -get_line. In production code, this might be too inefficient, but that -of course depends on the frequency of the different requests. Before -we start actually implementing the functions put_chars/2 and -get_until/5, let us look into the few remaining requests:

+

Here we have cheated a little by more or less only implementing + get_until and using internal helpers to implement get_chars + and get_line. In production code, this can be inefficient, but + that depends on the frequency of the different requests. Before we start + implementing functions put_chars/2 and get_until/5, we + examine the few remaining requests:

- + request({get_geometry,_}, State) -> {error, {error,enotsup}, State}; request({setopts, Opts}, State) -> @@ -573,23 +627,23 @@ request({setopts, Opts}, State) -> request(getopts, State) -> getopts(State); request({requests, Reqs}, State) -> - multi_request(Reqs, {ok, ok, State}); - + multi_request(Reqs, {ok, ok, State}); -

The get_geometry request has no meaning for this I/O server, so the -reply will be {error, enotsup}. The only option we handle is the -binary/list option, which is done in separate functions.

+

Request get_geometry has no meaning for this I/O server, so the + reply is {error, enotsup}. The only option we handle is + binary/list, which is done in separate functions.

-

The multi-request tag (requests) is handled in a separate loop -function applying the requests in the list one after another, -returning the last result.

+

The multi-request tag (requests) is handled in a separate loop + function applying the requests in the list one after another, returning + the last result.

-

What is left is to handle backward compatibility and the file module -(which uses the old requests until backward compatibility with pre-R13 -nodes is no longer needed). Note that the I/O server will not work with -a simple file:write/2 if these are not added:

+

We need to handle backward compatibility and the + file module (which + uses the old requests until backward compatibility with pre-R13 nodes is + no longer needed). Notice that the I/O server does not work with a simple + file:write/2 if these are not added:

- + request({put_chars,Chars}, State) -> request({put_chars,latin1,Chars}, State); request({put_chars,M,F,As}, State) -> @@ -599,38 +653,35 @@ request({get_chars,Prompt,N}, State) -> request({get_line,Prompt}, State) -> request({get_line,latin1,Prompt}, State); request({get_until, Prompt,M,F,As}, State) -> - request({get_until,latin1,Prompt,M,F,As}, State); - + request({get_until,latin1,Prompt,M,F,As}, State); -

OK, what is left now is to return {error, request} if the request is -not recognized:

+

{error, request} must be returned if the request is not + recognized:

- + request(_Other, State) -> - {error, {error, request}, State}. - + {error, {error, request}, State}. -

Let us move further and actually handle the different requests, first -the fairly generic multi-request type:

+

Next we handle the different requests, first the fairly generic + multi-request type:

- + multi_request([R|Rs], {ok, _Res, State}) -> multi_request(Rs, request(R, State)); multi_request([_|_], Error) -> Error; multi_request([], Result) -> - Result. - + Result. -

We loop through the requests one at the time, stopping when we either -encounter an error or the list is exhausted. The last return value is -sent back to the client (it is first returned to the main loop and then -sent back by the function io_reply).

+

We loop through the requests one at the time, stopping when we either + encounter an error or the list is exhausted. The last return value is + sent back to the client (it is first returned to the main loop and then + sent back by function io_reply).

-

The getopts and setopts requests are also simple to handle, we just -change or read our state record:

+

Requests getopts and setopts are also simple to handle. + We only change or read the state record:

- + setopts(Opts0,State) -> Opts = proplists:unfold( proplists:substitute_negations( @@ -662,46 +713,44 @@ getopts(#state{mode=M} = S) -> true; _ -> false - end}],S}. - + end}],S}. -

As a convention, all I/O servers handle both {setopts, [binary]}, -{setopts, [list]} and {setopts,[{binary, boolean()}]}, hence the trick -with proplists:substitute_negations/2 and proplists:unfold/1. If -invalid options are sent to us, we send {error, enotsup} back to the -client.

+

As a convention, all I/O servers handle both {setopts, [binary]}, + {setopts, [list]}, and {setopts,[{binary, boolean()}]}, + hence the trick with proplists:substitute_negations/2 and + proplists:unfold/1. If invalid options are sent to us, we send + {error, enotsup} back to the client.

-

The getopts request should return a list of {Option, Value} tuples, -which has the twofold function of providing both the current values -and the available options of this I/O server. We have only one option, -and hence return that.

+

Request getopts is to return a list of {Option, Value} + tuples. This has the twofold function of providing both the current values + and the available options of this I/O server. We have only one option, and + hence return that.

-

So far our I/O server has been fairly generic (except for the rewind -request handled in the main loop and the creation of an ETS table). -Most I/O servers contain code similar to the one above.

+

So far this I/O server is fairly generic (except for request + rewind handled in the main loop and the creation of an ETS + table). Most I/O servers contain code similar to this one.

-

To make the example runnable, we now start implementing the actual -reading and writing of the data to/from the ETS table. First the -put_chars/3 function:

+

To make the example runnable, we start implementing the reading and + writing of the data to/from the ETS table. First function + put_chars/3:

- + put_chars(Chars, #state{table = T, position = P} = State) -> R = P div ?CHARS_PER_REC, C = P rem ?CHARS_PER_REC, [ apply_update(T,U) || U <- split_data(Chars, R, C) ], - {ok, ok, State#state{position = (P + length(Chars))}}. - + {ok, ok, State#state{position = (P + length(Chars))}}. -

We already have the data as (Unicode) lists and therefore just split -the list in runs of a predefined size and put each run in the -table at the current position (and forward). The functions -split_data/3 and apply_update/2 are implemented below.

+

We already have the data as (Unicode) lists and therefore only split + the list in runs of a predefined size and put each run in the table at + the current position (and forward). Functions split_data/3 and + apply_update/2 are implemented below.

-

Now we want to read data from the table. The get_until/5 function reads -data and applies the function until it says it is done. The result is -sent back to the client:

+

Now we want to read data from the table. Function get_until/5 + reads data and applies the function until it says that it is done. The + result is sent back to the client:

- + get_until(Encoding, Mod, Func, As, #state{position = P, mode = M, table = T} = State) -> case get_loop(Mod,Func,As,T,P,[]) of @@ -737,34 +786,34 @@ get_loop(M,F,A,T,P,C) -> get_loop(M,F,A,T,NewP,NewC); _ -> {error,F} - end. - - -

Here we also handle the mode (binary or list) that can be set by -the setopts request. By default, all OTP I/O servers send data back to -the client as lists, but switching mode to binary might increase -efficiency if the I/O server handles it in an appropriate way. The -implementation of get_until is hard to get efficient as the supplied -function is defined to take lists as arguments, but get_chars and -get_line can be optimized for binary mode. This example does not -optimize anything however. It is important though that the returned -data is of the right type depending on the options set, so we convert -the lists to binaries in the correct encoding if possible -before returning. The function supplied in the get_until request tuple may, -as its final result return anything, so only functions actually -returning lists can get them converted to binaries. If the request -contained the encoding tag unicode, the lists can contain all Unicode -codepoints and the binaries should be in UTF-8, if the encoding tag -was latin1, the client should only get characters in the range -0..255. The function check/2 takes care of not returning arbitrary -Unicode codepoints in lists if the encoding was given as latin1. If -the function did not return a list, the check cannot be performed and -the result will be that of the supplied function untouched.

- -

Now we are more or less done. We implement the utility functions below -to actually manipulate the table:

- - + end. + +

Here we also handle the mode (binary or list) that can be + set by request setopts. By default, all OTP I/O servers send data + back to the client as lists, but switching mode to binary can + increase efficiency if the I/O server handles it in an appropriate way. + The implementation of get_until is difficult to get efficient, as + the supplied function is defined to take lists as arguments, but + get_chars and get_line can be optimized for binary mode. + However, this example does not optimize anything.

+ +

It is important though that the returned data is of the correct type + depending on the options set. We therefore convert the lists to binaries + in the correct encoding if possible before returning. The + function supplied in the get_until request tuple can, as its final + result return anything, so only functions returning lists can get them + converted to binaries. If the request contains encoding tag + unicode, the lists can contain all Unicode code points and the + binaries are to be in UTF-8. If the encoding tag is latin1, the + client is only to get characters in the range 0..255. Function + check/2 takes care of not returning arbitrary Unicode code points + in lists if the encoding was specified as latin1. If the function + does not return a list, the check cannot be performed and the result is + that of the supplied function untouched.

+ +

To manipulate the table we implement the following utility functions:

+ + check(unicode, List) -> List; check(latin1, List) -> @@ -775,18 +824,16 @@ check(latin1, List) -> catch throw:_ -> {error,{cannot_convert, unicode, latin1}} - end. - + end. -

The function check takes care of providing an error tuple if Unicode -codepoints above 255 is to be returned if the client requested -latin1.

+

The function check provides an error tuple if Unicode code points > + 255 are to be returned if the client requested latin1.

-

The two functions until_newline/3 and until_enough/3 are helpers used -together with the get_until/5 function to implement get_chars and -get_line (inefficiently):

- - +

The two functions until_newline/3 and until_enough/3 are + helpers used together with function get_until/5 to implement + get_chars and get_line (inefficiently):

+ + until_newline([],eof,_MyStopCharacter) -> {done,eof,[]}; until_newline(ThisFar,eof,_MyStopCharacter) -> @@ -810,16 +857,15 @@ until_enough(ThisFar,CharList,N) {Res,Rest} = my_split(N,ThisFar ++ CharList, []), {done,Res,Rest}; until_enough(ThisFar,CharList,_N) -> - {more,ThisFar++CharList}. - + {more,ThisFar++CharList}. -

As can be seen, the functions above are just the type of functions -that should be provided in get_until requests.

+

As can be seen, the functions above are just the type of functions that + are to be provided in get_until requests.

-

Now we only need to read and write the table in an appropriate way to -complete the I/O server:

+

To complete the I/O server, we only need to read and write the table in + an appropriate way:

- + get(P,Tab) -> R = P div ?CHARS_PER_REC, C = P rem ?CHARS_PER_REC, @@ -856,18 +902,16 @@ apply_update(Table, {Row, Col, List}) -> {Part1,_} = my_split(Col,OldData,[]), {_,Part2} = my_split(Col+length(List),OldData,[]), ets:insert(Table,{Row, Part1 ++ List ++ Part2}) - end. - - -

The table is read or written in chunks of ?CHARS_PER_REC, overwriting -when necessary. The implementation is obviously not efficient, it is -just working.

- -

This concludes the example. It is fully runnable and you can read or -write to the I/O server by using i.e. the io module or even the file -module. It is as simple as that to implement a fully fledged I/O server -in Erlang.

-
+ end. + +

The table is read or written in chunks of ?CHARS_PER_REC, + overwriting when necessary. The implementation is clearly not efficient, + it is just working.

+ +

This concludes the example. It is fully runnable and you can read or + write to the I/O server by using, for example, the + io module or even the + file module. It is + as simple as that to implement a fully fledged I/O server in Erlang.

+
- - diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml index ac41987eaf..58dad7c9e0 100644 --- a/lib/stdlib/doc/src/lib.xml +++ b/lib/stdlib/doc/src/lib.xml @@ -29,68 +29,73 @@
lib - A number of useful library functions + Useful library functions. -

This module is retained for compatibility. It may disappear - without warning in a future release.

+

This module is retained for backward compatibility. It can disappear + without warning in a future Erlang/OTP release.

 + - - - Flush messages - -

Flushes the message buffer of the current process.

- - - Print error message + Print error message.

Prints error message Args in accordance with - Format. Similar to io:format/2, see - io(3).

+ Format. Similar to + io:format/2.

 + - - Return name of Erlang start script + + Flush messages. -

Returns the name of the script that started the current - Erlang session.

+

Flushes the message buffer of the current process.

 + - Remove last newline + Remove last newline.

Removes the last newline character, if any, in String1.

 + + + + Return name of Erlang start script. + +

Returns the name of the script that started the current + Erlang session.

+ + + - Send a message + Send a message. -

This function to makes it possible to send a message using - the apply/3 BIF.

+

Makes it possible to send a message using the apply/3 BIF.

 + - Send a message and wait for an answer + Send a message and wait for an answer. -

As send/2, but waits for an answer. It is implemented - as follows:

+

As send/2, + but waits for an answer. It is implemented as follows:

sendw(To, Msg) -> To ! {self(),Msg}, receive Reply -> Reply end. -

The message returned is not necessarily a reply to the - message sent.

+

The returned message is not necessarily a reply to the sent + message.

 diff --git a/lib/stdlib/doc/src/lists.xml b/lib/stdlib/doc/src/lists.xml index 03d0063599..60dbae70c2 100644 --- a/lib/stdlib/doc/src/lists.xml +++ b/lib/stdlib/doc/src/lists.xml @@ -25,11 +25,11 @@ lists Robert Virding 1 - 96-09-28 + 1996-09-28 A
lists - List Processing Functions + List processing functions.

This module contains functions for list processing.

@@ -44,132 +44,156 @@

Whenever an ordering function F is expected as argument, it is assumed that the - following properties hold of F for all x, y and z:

+ following properties hold of F for all x, y, and z:

+ -

if x F y and y F x then x = y (F - is antisymmetric);

+

If x F y and y F x, then x = y (F + is antisymmetric).

 -

if x F y and y F z then x F z - (F is transitive);

+

If x F y and y F z, then x F z + (F is transitive).

x F y or y F x (F is total).

 -

An example of a typical ordering function is less than or equal - to, =</2.

+

An example of a typical ordering function is less than or equal + to: =</2.

 + - Return true if all elements in the list satisfyPred + Return true if all elements in a list satisfy + Pred. -

Returns true if Pred(Elem) returns - true for all elements Elem in List, - otherwise false.

+

Returns true if Pred(Elem) + returns true for all elements Elem in + List, otherwise false.

 + - Return true if any of the elements in the list satisfiesPred + Return true if any of the elements in a list + satisfies Pred. -

Returns true if Pred(Elem) returns - true for at least one element Elem in - List.

+

Returns true if Pred(Elem) + returns true for at least one element Elem + in List.

 + - Append a list of lists + Append a list of lists. -

Returns a list in which all the sub-lists of - ListOfLists have been appended. For example:

+

Returns a list in which all the sublists of + ListOfLists have been appended.

+

Example:

 > lists:append([[1, 2, 3], [a, b], [4, 5, 6]]).
 [1,2,3,a,b,4,5,6]
 + - Append two lists + Append two lists. -

Returns a new list List3 which is made from +

Returns a new list List3, which is made from the elements of List1 followed by the elements of - List2. For example:

+ List2.

+

Example:

 > lists:append("abc", "def").
 "abcdef"

lists:append(A, B) is equivalent to A ++ B.

 + - Concatenate a list of atoms + Concatenate a list of atoms. -

Concatenates the text representation of the elements - of Things. The elements of Things can be atoms, - integers, floats or strings.

+

Concatenates the text representation of the elements of + Things. The elements of Things + can be atoms, integers, floats, or strings.

+

Example:

 > lists:concat([doc, '/', file, '.', 3]).
 "doc/file.3"
 + - Delete an element from a list + Delete an element from a list.

Returns a copy of List1 where the first element matching Elem is deleted, if there is such an element.

 + - Drop the last element of a list + Drop the last element of a list. -

Drops the last element of a List. The list should - be non-empty, otherwise the function will crash with a function_clause

+

Drops the last element of a List. The list is to + be non-empty, otherwise the function crashes with a + function_clause.

 + - Drop elements from a list while a predicate is true + Drop elements from a list while a predicate is true. + -

Drops elements Elem from List1 while - Pred(Elem) returns true and returns - the remaining list.

+

Drops elements Elem from + List1 while + Pred(Elem) returns true and + returns the remaining list.

 + - Make N copies of element + Make N copies of element. -

Returns a list which contains N copies of the term - Elem. For example:

+

Returns a list containing N copies of term + Elem.

+

Example:

 > lists:duplicate(5, xx).
 [xx,xx,xx,xx,xx]
 + - Choose elements which satisfy a predicate + Select elements that satisfy a predicate. -

List2 is a list of all elements Elem in - List1 for which Pred(Elem) returns - true.

+

List2 is a list of all elements + Elem in List1 for which + Pred(Elem) returns true.

 + - Filter and map elements which satisfy a function - -

Calls Fun(Elem) on successive elements Elem - of List1. Fun/2 must return either a boolean - or a tuple {true, Value}. The function returns the list of elements - for which Fun returns a new value, where a value of true - is synonymous with {true, Elem}.

-

That is, filtermap behaves as if it had been defined as follows:

+ Filter and map elements that satisfy a function. + +

Calls Fun(Elem) on successive + elements Elem of List1. + Fun/2 must return either a Boolean or a tuple + {true, Value}. The function returns the list of + elements for which Fun returns a new value, where + a value of true is synonymous with + {true, Elem}.

+

That is, filtermap behaves as if it had been defined as + follows:

filtermap(Fun, List1) -> lists:foldr(fun(Elem, Acc) -> @@ -179,26 +203,29 @@ filtermap(Fun, List1) -> {true,Value} -> [Value|Acc] end end, [], List1). -

Example:

+

Example:

 > lists:filtermap(fun(X) -> case X rem 2 of 0 -> {true, X div 2}; _ -> false end end, [1,2,3,4,5]).
 [1,2]
 + - Length of flattened deep list + Length of flattened deep list. -

Equivalent to length(flatten(DeepList)), but more - efficient.

+

Equivalent to length(flatten(DeepList)), but + more efficient.

 + - Map and flatten in one pass + Map and flatten in one pass. -

Takes a function from As to lists of Bs, and a - list of As (List1) and produces a list of +

Takes a function from As to lists of + Bs, and a list of As + (List1) and produces a list of Bs by applying the function to every element in List1 and appending the resulting lists.

That is, flatmap behaves as if it had been defined as @@ -206,37 +233,42 @@ filtermap(Fun, List1) -> flatmap(Fun, List1) -> append(map(Fun, List1)). -

Example:

+

Example:

 > lists:flatmap(fun(X)->[X,X] end, [a,b,c]).
 [a,a,b,b,c,c]
 + - Flatten a deep list + Flatten a deep list.

Returns a flattened version of DeepList.

 + - Flatten a deep list + Flatten a deep list. -

Returns a flattened version of DeepList with the tail +

Returns a flattened version of DeepList with tail Tail appended.

 + - Fold a function over a list - -

Calls Fun(Elem, AccIn) on successive elements A - of List, starting with AccIn == Acc0. - Fun/2 must return a new accumulator which is passed to - the next call. The function returns the final value of - the accumulator. Acc0 is returned if the list is empty. - For example:

+ Fold a function over a list. + +

Calls Fun(Elem, AccIn) + on successive elements A of List, starting + with AccIn == Acc0. + Fun/2 must return a new accumulator, which is + passed to the next call. The function returns the final value of + the accumulator. Acc0 is returned if the list is + empty.

+

Example:

 > lists:foldl(fun(X, Sum) -> X + Sum end, 0, [1,2,3,4,5]).
 15
@@ -244,12 +276,14 @@ flatmap(Fun, List1) ->
 120
 + - Fold a function over a list + Fold a function over a list. -

Like foldl/3, but the list is traversed from right to - left. For example:

+

Like foldl/3, but the + list is traversed from right to left.

+

Example:

 > P = fun(A, AccIn) -> io:format("~p ", [A]), AccIn end.
 #Fun<erl_eval.12.2225172>
@@ -257,10 +291,11 @@ flatmap(Fun, List1) ->
 1 2 3 void
 > lists:foldr(P, void, [1,2,3]).
 3 2 1 void
-

foldl/3 is tail recursive and would usually be - preferred to foldr/3.

+

foldl/3 is tail recursive and is usually preferred to + foldr/3.

 + Insert an element between elements in a list @@ -278,45 +313,52 @@ flatmap(Fun, List1) -> - Apply a function to each element of a list + Apply a function to each element of a list. -

Calls Fun(Elem) for each element Elem in - List. This function is used for its side effects and +

Calls Fun(Elem) for each element + Elem in List. This function + is used for its side effects and the evaluation order is defined to be the same as the order of the elements in the list.

 + - Delete an element from a list of tuples + Delete an element from a list of tuples. 1..tuple_size(Tuple)

Returns a copy of TupleList1 where the first - occurrence of a tuple whose Nth element compares equal to + occurrence of a tuple whose Nth element compares + equal to Key is deleted, if there is such a tuple.

 + - Search for an element in a list of tuples + Search for an element in a list of tuples. 1..tuple_size(Tuple)

Searches the list of tuples TupleList for a - tuple whose Nth element compares equal to Key. + tuple whose Nth element compares equal to + Key. Returns Tuple if such a tuple is found, otherwise false.

 + - Map a function over a list of tuples + Map a function over a list of tuples. 1..tuple_size(Tuple)

Returns a list of tuples where, for each tuple in - TupleList1, the Nth element Term1 of the tuple + TupleList1, the Nth element + Term1 of the tuple has been replaced with the result of calling Fun(Term1).

-

Examples:

+

Examples:

 > Fun = fun(Atom) -> atom_to_list(Atom) end.
 #Fun<erl_eval.6.10732646>
@@ -324,33 +366,37 @@ flatmap(Fun, List1) ->
 [{name,"jane",22},{name,"lizzie",20},{name,"lydia",15}]
 + - Test for membership of a list of tuples + Test for membership of a list of tuples. 1..tuple_size(Tuple) -

Returns true if there is a tuple in TupleList - whose Nth element compares equal to Key, otherwise - false.

+

Returns true if there is a tuple in + TupleList whose Nth element + compares equal to Key, otherwise false.

 + - Merge two key-sorted lists of tuples + Merge two key-sorted lists of tuples. 1..tuple_size(Tuple) -

Returns the sorted list formed by merging TupleList1 - and TupleList2. The merge is performed on - the Nth element of each tuple. Both TupleList1 and - TupleList2 must be key-sorted prior to evaluating this - function. When two tuples compare equal, the tuple from +

Returns the sorted list formed by merging + TupleList1 and TupleList2. + The merge is performed on the Nth element of each + tuple. Both TupleList1 and + TupleList2 must be key-sorted before evaluating + this function. When two tuples compare equal, the tuple from TupleList1 is picked before the tuple from TupleList2.

 + - Replace an element in a list of tuples + Replace an element in a list of tuples. 1..tuple_size(Tuple)

Returns a copy of TupleList1 where the first @@ -359,193 +405,226 @@ flatmap(Fun, List1) -> NewTuple, if there is such a tuple T.

 + - Search for an element in a list of tuples + Search for an element in a list of tuples. 1..tuple_size(Tuple)

Searches the list of tuples TupleList for a - tuple whose Nth element compares equal to Key. + tuple whose Nth element compares equal to + Key. Returns {value, Tuple} if such a tuple is found, otherwise false.

-

This function is retained for backward compatibility. - The function lists:keyfind/3 (introduced in R13A) - is in most cases more convenient.

 + +

This function is retained for backward compatibility. Function + keyfind/3 + is usually more convenient.

+ + - Sort a list of tuples + Sort a list of tuples. 1..tuple_size(Tuple) -

Returns a list containing the sorted elements of the list - TupleList1. Sorting is performed on the Nth - element of the tuples. The sort is stable.

+

Returns a list containing the sorted elements of list + TupleList1. Sorting is performed on the + Nth element of the tuples. The sort is stable.

 + - Store an element in a list of tuples + Store an element in a list of tuples. 1..tuple_size(Tuple)

Returns a copy of TupleList1 where the first occurrence of a tuple T whose Nth element compares equal to Key is replaced with - NewTuple, if there is such a tuple T. If there - is no such tuple T a copy of TupleList1 where + NewTuple, if there is such a tuple T. + If there is no such tuple T, a copy of + TupleList1 where [NewTuple] has been appended to the end is returned.

 + - Extract an element from a list of tuples + Extract an element from a list of tuples. 1..tuple_size(Tuple) -

Searches the list of tuples TupleList1 for a tuple - whose Nth element compares equal to Key. - Returns {value, Tuple, TupleList2} if such a tuple is - found, otherwise false. TupleList2 is a copy +

Searches the list of tuples TupleList1 for a + tuple whose Nth element compares equal to + Key. Returns {value, Tuple, + TupleList2} if such a tuple is found, otherwise + false. TupleList2 is a copy of TupleList1 where the first occurrence of Tuple has been removed.

 + - Return last element in a list + Return last element in a list.

Returns the last element in List.

 + - Map a function over a list + Map a function over a list. -

Takes a function from As to Bs, and a list of - As and produces a list of Bs by applying +

Takes a function from As to + Bs, and a list of As and + produces a list of Bs by applying the function to every element in the list. This function is - used to obtain the return values. The evaluation order is - implementation dependent.

+ used to obtain the return values. The evaluation order depends on + the implementation.

 + - Map and fold in one pass + Map and fold in one pass. -

mapfoldl combines the operations of map/2 and - foldl/3 into one pass. An example, summing - the elements in a list and double them at the same time:

+

Combines the operations of + map/2 and + foldl/3 into one pass.

+

Example:

+

Summing the elements in a list and double them at the same time:

 > lists:mapfoldl(fun(X, Sum) -> {2*X, X+Sum} end,
 0, [1,2,3,4,5]).
 {[2,4,6,8,10],15}
 + - Map and fold in one pass + Map and fold in one pass. -

mapfoldr combines the operations of map/2 and - foldr/3 into one pass.

+

Combines the operations of + map/2 and + foldr/3 into one pass.

 + - Return maximum element of a list + Return maximum element of a list.

Returns the first element of List that compares greater than or equal to all other elements of List.

 + - Test for membership of a list + Test for membership of a list. -

Returns true if Elem matches some element of - List, otherwise false.

+

Returns true if Elem matches some element + of List, otherwise false.

 + - Merge a list of sorted lists + Merge a list of sorted lists. -

Returns the sorted list formed by merging all the sub-lists - of ListOfLists. All sub-lists must be sorted prior to +

Returns the sorted list formed by merging all the sublists of + ListOfLists. All sublists must be sorted before evaluating this function. When two elements compare equal, - the element from the sub-list with the lowest position in - ListOfLists is picked before the other element.

+ the element from the sublist with the lowest position in + ListOfLists is picked before the other + element.

 + - Merge two sorted lists + Merge two sorted lists. -

Returns the sorted list formed by merging List1 and - List2. Both List1 and List2 must be - sorted prior to evaluating this function. When two elements +

Returns the sorted list formed by merging List1 + and List2. Both List1 and + List2 must be + sorted before evaluating this function. When two elements compare equal, the element from List1 is picked before the element from List2.

 + - Merge two sorted list + Merge two sorted list. -

Returns the sorted list formed by merging List1 and - List2. Both List1 and List2 must be - sorted according to the Returns the sorted list formed by merging List1 + and List2. Both List1 and + List2 must be sorted according to the ordering function - Fun prior to evaluating this function. Fun(A, - B) should return true if A compares less - than or equal to B in the ordering, false - otherwise. When two elements compare equal, the element from + Fun before evaluating this function. + Fun(A, B) is to return + true if A compares less + than or equal to B in the ordering, otherwise + false. When two elements compare equal, the element from List1 is picked before the element from List2.

 + - Merge three sorted lists + Merge three sorted lists.

Returns the sorted list formed by merging List1, - List2 and List3. All of List1, - List2 and List3 must be sorted prior to - evaluating this function. When two elements compare equal, - the element from List1, if there is such an element, + List2, and List3. All of + List1, List2, and + List3 must be sorted before evaluating this + function. When two elements compare equal, the element from + List1, if there is such an element, is picked before the other element, otherwise the element from List2 is picked before the element from List3.

 + - Return minimum element of a list + Return minimum element of a list.

Returns the first element of List that compares less than or equal to all other elements of List.

 + - Return the Nth element of a list + Return the Nth element of a list. 1..length(List) -

Returns the Nth element of List. For example:

+

Returns the Nth element of + List.

+

Example:

 > lists:nth(3, [a, b, c, d, e]).
 c
 + - Return the Nth tail of a list + Return the Nth tail of a list. 0..length(List) -

Returns the Nth tail of List, that is, the sublist of - List starting at N+1 and continuing up to - the end of the list. For example:

+

Returns the Nth tail of List, + that is, the sublist of List starting at + N+1 and continuing up to the end of the list.

+

Example

 > lists:nthtail(3, [a, b, c, d, e]).
 [d,e]
@@ -557,70 +636,91 @@ c
[] + - Partition a list into two lists based on a predicate - -

Partitions List into two lists, where the first list - contains all elements for which Pred(Elem) returns - true, and the second list contains all elements for - which Pred(Elem) returns false.

-

Examples:

+ Partition a list into two lists based on a predicate. + +

Partitions List into two lists, where the first + list contains all elements for which + Pred(Elem) returns true, + and the second list contains all elements for which + Pred(Elem) returns false.

+

Examples:

 > lists:partition(fun(A) -> A rem 2 == 1 end, [1,2,3,4,5,6,7]).
 {[1,3,5,7],[2,4,6]}
 > lists:partition(fun(A) -> is_atom(A) end, [a,b,1,c,d,2,3,4,e]).
 {[a,b,c,d,e],[1,2,3,4]}
-

See also splitwith/2 for a different way to partition - a list.

+

For a different way to partition a list, see + splitwith/2.

 + - Test for list prefix + Test for list prefix.

Returns true if List1 is a prefix of List2, otherwise false.

 + - Reverse a list + Reverse a list.

Returns a list with the elements in List1 in reverse order.

 + - Reverse a list appending a tail + Reverse a list appending a tail.

Returns a list with the elements in List1 - in reverse order, with the tail Tail appended. For - example:

+ in reverse order, with tail Tail appended.

+

Example:

 > lists:reverse([1, 2, 3, 4], [a, b, c]).
 [4,3,2,1,a,b,c]
 + - Generate a sequence of integers + Generate a sequence of integers. -

Returns a sequence of integers which starts with From - and contains the successive results of adding Incr to - the previous element, until To has been reached or - passed (in the latter case, To is not an element of +

Returns a sequence of integers that starts with + From and contains the successive results of + adding Incr to the previous element, until + To is reached or passed (in the latter case, + To is not an element of the sequence). Incr defaults to 1.

-

Failure: If To<From-Incr and Incr - is positive, or if To>From-Incr and Incr is - negative, or if Incr==0 and From/=To.

+

Failures:

+ + +

If To < + From - Incr + and Incr > 0.

+ + +

If To > + From - Incr and + Incr < 0.

+ + +

If Incr =:= 0 and + From =/= To.

+ +

The following equalities hold for all sequences:

-length(lists:seq(From, To)) == To-From+1 -length(lists:seq(From, To, Incr)) == (To-From+Incr) div Incr -

Examples:

+length(lists:seq(From, To)) =:= To - From + 1 +length(lists:seq(From, To, Incr)) =:= (To - From + Incr) div Incr +

Examples:

 > lists:seq(1, 10).
 [1,2,3,4,5,6,7,8,9,10]
@@ -634,74 +734,87 @@ length(lists:seq(From, To, Incr)) == (To-From+Incr) div Incr
 [1]
 + - Sort a list + Sort a list.

Returns a list containing the sorted elements of List1.

 + - Sort a list + Sort a list.

Returns a list containing the sorted elements of List1, according to the ordering function - Fun. Fun(A, B) should return true if - A compares less than or equal to B in the - ordering, false otherwise.

+ Fun. Fun(A, + B) is to return true if A + compares less than or equal to B in the + ordering, otherwise false.

 + - Split a list into two lists + Split a list into two lists. 0..length(List1) -

Splits List1 into List2 and List3. - List2 contains the first N elements and - List3 the rest of the elements (the Nth tail).

+

Splits List1 into List2 and + List3. List2 contains the + first N elements and List3 + the remaining elements (the Nth tail).

 + - Split a list into two lists based on a predicate + Split a list into two lists based on a predicate.

Partitions List into two lists according to - Pred. splitwith/2 behaves as if it is defined - as follows:

+ Pred. splitwith/2 behaves as if it is + defined as follows:

splitwith(Pred, List) -> {takewhile(Pred, List), dropwhile(Pred, List)}. -

Examples:

+

Examples:

 > lists:splitwith(fun(A) -> A rem 2 == 1 end, [1,2,3,4,5,6,7]).
 {[1],[2,3,4,5,6,7]}
 > lists:splitwith(fun(A) -> is_atom(A) end, [a,b,1,c,d,2,3,4,e]).
 {[a,b],[1,c,d,2,3,4,e]}
-

See also partition/2 for a different way to partition - a list.

+

For a different way to partition a list, see + partition/2.

 + - Return a sub-list of a certain length, starting at the first position + Return a sublist of a certain length, starting at the first + position. -

Returns the sub-list of List1 starting at position 1 - and with (max) Len elements. It is not an error for - Len to exceed the length of the list, in that case - the whole list is returned.

+

Returns the sublist of List1 starting at + position 1 and with (maximum) Len elements. It is + not an error for Len to exceed the length of the + list, in that case the whole list is returned.

 + - Return a sub-list starting at a given position and with a given number of elements + Return a sublist starting at a specified position and with a + specified number of elements. 1..(length(List1)+1) -

Returns the sub-list of List1 starting at Start - and with (max) Len elements. It is not an error for - Start+Len to exceed the length of the list.

+

Returns the sublist of List1 starting at + Start and with (maximum) Len + elements. It is not an error for + Start+Len to exceed the length of + the list.

+

Examples:

 > lists:sublist([1,2,3,4], 2, 2).
 [2,3]
@@ -711,142 +824,163 @@ splitwith(Pred, List) ->
 []
 + - Subtract the element in one list from another list + Subtract the element in one list from another list. -

Returns a new list List3 which is a copy of - List1, subjected to the following procedure: for each - element in List2, its first occurrence in List1 - is deleted. For example:

+

Returns a new list List3 that is a copy of + List1, subjected to the following procedure: + for each element in List2, its first occurrence + in List1 is deleted.

+

Example:

 > lists:subtract("123212", "212").
 "312".

lists:subtract(A, B) is equivalent to A -- B.

-

The complexity of lists:subtract(A, B) is proportional - to length(A)*length(B), meaning that it will be very slow if - both A and B are long lists. - (Using ordered lists and - ordsets:subtract/2 - is a much better choice if both lists are long.)

 + +

The complexity of lists:subtract(A, B) is proportional to + length(A)*length(B), meaning that it is very slow if both + A and B are long lists. (If both lists are long, it + is a much better choice to use ordered lists and + + ordsets:subtract/2.

+ + - Test for list suffix + Test for list suffix.

Returns true if List1 is a suffix of List2, otherwise false.

 + - Return sum of elements in a list + Return the sum of elements in a list.

Returns the sum of the elements in List.

 + - Take elements from a list while a predicate is true + Take elements from a list while a predicate is true. + -

Takes elements Elem from List1 while - Pred(Elem) returns true, that is, - the function returns the longest prefix of the list for which +

Takes elements Elem from + List1 while + Pred(Elem) returns true, that + is, the function returns the longest prefix of the list for which all elements satisfy the predicate.

 + - Merge two key-sorted lists of tuples, removing duplicates + Merge two key-sorted lists of tuples, removing duplicates. + 1..tuple_size(Tuple) -

Returns the sorted list formed by merging TupleList1 - and TupleList2. The merge is performed on the - Nth element of each tuple. Both TupleList1 and - TupleList2 must be key-sorted without duplicates - prior to evaluating this function. When two tuples compare - equal, the tuple from TupleList1 is picked and the - one from TupleList2 deleted.

+

Returns the sorted list formed by merging + TupleList1 and + TupleList2. The merge is performed on the + Nth element of each tuple. Both + TupleList1 and TupleList2 + must be key-sorted without duplicates before evaluating this function. + When two tuples compare equal, the tuple from + TupleList1 is picked and the + one from TupleList2 is deleted.

 + - Sort a list of tuples, removing duplicates + Sort a list of tuples, removing duplicates. 1..tuple_size(Tuple) -

Returns a list containing the sorted elements of the list - TupleList1 where all but the first tuple of the - tuples comparing equal have been deleted. Sorting is +

Returns a list containing the sorted elements of list + TupleList1 where all except the first tuple of + the tuples comparing equal have been deleted. Sorting is performed on the Nth element of the tuples.

 + - Merge a list of sorted lists, removing duplicates + Merge a list of sorted lists, removing duplicates. -

Returns the sorted list formed by merging all the sub-lists - of ListOfLists. All sub-lists must be sorted and - contain no duplicates prior to evaluating this function. - When two elements compare equal, the element from the - sub-list with the lowest position in ListOfLists is - picked and the other one deleted.

+

Returns the sorted list formed by merging all the sublists + of ListOfLists. All sublists must be sorted and + contain no duplicates before evaluating this function. + When two elements compare equal, the element from the sublist + with the lowest position in ListOfLists is + picked and the other is deleted.

 + - Merge two sorted lists, removing duplicates + Merge two sorted lists, removing duplicates. -

Returns the sorted list formed by merging List1 and - List2. Both List1 and List2 must be - sorted and contain no duplicates prior to evaluating this +

Returns the sorted list formed by merging List1 + and List2. Both List1 and + List2 must be + sorted and contain no duplicates before evaluating this function. When two elements compare equal, the element from - List1 is picked and the one from List2 - deleted.

+ List1 is picked and the one from + List2 is deleted.

 + - Merge two sorted lists, removing duplicates + Merge two sorted lists, removing duplicates. -

Returns the sorted list formed by merging List1 and - List2. Both List1 and List2 must be - sorted according to the Returns the sorted list formed by merging List1 + and List2. Both List1 and + List2 must be sorted according to the ordering function - Fun and contain no duplicates prior to evaluating - this function. Fun(A, B) should return true if - A compares less than or equal to B in the - ordering, false otherwise. When two elements compare - equal, the element from - List1 is picked and the one from List2 - deleted.

+ Fun and contain no duplicates before evaluating this function. + Fun(A, B) is to return + true if A compares less than or equal to + B in the ordering, otherwise false. When + two elements compare equal, the element from List1 + is picked and the one from List2 is deleted.

 + - Merge three sorted lists, removing duplicates + Merge three sorted lists, removing duplicates.

Returns the sorted list formed by merging List1, - List2 and List3. All of List1, - List2 and List3 must be sorted and contain no - duplicates prior to evaluating this function. When two + List2, and List3. All of + List1, List2, and + List3 must be sorted and contain no + duplicates before evaluating this function. When two elements compare equal, the element from List1 is - picked if there is such an element, otherwise the element - from List2 is picked, and the other one deleted.

+ picked if there is such an element, otherwise the element from + List2 is picked, and the other is deleted.

 + - Unzip a list of two-tuples into two lists + Unzip a list of two-tuples into two lists.

"Unzips" a list of two-tuples into two lists, where the first list contains the first element of each tuple, and the second list contains the second element of each tuple.

 + - Unzip a list of three-tuples into three lists + Unzip a list of three-tuples into three lists.

"Unzips" a list of three-tuples into three lists, where the first list contains the first element of each tuple, @@ -854,76 +988,84 @@ splitwith(Pred, List) -> the third list contains the third element of each tuple.

 + - Sort a list, removing duplicates + Sort a list, removing duplicates.

Returns a list containing the sorted elements of - List1 where all but the first element of the elements - comparing equal have been deleted.

+ List1 where all except the first element of the + elements comparing equal have been deleted.

 + - Sort a list, removing duplicates + Sort a list, removing duplicates. -

Returns a list which contains the sorted elements of - List1 where all but the first element of the elements - comparing equal according to the Returns a list containing the sorted elements of + List1 where all except the first element of the + elements comparing equal according to the ordering function - Fun have been deleted. Fun(A, B) should return + Fun have been deleted. + Fun(A, B) is to return true if A compares less than or equal to - B in the ordering, false otherwise.

+ B in the ordering, otherwise false.

 + - Zip two lists into a list of two-tuples + Zip two lists into a list of two-tuples.

"Zips" two lists of equal length into one list of two-tuples, where the first element of each tuple is taken from the first - list and the second element is taken from corresponding + list and the second element is taken from the corresponding element in the second list.

 + - Zip three lists into a list of three-tuples + Zip three lists into a list of three-tuples.

"Zips" three lists of equal length into one list of three-tuples, where the first element of each tuple is taken from the first list, the second element is taken from - corresponding element in the second list, and the third - element is taken from the corresponding element in the third - list.

+ the corresponding element in the second list, and the third + element is taken from the corresponding element in the third list.

 + - Zip two lists into one list according to a fun + Zip two lists into one list according to a fun. -

Combine the elements of two lists of equal length into one - list. For each pair X, Y of list elements from the two - lists, the element in the result list will be +

Combines the elements of two lists of equal length into one list. + For each pair X, Y of list elements + from the two lists, the element in the result list is Combine(X, Y).

zipwith(fun(X, Y) -> {X,Y} end, List1, List2) is equivalent to zip(List1, List2).

-

Example:

+

Example:

 > lists:zipwith(fun(X, Y) -> X+Y end, [1,2,3], [4,5,6]).
 [5,7,9]
 + - Zip three lists into one list according to a fun - -

Combine the elements of three lists of equal length into one - list. For each triple X, Y, Z of list elements from - the three lists, the element in the result list will be - Combine(X, Y, Z).

-

zipwith3(fun(X, Y, Z) -> {X,Y,Z} end, List1, List2, List3) is equivalent to zip3(List1, List2, List3).

-

Examples:

+ Zip three lists into one list according to a fun. + +

Combines the elements of three lists of equal length into one + list. For each triple X, Y, + Z of list elements from the three lists, the element + in the result list is Combine(X, + Y, Z).

+

zipwith3(fun(X, Y, Z) -> {X,Y,Z} end, List1, List2, List3) is + equivalent to zip3(List1, List2, List3).

+

Examples:

 > lists:zipwith3(fun(X, Y, Z) -> X+Y+Z end, [1,2,3], [4,5,6], [7,8,9]).
 [12,15,18]
diff --git a/lib/stdlib/doc/src/log_mf_h.xml b/lib/stdlib/doc/src/log_mf_h.xml
index 65622e52f5..edc3d31025 100644
--- a/lib/stdlib/doc/src/log_mf_h.xml
+++ b/lib/stdlib/doc/src/log_mf_h.xml
@@ -32,48 +32,56 @@
     Martin Björklund
     1996-10-31
     A
-    log_mf_h.sgml
+    log_mf_h.xml
log_mf_h - An Event Handler which Logs Events to Disk + An event handler that logs events to disk. -

The log_mf_h is a gen_event handler module which - can be installed in any gen_event process. It logs onto disk all events - which are sent to an event manager. Each event is written as a - binary which makes the logging very fast. However, a tool such as the Report Browser (rb) must be used in order to read the files. The events are written to multiple files. When all files have been used, the first one is re-used and overwritten. The directory location, the number of files, and the size of each file are configurable. The directory will include one file called index, and - report files 1, 2, ..... -

+

This module is a gen_event handler module that can be installed + in any gen_event process. It logs onto disk all events that are + sent to an event manager. Each event is written as a binary, which makes + the logging very fast. However, a tool such as the Report Browser + (rb(3)) must be used to read + the files. The events are written to multiple files. When all files have + been used, the first one is reused and overwritten. The directory + location, the number of files, and the size of each file are configurable. + The directory will include one file called index, and report files + 1, 2, ....

 +

Term to be sent to - gen_event:add_handler/3.

 + gen_event:add_handler/3.

+ + - Initiate the event handler + Initiate the event handler. -

Initiates the event handler. This function returns - Args, which should be used in a call to +

Initiates the event handler. Returns Args, which + is to be used in a call to gen_event:add_handler(EventMgr, log_mf_h, Args). -

+

Dir specifies which directory to use for the log - files. MaxBytes specifies the size of each individual - file. MaxFiles specifies how many files are - used. Pred is a predicate function used to filter the - events. If no predicate function is specified, all events are - logged.

+ files. MaxBytes specifies the size of each + individual file. MaxFiles specifies how many + files are used. Pred is a predicate function used + to filter the events. If no predicate function is specified, all + events are logged.
See Also -

gen_event(3), rb(3)

+

gen_event(3), + rb(3)

 diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml index bf45461e2b..e1edbadcd3 100644 --- a/lib/stdlib/doc/src/maps.xml +++ b/lib/stdlib/doc/src/maps.xml @@ -2,12 +2,12 @@ -
- - 20132016 - Ericsson AB. All Rights Reserved. - - +
+ + 20132016 + Ericsson AB. All Rights Reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -19,397 +19,372 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - - maps - Björn-Egil Dahlberg - 1 - 2014-02-28 - A -
- maps - Maps Processing Functions - -

This module contains functions for maps processing.

- - + - - - Choose pairs which satisfy a predicate - -

- Returns a map Map2 for which predicate - Pred holds true in Map1. -

-

- The call will fail with a {badmap,Map} exception if - Map1 is not a map or with badarg if - Pred is not a function of arity 2. -

-

Example:

- + maps + Björn-Egil Dahlberg + 1 + 2014-02-28 + A +
+ maps + Maps processing functions. + +

This module contains functions for maps processing.

+ + + + + + Select pairs that satisfy a predicate. + +

Returns a map Map2 for which predicate + Pred holds true in Map1.

+

The call fails with a {badmap,Map} exception if + Map1 is not a map, or with badarg if + Pred is not a function of arity 2.

+

Example:

+ > M = #{a => 2, b => 3, c=> 4, "a" => 1, "b" => 2, "c" => 4}, Pred = fun(K,V) -> is_atom(K) andalso (V rem 2) =:= 0 end, maps:filter(Pred,M). -#{a => 2,c => 4} - - +#{a => 2,c => 4} + + - - - - -

- Returns a tuple {ok, Value} where Value is the value associated with Key, - or error if no value is associated with Key in Map. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. -

-

Example:

- + + + + +

Returns a tuple {ok, Value}, where Value + is the value associated with Key, or error + if no value is associated with Key in + Map.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{"hi" => 42}, Key = "hi", maps:find(Key,Map). -{ok,42} - - +{ok,42} + + - - - - -

- Calls F(K, V, AccIn) for every K to value V - association in Map in - arbitrary order. The function fun F/3 must return a new accumulator - which is passed to the next successive call. maps:fold/3 returns the final - value of the accumulator. The initial accumulator value Init is returned if - the map is empty. -

-

Example:

- + + + + +

Calls F(K, V, AccIn) for every K to value + V association in Map in + any order. Function fun F/3 must return a new + accumulator, which is passed to the next successive call. + This function returns the final value of the accumulator. The initial + accumulator value Init is returned if the map is + empty.

+

Example:

+ > Fun = fun(K,V,AccIn) when is_list(K) -> AccIn + V end, Map = #{"k1" => 1, "k2" => 2, "k3" => 3}, maps:fold(Fun,0,Map). 6 - - + + - - - - -

- The function takes a list of key-value tuples elements and builds a - map. The associations may be in any order and both keys and values in the - association may be of any term. If the same key appears more than once, - the latter (rightmost) value is used and the previous values are ignored. -

-

Example:

- + + + + +

Takes a list of key-value tuples elements and builds a map. The + associations can be in any order, and both keys and values in the + association can be of any term. If the same key appears more than + once, the latter (right-most) value is used and the previous values + are ignored.

+

Example:

+ > List = [{"a",ignored},{1337,"value two"},{42,value_three},{"a",1}], maps:from_list(List). #{42 => value_three,1337 => "value two","a" => 1} - - + + - - - - -

- Returns the value Value associated with Key if - Map contains Key. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map, - or with a {badkey,Key} exception if no value is associated with Key. -

-

Example:

- + + + + +

Returns value Value associated with + Key if Map contains + Key.

+

The call fails with a {badmap,Map} exception if + Map is not a map, or with a {badkey,Key} + exception if no value is associated with Key.

+

Example:

+ > Key = 1337, Map = #{42 => value_two,1337 => "value one","a" => 1}, maps:get(Key,Map). "value one" - - - - - - - -

- Returns the value Value associated with Key if - Map contains Key. - If no value is associated with Key then returns Default. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. + + -

-

Example:

- + + + + +

Returns value Value associated with + Key if Map contains + Key. If no value is associated with + Key, Default is returned.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{ key1 => val1, key2 => val2 }. #{key1 => val1,key2 => val2} > maps:get(key1, Map, "Default value"). val1 > maps:get(key3, Map, "Default value"). "Default value" - - + + - - - - -

- Returns true if map Map contains Key and returns - false if it does not contain the Key. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. -

-

Example:

- + + + + +

Returns true if map Map contains + Key and returns false if it does not + contain the Key.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{"42" => value}. #{"42"> => value} > maps:is_key("42",Map). true > maps:is_key(value,Map). false - - + + - - - - -

- Returns a complete list of keys, in arbitrary order, which resides within Map. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. -

-

Example:

- + + + + +

Returns a complete list of keys, in any order, which resides + within Map.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{42 => value_three,1337 => "value two","a" => 1}, maps:keys(Map). [42,1337,"a"] - - + + - - - - -

- The function produces a new map Map2 by calling the function fun F(K, V1) for - every K to value V1 association in Map1 in arbitrary order. - The function fun F/2 must return the value V2 to be associated with key K for - the new map Map2. -

-

Example:

- + + + + +

Produces a new map Map2 by calling function + fun F(K, V1) for every K to value + V1 association in Map1 in + any order. Function fun F/2 must return value + V2 to be associated with key K + for the new map Map2.

+

Example:

+ > Fun = fun(K,V1) when is_list(K) -> V1*2 end, Map = #{"k1" => 1, "k2" => 2, "k3" => 3}, maps:map(Fun,Map). #{"k1" => 2,"k2" => 4,"k3" => 6} - - + + - - - - -

- Merges two maps into a single map Map3. If two keys exists in both maps the - value in Map1 will be superseded by the value in Map2. -

-

- The call will fail with a {badmap,Map} exception if Map1 or - Map2 is not a map. -

-

Example:

- + + + + +

Merges two maps into a single map Map3. If two + keys exist in both maps, the value in Map1 is + superseded by the value in Map2.

+

The call fails with a {badmap,Map} exception if + Map1 or Map2 is not a map.

+

Example:

+ > Map1 = #{a => "value_one", b => "value_two"}, Map2 = #{a => 1, c => 2}, maps:merge(Map1,Map2). #{a => 1,b => "value_two",c => 2} - - + + - - - - -

- Returns a new empty map. -

-

Example:

- + + + + +

Returns a new empty map.

+

Example:

+ > maps:new(). #{} - - - - - - - -

- Associates Key with value Value and inserts the association into map Map2. - If key Key already exists in map Map1, the old associated value is - replaced by value Value. The function returns a new map Map2 containing the new association and - the old associations in Map1. -

-

- The call will fail with a {badmap,Map} exception if Map1 is not a map. -

+ + -

Example:

- + + + + +

Associates Key with value + Value and inserts the association into map + Map2. If key Key already exists in map + Map1, the old associated value is replaced by + value Value. The function returns a new map + Map2 containing the new association and the old + associations in Map1.

+

The call fails with a {badmap,Map} exception if + Map1 is not a map.

+

Example:

+ > Map = #{"a" => 1}. #{"a" => 1} > maps:put("a", 42, Map). #{"a" => 42} > maps:put("b", 1337, Map). #{"a" => 1,"b" => 1337} - - + + - - - - -

- The function removes the Key, if it exists, and its associated value from - Map1 and returns a new map Map2 without key Key. -

-

- The call will fail with a {badmap,Map} exception if Map1 is not a map. -

-

Example:

- + + + + +

Removes the Key, if it exists, and its + associated value from Map1 and returns a new map + Map2 without key Key.

+

The call fails with a {badmap,Map} exception if + Map1 is not a map.

+

Example:

+ > Map = #{"a" => 1}. #{"a" => 1} > maps:remove("a",Map). #{} > maps:remove("b",Map). #{"a" => 1} - - + + + + + + + +

Returns the number of key-value associations in + Map. This operation occurs in constant time.

+

Example:

+ +> Map = #{42 => value_two,1337 => "value one","a" => 1}, + maps:size(Map). +3 + + - - - - -

- The function removes the Key, if it exists, and its associated value from - Map1 and returns a tuple with the removed Value and - the new map Map2 without key Key. - If the key does not exist error is returned. -

-

- The call will fail with a {badmap,Map} exception if Map1 is not a map. -

-

Example:

- + + + + +

The function removes the Key, if it + exists, and its associated value from Map1 + and returns a tuple with the removed Value + and the new map Map2 without key + Key. If the key does not exist + error is returned. +

+

The call will fail with a {badmap,Map} exception if + Map1 is not a map. +

+

Example:

+ > Map = #{"a" => "hello", "b" => "world"}. #{"a" => "hello", "b" => "world"} > maps:take("a",Map). {"hello",#{"b" => "world"}} > maps:take("does not exist",Map). error - - - - - - - -

- The function returns the number of key-value associations in the Map. - This operation happens in constant time. -

-

Example:

- -> Map = #{42 => value_two,1337 => "value one","a" => 1}, - maps:size(Map). -3 - - + + - - - - -

- The fuction returns a list of pairs representing the key-value associations of Map, - where the pairs, [{K1,V1}, ..., {Kn,Vn}], are returned in arbitrary order. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. -

-

Example:

- + + + + +

Returns a list of pairs representing the key-value associations of + Map, where the pairs + [{K1,V1}, ..., {Kn,Vn}] are returned in arbitrary order.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{42 => value_three,1337 => "value two","a" => 1}, maps:to_list(Map). [{42,value_three},{1337,"value two"},{"a",1}] - - + + - - - - -

- If Key exists in Map1 the old associated value is - replaced by value Value. The function returns a new map Map2 containing - the new associated value. -

-

- The call will fail with a {badmap,Map} exception if Map1 is not a map, - or with a {badkey,Key} exception if no value is associated with Key. -

-

Example:

- + + + + +

If Key exists in Map1, the + old associated value is replaced by value Value. + The function returns a new map Map2 containing + the new associated value.

+

The call fails with a {badmap,Map} exception if + Map1 is not a map, or with a {badkey,Key} + exception if no value is associated with Key.

+

Example:

+ > Map = #{"a" => 1}. #{"a" => 1} > maps:update("a", 42, Map). #{"a" => 42} - - + + - - - - -

Update a value in a Map1 associated with Key by - calling Fun on the old value to get a new value. An exception - {badkey,Key} is generated if - Key is not present in the map.

-

Example:

- + + + + +

Update a value in a Map1 associated + with Key by calling + Fun on the old value to get a new + value. An exception {badkey,Key} is + generated if Key is not present in the + map.

+

Example:

+ > Map = #{"counter" => 1}, Fun = fun(V) -> V + 1 end, maps:update_with("counter",Fun,Map). #{"counter" => 2} - - + + - - - - -

Update a value in a Map1 associated with Key by - calling Fun on the old value to get a new value. - If Key is not present - in Map1 then Init will be associated with - Key. -

-

Example:

- + + + + +

Update a value in a Map1 associated + with Key by calling + Fun on the old value to get a new value. + If Key is not present in + Map1 then Init will be + associated with Key. +

+

Example:

+ > Map = #{"counter" => 1}, Fun = fun(V) -> V + 1 end, maps:update_with("new counter",Fun,42,Map). @@ -417,56 +392,54 @@ error - - - - -

- Returns a complete list of values, in arbitrary order, contained in map Map. -

-

- The call will fail with a {badmap,Map} exception if Map is not a map. -

-

Example:

- + + + + +

Returns a complete list of values, in arbitrary order, contained in + map Map.

+

The call fails with a {badmap,Map} exception if + Map is not a map.

+

Example:

+ > Map = #{42 => value_three,1337 => "value two","a" => 1}, maps:values(Map). [value_three,"value two",1] - - + + - - - - -

- Returns a new map Map2 with the keys K1 through Kn and their associated values from map Map1. - Any key in Ks that does not exist in Map1 are ignored. -

-

Example:

- + + + + +

Returns a new map Map2 with the keys K1 + through Kn and their associated values from map + Map1. Any key in Ks that does + not exist in Map1 is ignored.

+

Example:

+ > Map = #{42 => value_three,1337 => "value two","a" => 1}, Ks = ["a",42,"other key"], maps:with(Ks,Map). #{42 => value_three,"a" => 1} - - + + - - - - -

- Returns a new map Map2 without the keys K1 through Kn and their associated values from map Map1. - Any key in Ks that does not exist in Map1 are ignored. -

-

Example:

- + + + + +

Returns a new map Map2 without keys K1 + through Kn and their associated values from map + Map1. Any key in Ks that does + not exist in Map1 is ignored

+

Example:

+ > Map = #{42 => value_three,1337 => "value two","a" => 1}, Ks = ["a",42,"other key"], maps:without(Ks,Map). #{1337 => "value two"} - - - + + + diff --git a/lib/stdlib/doc/src/math.xml b/lib/stdlib/doc/src/math.xml index 38084638f6..1358ce5cbf 100644 --- a/lib/stdlib/doc/src/math.xml +++ b/lib/stdlib/doc/src/math.xml @@ -30,78 +30,86 @@ 1 Bjarne Däcker - 97-01-15 + 1997-01-15 B - math.sgml + math.xml
math - Mathematical Functions + Mathematical functions.

This module provides an interface to a number of mathematical functions.

+ -

Not all functions are implemented on all platforms. In particular, - the erf/1 and erfc/1 functions are not implemented on Windows.

+

Not all functions are provided on all platforms. In particular, + the erf/1 and + erfc/1 functions + are not provided on Windows.

 + - - A useful number - -

A useful number.

- - - - - - - + + + - - - - - + + - + + + - Diverse math functions - - + + + Diverse math functions. + + -

A collection of math functions which return floats. Arguments - are numbers.

+

A collection of mathematical functions that return floats. Arguments + are numbers.

 + Error function. -

Returns the error function of X, where

+

Returns the error function of X, where:

-erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt.
+erf(X) = 2/sqrt(pi)*integral from 0 to X of exp(-t*t) dt. + - Another error function + Another error function. -

erfc(X) returns 1.0 - erf(X), computed by - methods that avoid cancellation for large X.

+

erfc(X) returns 1.0 - erf(X), computed by + methods that avoid cancellation for large X.

 + + + + A useful number. + +

A useful number.

+ + +
- Bugs -

As these are the C library, the bugs are the same.

+ Limitations +

As these are the C library, the same limitations apply.

 diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml index 84712486ea..0a05fa37c5 100644 --- a/lib/stdlib/doc/src/ms_transform.xml +++ b/lib/stdlib/doc/src/ms_transform.xml @@ -28,65 +28,81 @@ 1 Bjarne Däcker - 99-02-09 + 1999-02-09 C - ms_transform.sgml + ms_transform.xml
ms_transform - Parse_transform that translates fun syntax into match specifications. + A parse transformation that translates fun syntax into match + specifications. -

This module implements the parse_transform that makes calls to - ets and dbg:fun2ms/1 translate into literal - match specifications. It also implements the back end for the same - functions when called from the Erlang shell.

-

The translations from fun's to match_specs - is accessed through the two "pseudo - functions" ets:fun2ms/1 and dbg:fun2ms/1.

-

Actually this introduction is more or less an introduction to the - whole concept of match specifications. Since everyone trying to use - ets:select or dbg seems to end up reading - this page, it seems in good place to explain a little more than - just what this module does.

-

There are some caveats one should be aware of, please read through - the whole manual page if it's the first time you're using the - transformations.

-

Match specifications are used more or less as filters. - They resemble usual Erlang matching in a list comprehension or in - a fun used in conjunction with lists:foldl etc. The - syntax of pure match specifications is somewhat awkward though, as - they are made up purely by Erlang terms and there is no syntax in the - language to make the match specifications more readable.

-

As the match specifications execution and structure is quite like - that of a fun, it would for most programmers be more straight forward - to simply write it using the familiar fun syntax and having that - translated into a match specification automatically. Of course a real - fun is more powerful than the match specifications allow, but bearing - the match specifications in mind, and what they can do, it's still +

This module provides the parse transformation that makes calls to + ets and + dbg:fun2ms/1 + translate into literal match specifications. It also provides the back end + for the same functions when called from the Erlang shell.

+ +

The translation from funs to match specifications + is accessed through the two "pseudo functions" + ets:fun2ms/1 and + dbg:fun2ms/1.

+ +

As everyone trying to use + ets:select/2 or + dbg seems to end up + reading this manual page, this description is an introduction to the + concept of match specifications.

+ +

Read the whole manual page if it is the first time you are using + the transformations.

+ +

Match specifications are used more or less as filters. They resemble + usual Erlang matching in a list comprehension or in a fun used with + lists:foldl/3, and so on. + However, the syntax of pure match specifications is awkward, as + they are made up purely by Erlang terms, and the language has no + syntax to make the match specifications more readable.

+ +

As the execution and structure of the match specifications are like + that of a fun, it is more straightforward + to write it using the familiar fun syntax and to have that + translated into a match specification automatically. A real fun is + clearly more powerful than the match specifications allow, but bearing + the match specifications in mind, and what they can do, it is still more convenient to write it all as a fun. This module contains the - code that simply translates the fun syntax into match_spec terms.

-

Let's start with an ets example. Using ets:select and - a match specification, one can filter out rows of a table and construct - a list of tuples containing relevant parts of the data in these - rows. Of course one could use ets:foldl instead, but the - select call is far more efficient. Without the translation, one has to - struggle with writing match specifications terms to accommodate this, - or one has to resort to the less powerful - ets:match(_object) calls, or simply give up and use - the more inefficient method of ets:foldl. Using the - ets:fun2ms transformation, a ets:select call - is at least as easy to write as any of the alternatives.

-

As an example, consider a simple table of employees:

+ code that translates the fun syntax into match specification + terms.

+ + +
+ Example 1 +

Using ets:select/2 + and a match specification, one can filter out rows of + a table and construct a list of tuples containing relevant parts + of the data in these rows. + One can use ets:foldl/3 + instead, but the ets:select/2 call is far more efficient. + Without the translation provided by ms_transform, + one must struggle with writing match specifications terms + to accommodate this.

+ +

Consider a simple table of employees:

+ -record(emp, {empno, %Employee number as a string, the key surname, %Surname of the employee givenname, %Given name of employee - dept, %Department one of {dev,sales,prod,adm} - empyear}). %Year the employee was employed + dept, %Department, one of {dev,sales,prod,adm} + empyear}). %Year the employee was employed +

We create the table using:

+ -ets:new(emp_tab,[{keypos,#emp.empno},named_table,ordered_set]). -

Let's also fill it with some randomly chosen data for the examples:

+ets:new(emp_tab, [{keypos,#emp.empno},named_table,ordered_set]). + +

We fill the table with randomly chosen data:

+ [{emp,"011103","Black","Alfred",sales,2000}, {emp,"041231","Doe","John",prod,2001}, @@ -96,167 +112,204 @@ ets:new(emp_tab,[{keypos,#emp.empno},named_table,ordered_set]). {emp,"535216","Chalker","Samuel",adm,1998}, {emp,"789789","Harrysson","Joe",adm,1996}, {emp,"963721","Scott","Juliana",dev,2003}, - {emp,"989891","Brown","Gabriel",prod,1999}] -

Now, the amount of data in the table is of course to small to justify - complicated ets searches, but on real tables, using select to get - exactly the data you want will increase efficiency remarkably.

-

Lets say for example that we'd want the employee numbers of - everyone in the sales department. One might use ets:match - in such a situation:

+ {emp,"989891","Brown","Gabriel",prod,1999}] + +

Assuming that we want the employee numbers of everyone in the sales + department, there are several ways.

+ +

ets:match/2 can be used:

+ 
 1> ets:match(emp_tab, {'_', '$1', '_', '_', sales, '_'}).
-[["011103"],["076324"]]
-

Even though ets:match does not require a full match - specification, but a simpler type, it's still somewhat unreadable, and - one has little control over the returned result, it's always a list of - lists. OK, one might use ets:foldl or - ets:foldr instead:

+[["011103"],["076324"]] + +

ets:match/2 uses a simpler type of match specification, + but it is still unreadable, and one has little control over the + returned result. It is always a list of lists.

+ +

ets:foldl/3 or + ets:foldr/3 can be used to avoid the nested lists:

+ ets:foldr(fun(#emp{empno = E, dept = sales},Acc) -> [E | Acc]; (_,Acc) -> Acc end, [], - emp_tab). -

Running that would result in ["011103","076324"] - , which at least gets rid of the extra lists. The fun is also quite + emp_tab). + +

The result is ["011103","076324"]. The fun is straightforward, so the only problem is that all the data from the - table has to be transferred from the table to the calling process for - filtering. That's inefficient compared to the ets:match + table must be transferred from the table to the calling process for + filtering. That is inefficient compared to the ets:match/2 call where the filtering can be done "inside" the emulator and only - the result is transferred to the process. Remember that ets tables are - all about efficiency, if it wasn't for efficiency all of ets could be - implemented in Erlang, as a process receiving requests and sending - answers back. One uses ets because one wants performance, and - therefore one wouldn't want all of the table transferred to the - process for filtering. OK, let's look at a pure - ets:select call that does what the ets:foldr - does:

+ the result is transferred to the process.

+ +

Consider a "pure" ets:select/2 call that does what + ets:foldr does:

+ -ets:select(emp_tab,[{#emp{empno = '$1', dept = sales, _='_'},[],['$1']}]). -

Even though the record syntax is used, it's still somewhat hard to +ets:select(emp_tab, [{#emp{empno = '$1', dept = sales, _='_'},[],['$1']}]). + +

Although the record syntax is used, it is still hard to read and even harder to write. The first element of the tuple, - #emp{empno = '$1', dept = sales, _='_'} tells what to - match, elements not matching this will not be returned at all, as in - the ets:match example. The second element, the empty list - is a list of guard expressions, which we need none, and the third + #emp{empno = '$1', dept = sales, _='_'}, tells what to + match. Elements not matching this are not returned, as in + the ets:match/2 example. The second element, the empty list, + is a list of guard expressions, which we do not need. The third element is the list of expressions constructing the return value (in - ets this almost always is a list containing one single term). In our - case '$1' is bound to the employee number in the head - (first element of tuple), and hence it is the employee number that is - returned. The result is ["011103","076324"], just as in - the ets:foldr example, but the result is retrieved much - more efficiently in terms of execution speed and memory consumption.

-

We have one efficient but hardly readable way of doing it and one - inefficient but fairly readable (at least to the skilled Erlang - programmer) way of doing it. With the use of ets:fun2ms, - one could have something that is as efficient as possible but still is - written as a filter using the fun syntax:

+ ETS this is almost always a list containing one single term). + In our case '$1' is bound to the employee number in the head + (first element of the tuple), and hence the employee number is + returned. The result is ["011103","076324"], as in + the ets:foldr/3 example, but the result is retrieved much + more efficiently in terms of execution speed and + memory consumption.

+ +

Using ets:fun2ms/1, we can combine the ease of use of + the ets:foldr/3 and the efficiency of the pure + ets:select/2 example:

+ -include_lib("stdlib/include/ms_transform.hrl"). -% ... - ets:select(emp_tab, ets:fun2ms( fun(#emp{empno = E, dept = sales}) -> E - end)). -

This may not be the shortest of the expressions, but it requires no - special knowledge of match specifications to read. The fun's head - should simply match what you want to filter out and the body returns - what you want returned. As long as the fun can be kept within the - limits of the match specifications, there is no need to transfer all - data of the table to the process for filtering as in the - ets:foldr example. In fact it's even easier to read then - the ets:foldr example, as the select call in itself - discards anything that doesn't match, while the fun of the - foldr call needs to handle both the elements matching and - the ones not matching.

-

It's worth noting in the above ets:fun2ms example that one - needs to include ms_transform.hrl in the source code, as this is - what triggers the parse transformation of the ets:fun2ms call - to a valid match specification. This also implies that the - transformation is done at compile time (except when called from the - shell of course) and therefore will take no resources at all in - runtime. So although you use the more intuitive fun syntax, it gets as - efficient in runtime as writing match specifications by hand.

-

Let's look at some more ets examples. Let's say one - wants to get all the employee numbers of any employee hired before the - year 2000. Using ets:match isn't an alternative here as - relational operators cannot be expressed there. Once again, an - ets:foldr could do it (slowly, but correct):

+ end)). + +

This example requires no special knowledge of match + specifications to understand. The head of the fun matches what + you want to filter out and the body returns what you want + returned. As long as the fun can be kept within the limits of the + match specifications, there is no need to transfer all table data + to the process for filtering as in the ets:foldr/3 + example. It is easier to read than the ets:foldr/3 example, + as the select call in itself discards anything that does not + match, while the fun of the ets:foldr/3 call needs to + handle both the elements matching and the ones not matching.

+ +

In the ets:fun2ms/1 example above, it is needed to + include ms_transform.hrl in the source code, as this is + what triggers the parse transformation of the ets:fun2ms/1 + call to a valid match specification. This also implies that the + transformation is done at compile time (except when called from + the shell) and therefore takes no resources in runtime. That is, + although you use the more intuitive fun syntax, it gets as + efficient in runtime as writing match specifications by hand.

+
+ +
+ Example 2 +

Assume that we want to get all the employee numbers of employees + hired before year 2000. Using ets:match/2 is not + an alternative here, as relational operators cannot be + expressed there. + Once again, ets:foldr/3 can do it (slowly, but correct):

+ [E | Acc]; (_,Acc) -> Acc end, [], emp_tab). ]]> -

The result will be - ["052341","076324","535216","789789","989891"], as - expected. Now the equivalent expression using a handwritten match - specification would look something like this:

+ +

The result is ["052341","076324","535216","789789","989891"], + as expected. The equivalent expression using a handwritten match + specification would look like this:

+ -

This gives the same result, the is in - the guard part and therefore discards anything that does not have a - empyear (bound to '$2' in the head) less than 2000, just as the guard - in the foldl example. Lets jump on to writing it using - ets:fun2ms

+ +

This gives the same result. is in + the guard part and therefore discards anything that does not have an + empyear (bound to '$2' in the head) less than 2000, as + the guard in the foldr/3 example.

+ +

We write it using ets:fun2ms/1:

+ - E + E end)). ]]> -

Obviously readability is gained by using the parse transformation.

-

I'll show some more examples without the tiresome - comparing-to-alternatives stuff. Let's say we'd want the whole object - matching instead of only one element. We could of course assign a - variable to every part of the record and build it up once again in the - body of the fun, but it's easier to do like this:

+
+ +
+ Example 3 +

Assume that we want the whole object matching instead of only one + element. One alternative is to assign a variable to every part + of the record and build it up once again in the body of the fun, but + the following is easier:

+ Obj - end)). ]]> -

Just as in ordinary Erlang matching, you can bind a variable to the - whole matched object using a "match in then match", i.e. a - =. Unfortunately this is not general in fun's translated - to match specifications, only on the "top level", i.e. matching the - whole object arriving to be matched into a separate variable, - is it allowed. For the one's used to writing match specifications by - hand, I'll have to mention that the variable A will simply be - translated into '$_'. It's not general, but it has very common usage, - why it is handled as a special, but useful, case. If this bothers you, - the pseudo function object also returns the whole matched - object, see the part about caveats and limitations below.

-

Let's do something in the fun's body too: Let's say - that someone realizes that there are a few people having an employee - number beginning with a zero (0), which shouldn't be - allowed. All those should have their numbers changed to begin with a - one (1) instead and one wants the - list ,}]]]> created:

+ end)).]]> + +

As in ordinary Erlang matching, you can bind a variable to the + whole matched object using a "match inside the match", that is, a + =. Unfortunately in funs translated to match specifications, + it is allowed only at the "top-level", that is, + matching the whole object arriving to be matched + into a separate variable. + If you are used to writing match specifications by hand, we + mention that variable A is simply translated into '$_'. + Alternatively, pseudo function object/0 + also returns the whole matched object, see section + + Warnings and Restrictions.

+
+ +
+ Example 4 +

This example concerns the body of the fun. Assume that all employee + numbers beginning with zero (0) must be changed to begin with + one (1) instead, and that we want to create the list + ,}]]]>:

+ ets:select(emp_tab, ets:fun2ms( fun(#emp{empno = [$0 | Rest] }) -> {[$0|Rest],[$1|Rest]} - end)). -

As a matter of fact, this query hits the feature of partially bound - keys in the table type ordered_set, so that not the whole - table need be searched, only the part of the table containing keys - beginning with 0 is in fact looked into.

-

The fun of course can have several clauses, so that if one could do - the following: For each employee, if he or she is hired prior to 1997, - return the tuple }]]>, for each hired 1997 - or later, but before 2001, return }]]>, for all others return }]]>. All except for the ones named Smith as - they would be affronted by anything other than the tag - guru and that is also what's returned for their numbers; - }]]>:

+ end)). + +

This query hits the feature of partially bound + keys in table type ordered_set, so that not the whole + table needs to be searched, only the part containing keys + beginning with 0 is looked into.

+
+ +
+ Example 5 +

The fun can have many clauses. Assume that we want to do + the following:

+ + + +

If an employee started before 1997, return the tuple + }]]>.

+ + +

If an employee started 1997 or later, but before 2001, return + }]]>.

+ + +

For all other employees, return + }]]>, except for those + named Smith as they would be affronted by anything other + than the tag guru and that is also what is returned for their + numbers: }]]>.

+ + + +

This is accomplished as follows:

+ @@ -268,7 +321,9 @@ ets:select(emp_tab, ets:fun2ms( (#emp{empno = E, empyear = Y}) -> % 1997 -- 2001 {rookie, E} end)). ]]> -

The result will be:

+ +

The result is as follows:

+ [{rookie,"011103"}, {rookie,"041231"}, @@ -278,162 +333,207 @@ ets:select(emp_tab, ets:fun2ms( {rookie,"535216"}, {inventory,"789789"}, {newbie,"963721"}, - {rookie,"989891"}] -

and so the Smith's will be happy...

-

So, what more can you do? Well, the simple answer would be; look - in the documentation of match specifications in ERTS users - guide. However let's briefly go through the most useful "built in - functions" that you can use when the fun is to be - translated into a match specification by ets:fun2ms (it's - worth mentioning, although it might be obvious to some, that calling - other functions than the one's allowed in match specifications cannot - be done. No "usual" Erlang code can be executed by the fun being - translated by fun2ms, the fun is after all limited + {rookie,"989891"}] +

+ +
+ Useful BIFs +

What more can you do? A simple answer is: see the documentation of + match specifications + in ERTS User's Guide. + However, the following is a brief overview of the most useful "built-in + functions" that you can use when the fun is to be translated into a match + specification by + ets:fun2ms/1. It is not + possible to call other functions than those allowed in match + specifications. No "usual" Erlang code can be executed by the fun that + is translated by ets:fun2ms/1. The fun is limited exactly to the power of the match specifications, which is - unfortunate, but the price one has to pay for the execution speed of - an ets:select compared to ets:foldl/foldr).

-

The head of the fun is obviously a head matching (or mismatching) - one parameter, one object of the table we select + unfortunate, but the price one must pay for the execution speed of + ets:select/2 compared to ets:foldl/foldr.

+ +

The head of the fun is a head matching (or mismatching) + one parameter, one object of the table we select from. The object is always a single variable (can be _) or - a tuple, as that's what's in ets, dets and - mnesia tables (the match specification returned by - ets:fun2ms can of course be used with - dets:select and mnesia:select as well as - with ets:select). The use of = in the head - is allowed (and encouraged) on the top level.

+ a tuple, as ETS, Dets, and Mnesia tables include + that. The match specification returned by ets:fun2ms/1 can + be used with dets:select/2 and mnesia:select/2, and + with ets:select/2. The use of = in the head + is allowed (and encouraged) at the top-level.

+

The guard section can contain any guard expression of Erlang. - Even the "old" type test are allowed on the toplevel of the guard - (integer(X) instead of is_integer(X)). As the new type tests (the - is_ tests) are in practice just guard bif's they can also - be called from within the body of the fun, but so they can in ordinary - Erlang code. Also arithmetics is allowed, as well as ordinary guard - bif's. Here's a list of bif's and expressions:

+ The following is a list of BIFs and expressions:

+ - The type tests: is_atom, is_float, is_integer, - is_list, is_number, is_pid, is_port, is_reference, is_tuple, - is_binary, is_function, is_record - The boolean operators: not, and, or, andalso, orelse - The relational operators: >, >=, <, =<, =:=, ==, =/=, /= - Arithmetics: +, -, *, div, rem - Bitwise operators: band, bor, bxor, bnot, bsl, bsr - The guard bif's: abs, element, hd, length, node, round, size, tl, - trunc, self - The obsolete type test (only in guards): - atom, float, integer, - list, number, pid, port, reference, tuple, - binary, function, record + +

Type tests: is_atom, is_float, is_integer, + is_list, is_number, is_pid, is_port, + is_reference, is_tuple, is_binary, + is_function, is_record

+ + +

Boolean operators: not, and, or, + andalso, orelse

+ + +

Relational operators: >, >=, <, =<, =:=, ==, =/=, /=

+ + +

Arithmetics: +, -, *, + div, rem

+ + +

Bitwise operators: band, bor, bxor, bnot, + bsl, bsr

+ + +

The guard BIFs: abs, element, + hd, length, + node, round, size, tl, trunc, + self

+ +

Contrary to the fact with "handwritten" match specifications, the is_record guard works as in ordinary Erlang code.

-

Semicolons (;) in guards are allowed, the result will be (as - expected) one "match_spec-clause" for each semicolon-separated - part of the guard. The semantics being identical to the Erlang + +

Semicolons (;) in guards are allowed, the result is (as + expected) one "match specification clause" for each semicolon-separated + part of the guard. The semantics is identical to the Erlang semantics.

-

The body of the fun is used to construct the - resulting value. When selecting from tables one usually just construct + +

The body of the fun is used to construct the + resulting value. When selecting from tables, one usually construct a suiting term here, using ordinary Erlang term construction, like - tuple parentheses, list brackets and variables matched out in the - head, possibly in conjunction with the occasional constant. Whatever - expressions are allowed in guards are also allowed here, but there are - no special functions except object and + tuple parentheses, list brackets, and variables matched out in the + head, possibly with the occasional constant. Whatever + expressions are allowed in guards are also allowed here, but no special + functions exist except object and bindings (see further down), which returns the whole - matched object and all known variable bindings respectively.

+ matched object and all known variable bindings, respectively.

+

The dbg variants of match specifications have an - imperative approach to the match specification body, the ets dialect - hasn't. The fun body for ets:fun2ms returns the result - without side effects, and as matching (=) in the body of + imperative approach to the match specification body, the ETS + dialect has not. The fun body for ets:fun2ms/1 returns the result + without side effects. As matching (=) in the body of the match specifications is not allowed (for performance reasons) the - only thing left, more or less, is term construction...

-

Let's move on to the dbg dialect, the slightly - different match specifications translated by dbg:fun2ms.

-

The same reasons for using the parse transformation applies to - dbg, maybe even more so as filtering using Erlang code is - simply not a good idea when tracing (except afterwards, if you trace - to file). The concept is similar to that of ets:fun2ms - except that you usually use it directly from the shell (which can also - be done with ets:fun2ms).

-

Let's manufacture a toy module to trace on

+ only thing left, more or less, is term construction.

+
+ +
+ Example with dbg +

This section describes the slightly different match specifications + translated by + dbg:fun2ms/1.

+ +

The same reasons for using the parse transformation apply to + dbg, maybe even more, as filtering using Erlang code is + not a good idea when tracing (except afterwards, if you trace + to file). The concept is similar to that of ets:fun2ms/1 + except that you usually use it directly from the shell + (which can also be done with ets:fun2ms/1).

+ +

The following is an example module to trace on:

+ -module(toy). -export([start/1, store/2, retrieve/1]). start(Args) -> - toy_table = ets:new(toy_table,Args). + toy_table = ets:new(toy_table, Args). store(Key, Value) -> - ets:insert(toy_table,{Key,Value}). + ets:insert(toy_table, {Key,Value}). retrieve(Key) -> - [{Key, Value}] = ets:lookup(toy_table,Key), - Value. -

During model testing, the first test bails out with a + [{Key, Value}] = ets:lookup(toy_table, Key), + Value. + +

During model testing, the first test results in {badmatch,16} in {toy,start,1}, why?

-

We suspect the ets call, as we match hard on the return value, but - want only the particular new call with - toy_table as first parameter. - So we start a default tracer on the node:

+ +

We suspect the ets:new/2 call, as we match hard on the + return value, but want only the particular new/2 call with + toy_table as first parameter. So we start a default tracer + on the node:

+ 
 1> dbg:tracer().
 {ok,<0.88.0>}
-

And so we turn on call tracing for all processes, we are going to - make a pretty restrictive trace pattern, so there's no need to call - trace only a few processes (it usually isn't):

+ +

We turn on call tracing for all processes, we want to + make a pretty restrictive trace pattern, so there is no need to call + trace only a few processes (usually it is not):

+ 
 2> dbg:p(all,call).
-{ok,[{matched,nonode@nohost,25}]}
-

It's time to specify the filter. We want to view calls that resemble - )]]>:

+{ok,[{matched,nonode@nohost,25}]} + +

We specify the filter, we want to view calls that resemble + )]]>:

+ 
 3> dbg:tp(ets,new,dbg:fun2ms(fun([toy_table,_]) -> true end)).
-{ok,[{matched,nonode@nohost,1},{saved,1}]}
-

As can be seen, the fun's used with - dbg:fun2ms takes a single list as parameter instead of a +{ok,[{matched,nonode@nohost,1},{saved,1}]} + +

As can be seen, the fun used with + dbg:fun2ms/1 takes a single list as parameter instead of a single tuple. The list matches a list of the parameters to the traced - function. A single variable may also be used of course. The body - of the fun expresses in a more imperative way actions to be taken if - the fun head (and the guards) matches. I return true here, but it's - only because the body of a fun cannot be empty, the return value will - be discarded.

-

When we run the test of our module now, we get the following trace - output:

+ function. A single variable can also be used. The body + of the fun expresses, in a more imperative way, actions to be taken if + the fun head (and the guards) matches. true is returned here, + only because the body of a fun cannot be empty. The return value + is discarded.

+ +

The following trace output is received during test:

+ ) call ets:new(toy_table,[ordered_set]) ]]> -

Let's play we haven't spotted the problem yet, and want to see what - ets:new returns. We do a slightly different trace - pattern:

+(<0.86.0>) call ets:new(toy_table, [ordered_set]) ]]> + +

Assume that we have not found the problem yet, and want to see what + ets:new/2 returns. We use a slightly different trace pattern:

+ 
 4> dbg:tp(ets,new,dbg:fun2ms(fun([toy_table,_]) -> return_trace() end)).
-

Resulting in the following trace output when we run the test:

+ +

The following trace output is received during test:

+ ) call ets:new(toy_table,[ordered_set]) (<0.86.0>) returned from ets:new/2 -> 24 ]]> -

The call to return_trace, makes a trace message appear + +

The call to return_trace results in a trace message when the function returns. It applies only to the specific function call triggering the match specification (and matching the head/guards of - the match specification). This is the by far the most common call in the + the match specification). This is by far the most common call in the body of a dbg match specification.

-

As the test now fails with {badmatch,24}, it's obvious - that the badmatch is because the atom toy_table does not - match the number returned for an unnamed table. So we spotted the - problem, the table should be named and the arguments supplied by our - test program does not include named_table. We rewrite the - start function to:

+ +

The test now fails with {badmatch,24} because the atom + toy_table does not match the number returned for an unnamed table. + So, the problem is found, the table is to be named, and the arguments + supplied by the test program do not include named_table. We + rewrite the start function:

+ start(Args) -> - toy_table = ets:new(toy_table,[named_table |Args]). -

And with the same tracing turned on, we get the following trace - output:

+ toy_table = ets:new(toy_table, [named_table|Args]). + +

With the same tracing turned on, the following trace output is + received:

+ ) call ets:new(toy_table,[named_table,ordered_set]) (<0.86.0>) returned from ets:new/2 -> toy_table ]]> -

Very well. Let's say the module now passes all testing and goes into - the system. After a while someone realizes that the table - toy_table grows while the system is running and that for some - reason there are a lot of elements with atom's as keys. You had - expected only integer keys and so does the rest of the system. Well, - obviously not all of the system. You turn on call tracing and try to - see calls to your module with an atom as the key:

+ +

Assume that the module now passes all testing and goes into + the system. After a while, it is found that table + toy_table grows while the system is running and that + there are many elements with atoms as keys. We expected + only integer keys and so does the rest of the system, but + clearly not the entire system. We turn on call tracing and try to + see calls to the module with an atom as the key:

+ 
 1> dbg:tracer().
 {ok,<0.88.0>}
@@ -441,80 +541,101 @@ start(Args) ->
 {ok,[{matched,nonode@nohost,25}]}
 3> dbg:tpl(toy,store,dbg:fun2ms(fun([A,_]) when is_atom(A) -> true end)).
 {ok,[{matched,nonode@nohost,1},{saved,1}]}
-

We use dbg:tpl here to make sure to catch local calls - (let's say the module has grown since the smaller version and we're - not sure this inserting of atoms is not done locally...). When in - doubt always use local call tracing.

-

Let's say nothing happens when we trace in this way. Our function - is never called with these parameters. We make the conclusion that - someone else (some other module) is doing it and we realize that we - must trace on ets:insert and want to see the calling function. The - calling function may be retrieved using the match specification - function caller and to get it into the trace message, one - has to use the match spec function message. The filter - call looks like this (looking for calls to ets:insert):

+ +

We use dbg:tpl/3 to ensure to catch local calls + (assume that the module has grown since the smaller version and we are + unsure if this inserting of atoms is not done locally). When in + doubt, always use local call tracing.

+ +

Assume that nothing happens when tracing in this way. The function + is never called with these parameters. We conclude that + someone else (some other module) is doing it and realize that we + must trace on ets:insert/2 and want to see the calling function. + The calling function can be retrieved using the match specification + function caller. To get it into the trace message, the match + specification function message must be used. The filter + call looks like this (looking for calls to ets:insert/2):

+ 
 4> dbg:tpl(ets,insert,dbg:fun2ms(fun([toy_table,{A,_}]) when is_atom(A) -> 
                                     message(caller()) 
                                   end)). 
-{ok,[{matched,nonode@nohost,1},{saved,2}]}
-

The caller will now appear in the "additional message" part of the - trace output, and so after a while, the following output comes:

+{ok,[{matched,nonode@nohost,1},{saved,2}]} + +

The caller is now displayed in the "additional message" part of the + trace output, and the following is displayed after a while:

+ ) call ets:insert(toy_table,{garbage,can}) ({evil_mod,evil_fun,2}) ]]> -

You have found out that the function evil_fun of the - module evil_mod, with arity 2, is the one - causing all this trouble.

-

This was just a toy example, but it illustrated the most used - calls in match specifications for dbg The other, more - esotheric calls are listed and explained in the Users guide of the ERTS application, they really are beyond the scope of this - document.

-

To end this chatty introduction with something more precise, here - follows some parts about caveats and restrictions concerning the fun's - used in conjunction with ets:fun2ms and - dbg:fun2ms:

+ +

You have realized that function evil_fun of the + evil_mod module, with arity 2, is causing all this trouble. +

+ +

This example illustrates the most used calls in match specifications for + dbg. The other, more esoteric, calls are listed and explained in + Match specifications in Erlang + in ERTS User's Guide, as they are beyond + the scope of this description.

+
+ +
+ Warnings and Restrictions + +

The following warnings and restrictions apply to the funs used in + with ets:fun2ms/1 and dbg:fun2ms/1.

+ -

To use the pseudo functions triggering the translation, one - has to include the header file ms_transform.hrl - in the source code. Failure to do so will possibly result in - runtime errors rather than compile time, as the expression may +

To use the pseudo functions triggering the translation, + ensure to include the header file ms_transform.hrl + in the source code. Failure to do so possibly results in + runtime errors rather than compile time, as the expression can be valid as a plain Erlang program without translation.

 + -

The fun has to be literally constructed inside the - parameter list to the pseudo functions. The fun cannot +

The fun must be literally constructed inside the + parameter list to the pseudo functions. The fun cannot be bound to a variable first and then passed to - ets:fun2ms or dbg:fun2ms, i.e this - will work: ets:fun2ms(fun(A) -> A end) but not this: - F = fun(A) -> A end, ets:fun2ms(F). The later will result - in a compile time error if the header is included, otherwise a - runtime error. Even if the later construction would ever - appear to work, it really doesn't, so don't ever use it.

+ ets:fun2ms/1 or dbg:fun2ms/1. For example, + ets:fun2ms(fun(A) -> A end) works, but not + F = fun(A) -> A end, ets:fun2ms(F). The latter results + in a compile-time error if the header is included, otherwise a + runtime error.

 -

Several restrictions apply to the fun that is being translated - into a match_spec. To put it simple you cannot use anything in - the fun that you cannot use in a match_spec. This means that, + +

Many restrictions apply to the fun that is translated into a match + specification. To put it simple: you cannot use anything in the fun + that you cannot use in a match specification. This means that, among others, the following restrictions apply to the fun itself:

+ - Functions written in Erlang cannot be called, neither - local functions, global functions or real fun's - Everything that is written as a function call will be - translated into a match_spec call to a builtin function, so that - the call is_list(X) will be translated to {'is_list', '$1'} ('$1' is just an example, the numbering may - vary). If one tries to call a function that is not a match_spec - builtin, it will cause an error. - Variables occurring in the head of the fun will be - replaced by match_spec variables in the order of occurrence, so - that the fragment fun({A,B,C}) will be replaced by - {'$1', '$2', '$3'} etc. Every occurrence of such a - variable later in the match_spec will be replaced by a - match_spec variable in the same way, so that the fun - fun({A,B}) when is_atom(A) -> B end will be translated into - [{{'$1','$2'},[{is_atom,'$1'}],['$2']}]. -

Variables that are not appearing in the head are imported - from the environment and made into - match_spec const expressions. Example from the shell:

+

Functions written in Erlang cannot be called, neither can + local functions, global functions, or real funs.

+ + +

Everything that is written as a function call is translated + into a match specification call to a built-in function, so that + the call is_list(X) is translated to {'is_list', '$1'} + ('$1' is only an example, the numbering can vary). + If one tries to call a function that is not a match specification + built-in, it causes an error.

+ + +

Variables occurring in the head of the fun are replaced by + match specification variables in the order of occurrence, so + that fragment fun({A,B,C}) is replaced by + {'$1', '$2', '$3'}, and so on. Every occurrence of such a + variable in the match specification is replaced by a match + specification variable in the same way, so that the fun + fun({A,B}) when is_atom(A) -> B end is translated into + [{{'$1','$2'},[{is_atom,'$1'}],['$2']}].

+ + +

Variables that are not included in the head are imported + from the environment and made into match specification + const expressions. Example from the shell:

 1> X = 25.
 25
@@ -523,7 +644,7 @@ start(Args) ->
       
       
         
Matching with = cannot be used in the body. It can only
-          be used on the top level in the head of the fun. 
+          be used on the top-level in the head of the fun.
           Example from the shell again:

         
 1> ets:fun2ms(fun({A,[B|C]} = D) when A > B -> D end).
@@ -534,106 +655,125 @@ match_spec
 {error,transform_error}
 3> ets:fun2ms(fun({A,[B|C]}) when A > B -> D = [B|C], D end).
 Error: fun with body matching ('=' in body) is illegal as match_spec
-{error,transform_error}        

-        
All variables are bound in the head of a match_spec, so the 
-          translator can not allow multiple bindings. The special case
-          when matching is done on the top level makes the variable bind
-          to '$_' in the resulting match_spec, it is to allow a more
-          natural access to the whole matched object. The pseudo
-          function object() could be used instead, see below. 
-          The following expressions are translated equally: 

+{error,transform_error}
+

All variables are bound in the head of a match specification, so + the translator cannot allow multiple bindings. The special case + when matching is done on the top-level makes the variable bind + to '$_' in the resulting match specification. It is to allow + a more natural access to the whole matched object. Pseudo + function object() can be used instead, see below.

+

The following expressions are translated equally:

ets:fun2ms(fun({a,_} = A) -> A end). ets:fun2ms(fun({a,_}) -> object() end). -

The special match_spec variables '$_' and '$*' +

The special match specification variables '$_' and '$*' can be accessed through the pseudo functions object() (for '$_') and bindings() (for '$*'). - as an example, one could translate the following - ets:match_object/2 call to a ets:select call:

+ As an example, one can translate the following + ets:match_object/2 call to a ets:select/2 call:

ets:match_object(Table, {'$1',test,'$2'}). -

...is the same as...

+

This is the same as:

ets:select(Table, ets:fun2ms(fun({A,test,B}) -> object() end)). -

(This was just an example, in this simple case the former - expression is probably preferable in terms of readability). - The ets:select/2 call will conceptually look like this +

In this simple case, the former + expression is probably preferable in terms of readability.

+

The ets:select/2 call conceptually looks like this in the resulting code:

ets:select(Table, [{{'$1',test,'$2'},[],['$_']}]). -

Matching on the top level of the fun head might feel like a +

Matching on the top-level of the fun head can be a more natural way to access '$_', see above.

 - Term constructions/literals are translated as much as is - needed to get them into valid match_specs, so that tuples are - made into match_spec tuple constructions (a one element tuple - containing the tuple) and constant expressions are used when - importing variables from the environment. Records are also - translated into plain tuple constructions, calls to element - etc. The guard test is_record/2 is translated into - match_spec code using the three parameter version that's built - into match_specs, so that is_record(A,t) is translated - into {is_record,'$1',t,5} given that the record size of - record type t is 5. - Language constructions like case, if, - catch etc that are not present in match_specs are not - allowed. - If the header file ms_transform.hrl is not included, - the fun won't be translated, which may result in a - runtime error (depending on if the fun is valid in a - pure Erlang context). Be absolutely sure that the header is - included when using ets and dbg:fun2ms/1 in - compiled code. - If the pseudo function triggering the translation is - ets:fun2ms/1, the fun's head must contain a single - variable or a single tuple. If the pseudo function is - dbg:fun2ms/1 the fun's head must contain a single - variable or a single list. + +

Term constructions/literals are translated as much as is needed to + get them into valid match specification. This way tuples are made + into match specification tuple constructions (a one element tuple + containing the tuple) and constant expressions are used when + importing variables from the environment. Records are also + translated into plain tuple constructions, calls to element, + and so on. The guard test is_record/2 is translated into + match specification code using the three parameter version that is + built into match specification, so that is_record(A,t) is + translated into {is_record,'$1',t,5} if the record + size of record type t is 5.

+ + +

Language constructions such as case, if, and + catch that are not present in match specifications are not + allowed.

+ + +

If header file ms_transform.hrl is not included, + the fun is not translated, which can result in a + runtime error (depending on whether the fun is + valid in a pure Erlang context).

+

Ensure that the header is included when using ets and + dbg:fun2ms/1 in compiled code.

+ + +

If pseudo function triggering the translation is + ets:fun2ms/1, the head of the fun must contain a single + variable or a single tuple. If the pseudo function is + dbg:fun2ms/1, the head of the fun must contain a single + variable or a single list.

+ -

The translation from fun's to match_specs is done at compile +

The translation from funs to match specifications is done at compile time, so runtime performance is not affected by using these pseudo - functions. The compile time might be somewhat longer though.

-

For more information about match_specs, please read about them - in ERTS users guide.

- + functions.

+

For more information about match specifications, see the + Match specifications in Erlang + in ERTS User's Guide.

+
+ - - Transforms Erlang abstract format containing calls to ets/dbg:fun2ms into literal match specifications. - Option list, required but not used. + + Error formatting function as required by the parse transformation interface. -

Implements the actual transformation at compile time. This - function is called by the compiler to do the source code - transformation if and when the ms_transform.hrl header - file is included in your source code. See the ets and - dbg:fun2ms/1 function manual pages for - documentation on how to use this parse_transform, see the - match_spec chapter in ERTS users guide for a - description of match specifications.

+

Takes an error code returned by one of the other functions + in the module and creates a textual description of the + error.

 + - - Used when transforming fun's created in the shell into match_specifications. - List of variable bindings in the shell environment. + + Transforms Erlang abstract format containing calls to + ets/dbg:fun2ms/1 into literal match specifications. + Option list, required but not used. + -

Implements the actual transformation when the fun2ms - functions are called from the shell. In this case the abstract - form is for one single fun (parsed by the Erlang shell), and - all imported variables should be in the key-value list passed - as BoundEnvironment. The result is a term, normalized, - i.e. not in abstract format.

+

Implements the transformation at compile time. This + function is called by the compiler to do the source code + transformation if and when header file ms_transform.hrl + is included in the source code.

+

For information about how to use this parse transformation, see + ets and + + dbg:fun2ms/1.

+

For a description of match specifications, see section + + Match Specification in Erlang in ERTS User's Guide.

 + - - Error formatting function as required by the parse_transform interface. + + Used when transforming funs created in the shell into + match_specifications. + List of variable bindings in the + shell environment. -

Takes an error code returned by one of the other functions - in the module and creates a textual description of the - error. Fairly uninteresting function actually.

+

Implements the transformation when the fun2ms/1 + functions are called from the shell. In this case, the abstract + form is for one single fun (parsed by the Erlang shell). + All imported variables are to be in the key-value list passed + as BoundEnvironment. The result is a term, + normalized, that is, not in abstract format.

 diff --git a/lib/stdlib/doc/src/orddict.xml b/lib/stdlib/doc/src/orddict.xml index 950f688735..076b06fc38 100644 --- a/lib/stdlib/doc/src/orddict.xml +++ b/lib/stdlib/doc/src/orddict.xml @@ -24,33 +24,35 @@ orddict Robert Virding - nobody + - nobody - no + + 2007-04-16 B - orddict.sgml + orddict.xml
orddict - Key-Value Dictionary as Ordered List + Key-value dictionary as ordered list. -

Orddict implements a Key - Value dictionary. +

This module provides a Key-Value dictionary. An orddict is a representation of a dictionary, where a list of pairs is used to store the keys and values. The list is ordered after the keys.

-

This module provides exactly the same interface as the module - dict but with a defined representation. One difference is + +

This module provides the same interface as the + dict(3) module + but with a defined representation. One difference is that while dict considers two keys as different if they do not match (=:=), this module considers two keys as - different if and only if they do not compare equal - (==).

+ different if and only if they do not compare equal (==).

 -

Dictionary as returned by new/0.

 +

Dictionary as returned by + new/0.

 @@ -60,202 +62,229 @@ - Append a value to keys in a dictionary + Append a value to keys in a dictionary. -

This function appends a new Value to the current list - of values associated with Key. An exception is - generated if the initial value associated with Key is - not a list of values.

+

Appends a new Value to the current list + of values associated with Key. An exception is + generated if the initial value associated with Key + is not a list of values.

+

See also section Notes.

 + - Append new values to keys in a dictionary + Append new values to keys in a dictionary. -

This function appends a list of values ValList to - the current list of values associated with Key. An - exception is generated if the initial value associated with +

Appends a list of values ValList to + the current list of values associated with Key. + An exception is generated if the initial value associated with Key is not a list of values.

+

See also section Notes.

 + - Erase a key from a dictionary + Erase a key from a dictionary. -

This function erases all items with a given key from a - dictionary.

+

Erases all items with a specified key from a dictionary.

 + - Look-up values in a dictionary + Look up values in a dictionary. -

This function returns the value associated with Key - in the dictionary Orddict. fetch assumes that - the Key is present in the dictionary and an exception +

Returns the value associated with Key + in dictionary Orddict. This function assumes that + the Key is present in the dictionary. An exception is generated if Key is not in the dictionary.

+

See also section Notes.

 + - Return all keys in a dictionary + Return all keys in a dictionary. -

This function returns a list of all keys in the dictionary.

+

Returns a list of all keys in a dictionary.

 + - Choose elements which satisfy a predicate + Select elements that satisfy a predicate. -

Orddict2 is a dictionary of all keys and values in - Orddict1 for which Pred(Key, Value) is true.

+

Orddict2 is a dictionary of all keys and values + in Orddict1 for which + Pred(Key, Value) is + true.

 + - Search for a key in a dictionary + Search for a key in a dictionary. -

This function searches for a key in a dictionary. Returns - {ok, Value} where Value is the value associated - with Key, or error if the key is not present in - the dictionary.

+

Searches for a key in a dictionary. Returns + {ok, Value}, where Value is + the value associated with Key, or error if + the key is not present in the dictionary.

+

See also section Notes.

 + - Fold a function over a dictionary + Fold a function over a dictionary.

Calls Fun on successive keys and values of Orddict together with an extra argument Acc (short for accumulator). Fun must return a new - accumulator which is passed to the next call. Acc0 is - returned if the list is empty.

+ accumulator that is passed to the next call. Acc0 + is returned if the list is empty.

 + - Convert a list of pairs to a dictionary + Convert a list of pairs to a dictionary. -

This function converts the Key - Value list +

Converts the Key-Value list List to a dictionary.

 + + + + Return true if the dictionary is empty. + +

Returns true if Orddict has no elements, + otherwise false.

+ + + - Test if a key is in a dictionary + Test if a key is in a dictionary. -

This function tests if Key is contained in - the dictionary Orddict.

+

Tests if Key is contained in + dictionary Orddict.

 + - Map a function over a dictionary + Map a function over a dictionary. -

map calls Fun on successive keys and values - of Orddict1 to return a new value for each key.

+

Calls Fun on successive keys and values of + Orddict1 tvo return a new value for each key.

 + - Merge two dictionaries + Merge two dictionaries. -

merge merges two dictionaries, Orddict1 and - Orddict2, to create a new dictionary. All the Key - - Value pairs from both dictionaries are included in - the new dictionary. If a key occurs in both dictionaries then - Fun is called with the key and both values to return a - new value. merge could be defined as:

+

Merges two dictionaries, Orddict1 and + Orddict2, to create a new dictionary. All the + Key-Value pairs from both + dictionaries are included in the new dictionary. If a key occurs in + both dictionaries, Fun is called with the key and + both values to return a new value. + merge/3 can be defined as follows, but is faster:

merge(Fun, D1, D2) -> fold(fun (K, V1, D) -> update(K, fun (V2) -> Fun(K, V1, V2) end, V1, D) end, D2, D1). -

but is faster.

 + - Create a dictionary + Create a dictionary. -

This function creates a new dictionary.

+

Creates a new dictionary.

 + - Return the number of elements in an ordered dictionary + Return the number of elements in an ordered dictionary. +

Returns the number of elements in an Orddict.

 - - - Return true if the dictionary is empty - -

Returns true if Orddict has no elements, false otherwise.

- - + - Store a value in a dictionary + Store a value in a dictionary. -

This function stores a Key - Value pair in a - dictionary. If the Key already exists in Orddict1, +

Stores a Key-Value pair in a + dictionary. If the Key already exists in + Orddict1, the associated value is replaced by Value.

 + - Convert a dictionary to a list of pairs + Convert a dictionary to a list of pairs. -

This function converts the dictionary to a list - representation.

+

Converts a dictionary to a list representation.

 + - Update a value in a dictionary + Update a value in a dictionary. -

Update a value in a dictionary by calling Fun on - the value to get a new value. An exception is generated if +

Updates a value in a dictionary by calling Fun + on the value to get a new value. An exception is generated if Key is not present in the dictionary.

 + - Update a value in a dictionary + Update a value in a dictionary. -

Update a value in a dictionary by calling Fun on - the value to get a new value. If Key is not present - in the dictionary then Initial will be stored as - the first value. For example append/3 could be defined - as:

+

Updates a value in a dictionary by calling Fun + on the value to get a new value. If Key is not + present in the dictionary, Initial is stored as + the first value. For example, append/3 can be defined + as follows:

append(Key, Val, D) -> update(Key, fun (Old) -> Old ++ [Val] end, [Val], D). + - Increment a value in a dictionary + Increment a value in a dictionary. -

Add Increment to the value associated with Key - and store this value. If Key is not present in - the dictionary then Increment will be stored as +

Adds Increment to the value associated with + Key + and store this value. If Key is not present in + the dictionary, Increment is stored as the first value.

-

This could be defined as:

+

This can be defined as follows, but is faster:

update_counter(Key, Incr, D) -> update(Key, fun (Old) -> Old + Incr end, Incr, D). -

but is faster.
Notes -

The functions append and append_list are included - so we can store keyed values in a list accumulator. For + +

Functions append/3 and append_list/3 are included + so that keyed values can be stored in a list accumulator, for example:

 > D0 = orddict:new(),
@@ -264,19 +293,18 @@ update_counter(Key, Incr, D) ->
   D3 = orddict:append(files, f2, D2),
   D4 = orddict:append(files, f3, D3),
   orddict:fetch(files, D4).
-[f1,f2,f3]
+[f1,f2,f3]

This saves the trouble of first fetching a keyed value, appending a new value to the list of stored values, and storing - the result. -

-

The function fetch should be used if the key is known to - be in the dictionary, otherwise find.

+ the result.

+

Function fetch/2 is to be used if the key is known to + be in the dictionary, otherwise function find/2.

See Also -

dict(3), - gb_trees(3)

+

dict(3), + gb_trees(3)

 diff --git a/lib/stdlib/doc/src/ordsets.xml b/lib/stdlib/doc/src/ordsets.xml index 0d5d618b66..148281fcf7 100644 --- a/lib/stdlib/doc/src/ordsets.xml +++ b/lib/stdlib/doc/src/ordsets.xml @@ -24,23 +24,26 @@ ordsets Robert Virding - Bjarne Dacker + Bjarne Däcker 1 Bjarne Däcker - 99-07-27 + 1999-07-27 A - ordsets.sgml + ordsets.xml
ordsets - Functions for Manipulating Sets as Ordered Lists + Functions for manipulating sets as ordered lists. +

Sets are collections of elements with no duplicate elements. An ordset is a representation of a set, where an ordered list is used to store the elements of the set. An ordered list is more efficient than an unordered list.

-

This module provides exactly the same interface as the module - sets but with a defined representation. One difference is + +

This module provides the same interface as the + sets(3) module + but with a defined representation. One difference is that while sets considers two elements as different if they do not match (=:=), this module considers two elements as different if and only if they do not compare equal (==).

@@ -49,146 +52,168 @@ -

As returned by new/0.

 +

As returned by + new/0.

 + - - Return an empty set + + Add an element to an Ordset. -

Returns a new empty ordered set.

+

Returns a new ordered set formed from Ordset1 + with Element inserted.

 + - - Test for an Ordset + + Remove an element from an Ordset. -

Returns true if Ordset is an ordered set of - elements, otherwise false.

+

Returns Ordset1, but with + Element removed.

 + - - Return the number of elements in a set + + Filter set elements. -

Returns the number of elements in Ordset.

+

Filters elements in Ordset1 with boolean function + Pred.

 + - - Convert an Ordsetinto a list + + Fold over set elements. -

Returns the elements of Ordset as a list.

+

Folds Function over every element in + Ordset and returns the final value of the + accumulator.

 + - Convert a list into an Ordset + Convert a list into an Ordset. -

Returns an ordered set of the elements in List.

+

Returns an ordered set of the elements in List. +

+ - - Test for membership of an Ordset + + Return the intersection of a list of Ordsets -

Returns true if Element is an element of - Ordset, otherwise false.

+

Returns the intersection of the non-empty list of sets.

 + - - Add an element to an Ordset + + Return the intersection of two Ordsets. -

Returns a new ordered set formed from Ordset1 with - Element inserted.

+

Returns the intersection of Ordset1 and + Ordset2.

 + - - Remove an element from an Ordset + + Check whether two Ordsets are disjoint. -

Returns Ordset1, but with Element removed.

+

Returns true if Ordset1 and + Ordset2 are disjoint (have no elements in common), + otherwise false.

 + - - Return the union of two Ordsets + + Test for membership of an Ordset. -

Returns the merged (union) set of Ordset1 and - Ordset2.

+

Returns true if Element is an element of + Ordset, otherwise false.

 + - - Return the union of a list of Ordsets + + Test for an Ordset. -

Returns the merged (union) set of the list of sets.

+

Returns true if Ordset is an ordered set + of elements, otherwise false.

 + - - Return the intersection of two Ordsets + + Test for subset. -

Returns the intersection of Ordset1 and - Ordset2.

+

Returns true when every element of Ordset1 + is also a member of Ordset2, otherwise + false.

 + - - Return the intersection of a list of Ordsets + + Return an empty set. -

Returns the intersection of the non-empty list of sets.

+

Returns a new empty ordered set.

 + - - Check whether two Ordsets are disjoint + + Return the number of elements in a set. -

Returns true if Ordset1 and - Ordset2 are disjoint (have no elements in common), - and false otherwise.

+

Returns the number of elements in Ordset.

 + - Return the difference of two Ordsets + Return the difference of two Ordsets. -

Returns only the elements of Ordset1 which are not +

Returns only the elements of Ordset1 that are not also elements of Ordset2.

 + - - Test for subset + + Convert an Ordset into a list. -

Returns true when every element of Ordset1 is - also a member of Ordset2, otherwise false.

+

Returns the elements of Ordset as a list.

 + - - Fold over set elements + + Return the union of a list of Ordsets. -

Fold Function over every element in Ordset - returning the final value of the accumulator.

+

Returns the merged (union) set of the list of sets.

 + - - Filter set elements + + Return the union of two Ordsets. -

Filter elements in Ordset1 with boolean function - Pred.

+

Returns the merged (union) set of Ordset1 and + Ordset2.
See Also -

gb_sets(3), - sets(3)

+

gb_sets(3), + sets(3)

 diff --git a/lib/stdlib/doc/src/part.xml b/lib/stdlib/doc/src/part.xml index 15b7bd4a1d..93c47405bf 100644 --- a/lib/stdlib/doc/src/part.xml +++ b/lib/stdlib/doc/src/part.xml @@ -31,9 +31,10 @@ 1.0 part.xml
- -

The Erlang standard library STDLIB.

- + + + + diff --git a/lib/stdlib/doc/src/pool.xml b/lib/stdlib/doc/src/pool.xml index d217d071da..05d12ade28 100644 --- a/lib/stdlib/doc/src/pool.xml +++ b/lib/stdlib/doc/src/pool.xml @@ -29,89 +29,103 @@
pool - Load Distribution Facility + Load distribution facility. -

pool can be used to run a set of Erlang nodes as a pool +

This module can be used to run a set of Erlang nodes as a pool of computational processors. It is organized as a master and a set of slave nodes and includes the following features:

+ The slave nodes send regular reports to the master about - their current load. + their current load. Queries can be sent to the master to determine which node - will have the least load. + will have the least load. +

The BIF statistics(run_queue) is used for estimating future loads. It returns the length of the queue of ready to run processes in the Erlang runtime system.

-

The slave nodes are started with the slave module. This - effects, tty IO, file IO, and code loading.

-

If the master node fails, the entire pool will exit.

+ +

The slave nodes are started with the + slave(3) module. This + effects terminal I/O, file I/O, and code loading.

+

If the master node fails, the entire pool exits.

 + - - - - >Start a new pool - -

Starts a new pool. The file .hosts.erlang is read to - find host names where the pool nodes can be started. See - section Files below. The - start-up procedure fails if the file is not found.

-

The slave nodes are started with slave:start/2,3, - passing along Name and, if provided, - Args. - Name is used as the first part of the node names, - Args is used to specify command line arguments. See - slave(3).

-

Access rights must be set so that all nodes in the pool have - the authority to access each other.

-

The function is synchronous and all the nodes, as well as - all the system servers, are running when it returns a value.

- - - Ensure that a pool master is running + Ensure that a pool master is running. -

This function ensures that a pool master is running and - includes Node in the pool master's pool of nodes.

+

Ensures that a pool master is running and includes + Node in the pool master's pool of nodes.

 + - - Stop the pool and kill all the slave nodes + + Return the node with the expected lowest future load. -

Stops the pool and kills all the slave nodes.

+

Returns the node with the expected lowest future load.

 + - Return a list of the current member nodes of the pool + Return a list of the current member nodes of the pool. +

Returns a list of the current member nodes of the pool.

 + - Spawn a process on the pool node with expected lowest future load + Spawn a process on the pool node with expected lowest future + load. -

Spawns a process on the pool node which is expected to have +

Spawns a process on the pool node that is expected to have the lowest future load.

 + - Spawn and link to a process on the pool node with expected lowest future load + Spawn and link to a process on the pool node with expected + lowest future load. -

Spawn links a process on the pool node which is expected to +

Spawns and links to a process on the pool node that is expected to have the lowest future load.

 + - - Return the node with the expected lowest future load + + + >Start a new pool. -

Returns the node with the expected lowest future load.

+

Starts a new pool. The file .hosts.erlang is read to + find host names where the pool nodes can be started; see + section Files. The + startup procedure fails if the file is not found.

+

The slave nodes are started with + slave:start/2,3, + passing along Name and, if provided, + Args. Name is used as the + first part of the node names, Args is used to + specify command-line arguments.

+

Access rights must be set so that all nodes in the pool have + the authority to access each other.

+

The function is synchronous and all the nodes, and + all the system servers, are running when it returns a value.

+ + + + + + Stop the pool and kill all the slave nodes. + +

Stops the pool and kills all the slave nodes.

 @@ -120,12 +134,12 @@ Files

.hosts.erlang is used to pick hosts where nodes can - be started. See - net_adm(3) - for information about format and location of this file.

-

$HOME/.erlang.slave.out.HOST is used for all additional IO - that may come from the slave nodes on standard IO. If the start-up - procedure does not work, this file may indicate the reason.

+ be started. For information about format and location of this file, see + + net_adm:host_file/0.

+

$HOME/.erlang.slave.out.HOST is used for all extra I/O + that can come from the slave nodes on standard I/O. If the startup + procedure does not work, this file can indicate the reason.

 diff --git a/lib/stdlib/doc/src/proc_lib.xml b/lib/stdlib/doc/src/proc_lib.xml index f02b1f0651..58ca5644cf 100644 --- a/lib/stdlib/doc/src/proc_lib.xml +++ b/lib/stdlib/doc/src/proc_lib.xml @@ -29,44 +29,55 @@
proc_lib - Functions for asynchronous and synchronous start of processes adhering to the OTP design principles. + Functions for asynchronous and synchronous start of processes + adhering to the OTP design principles.

This module is used to start processes adhering to - the OTP Design Principles. Specifically, the functions in this - module are used by the OTP standard behaviors (gen_server, - gen_fsm, gen_statem, ...) when starting new processes. - The functions can also be used to start special processes, - user defined processes which comply to the OTP design principles. See - Sys and Proc_Lib in OTP Design Principles for an example.

+ the + OTP Design Principles. Specifically, the functions in this + module are used by the OTP standard behaviors (for example, + gen_server, gen_fsm, and gen_statem) + when starting new processes. The functions + can also be used to start special processes, user-defined + processes that comply to the OTP design principles. For an example, + see section + sys and proc_lib in OTP Design Principles.

+ +

Some useful information is initialized when a process starts. The registered names, or the process identifiers, of the parent process, and the parent ancestors, are stored together with information about the function initially called in the process.

-

While in "plain Erlang" a process is said to terminate normally - only for the exit reason normal, a process started + +

While in "plain Erlang", a process is said to terminate normally + only for exit reason normal, a process started using proc_lib is also said to terminate normally if it exits with reason shutdown or {shutdown,Term}. shutdown is the reason used when an application (supervision tree) is stopped.

-

When a process started using proc_lib terminates - abnormally -- that is, with another exit reason than normal, - shutdown, or {shutdown,Term} -- a crash report - is generated, which is written to terminal by the default SASL + +

When a process that is started using proc_lib terminates + abnormally (that is, with another exit reason than normal, + shutdown, or {shutdown,Term}), a crash report + is generated, which is written to terminal by the default SASL event handler. That is, the crash report is normally only visible - if the SASL application is started. See - sasl(6) and - SASL User's Guide.

-

The crash report contains the previously stored information such + if the SASL application is started; see + sasl(6) and section + SASL Error Logging + in the SASL User's Guide.

+ +

The crash report contains the previously stored information, such as ancestors and initial function, the termination reason, and - information regarding other processes which terminate as a result + information about other processes that terminate as a result of this process terminating.

 +

See - erlang:spawn_opt/2,3,4,5.

+ erlang:spawn_opt/2,3,4,5.

 @@ -83,7 +94,128 @@ + + + + Format a crash report. + +

Equivalent to + format(CrashReport, latin1).

+ + + + + + Format a crash report. + +

This function can be used by a user-defined event handler to + format a crash report. The crash report is sent using + + error_logger:error_report(crash_report, + CrashReport). + That is, the event to be handled is of the format + {error_report, GL, {Pid, crash_report, + CrashReport}}, + where GL is the group leader pid of process + Pid that sent the crash report.

+ + + + + + Format a crash report. + +

This function can be used by a user-defined event handler to + format a crash report. When Depth is specified as a + positive integer, it is used in the format string to + limit the output as follows: io_lib:format("~P", + [Term,Depth]).

+ + + + + + Hibernate a process until a message is sent to it. + +

This function does the same as (and does call) the + + hibernate/3 BIF, + but ensures that exception handling and logging continues to + work as expected when the process wakes up.

+

Always use this function instead of the BIF for processes started + using proc_lib functions.

+ + + + + + + Used by a process when it has started. + +

This function must be used by a process that has been started by + a start[_link]/3,4,5 + function. It tells Parent that the process has + initialized itself, has started, or has failed to initialize + itself.

+

Function init_ack/1 uses the parent value + previously stored by the start function used.

+

If this function is not called, the start function + returns an error tuple (if a link and/or a time-out is used) or + hang otherwise.

+

The following example illustrates how this function and + proc_lib:start_link/3 are used:

+ +-module(my_proc). +-export([start_link/0]). +-export([init/1]). + +start_link() -> + proc_lib:start_link(my_proc, init, [self()]). + +init(Parent) -> + case do_initialization() of + ok -> + proc_lib:init_ack(Parent, {ok, self()}); + {error, Reason} -> + exit(Reason) + end, + loop(). + +... + + + + + + Extract the initial call of a proc_libspawned process. + + +

Extracts the initial call of a process that was started + using one of the spawn or start functions in this module. + Process can either be a pid, an integer tuple + (from which a pid can be created), or the process information of a + process Pid fetched through an + erlang:process_info(Pid) function call.

+ +

The list Args no longer contains the + arguments, but the same number of atoms as the number of arguments; + the first atom is 'Argument__1', the second + 'Argument__2', and so on. The reason is that the argument + list could waste a significant amount of memory, and if the + argument list contained funs, it could be impossible to upgrade the + code for the module.

+

If the process was spawned using a fun, initial_call/1 no + longer returns the fun, but the module, function for the + local function implementing the fun, and the arity, for example, + {some_module,-work/3-fun-0-,0} (meaning that the fun was + created in function some_module:work/3). The reason is that + keeping the fun would prevent code upgrade for the module, and that + a significant amount of memory could be wasted.

+ + + + @@ -96,11 +228,12 @@ -

Spawns a new process and initializes it as described above. - The process is spawned using the - spawn BIFs.

+

Spawns a new process and initializes it as described in the + beginning of this manual page. The process is spawned using the + spawn BIFs.

 + @@ -113,18 +246,19 @@ -

Spawns a new process and initializes it as described above. - The process is spawned using the - spawn_link +

Spawns a new process and initializes it as described in the + beginning of this manual page. The process is spawned using the + spawn_link BIFs.

 + - Spawn a new process with given options. + Spawn a new process with specified options. @@ -132,17 +266,18 @@ -

Spawns a new process and initializes it as described above. - The process is spawned using the - spawn_opt +

Spawns a new process and initializes it as described in the + beginning of this manual page. The process is spawned using the + spawn_opt BIFs.

-

Using the spawn option monitor is currently not - allowed, but will cause the function to fail with reason +

Using spawn option monitor is not + allowed. It causes the function to fail with reason badarg.

 + @@ -153,151 +288,94 @@ Start a new process synchronously.

Starts a new process synchronously. Spawns the process and - waits for it to start. When the process has started, it + waits for it to start. When the process has started, it must call - init_ack(Parent,Ret) - or init_ack(Ret), + init_ack(Parent, Ret) + or init_ack(Ret), where Parent is the process that evaluates this - function. At this time, Ret is returned.

-

If the start_link/3,4,5 function is used and + function. At this time, Ret is returned.

+

If function start_link/3,4,5 is used and the process crashes before it has called init_ack/1,2, - {error, Reason} is returned if the calling process - traps exits.

-

If Time is specified as an integer, this function - waits for Time milliseconds for the new process to call - init_ack, or {error, timeout} is returned, and - the process is killed.

-

The SpawnOpts argument, if given, will be passed - as the last argument to the spawn_opt/2,3,4,5 BIF.

+ {error, Reason} is returned if the calling + process traps exits.

+

If Time is specified as an integer, this + function waits for Time milliseconds for the + new process to call init_ack, or {error, timeout} is + returned, and the process is killed.

+

Argument SpawnOpts, if specified, is passed + as the last argument to the + spawn_opt/2,3,4,5 BIF.

-

Using the spawn option monitor is currently not - allowed, but will cause the function to fail with reason +

Using spawn option monitor is not + allowed. It causes the function to fail with reason badarg.

 - - - - Used by a process when it has started. - -

This function must be used by a process that has been started by - a start[_link]/3,4,5 - function. It tells Parent that the process has - initialized itself, has started, or has failed to initialize - itself.

-

The init_ack/1 function uses the parent value - previously stored by the start function used.

-

If this function is not called, the start function will - return an error tuple (if a link and/or a timeout is used) or - hang otherwise.

-

The following example illustrates how this function and - proc_lib:start_link/3 are used.

- --module(my_proc). --export([start_link/0]). --export([init/1]). -start_link() -> - proc_lib:start_link(my_proc, init, [self()]). - -init(Parent) -> - case do_initialization() of - ok -> - proc_lib:init_ack(Parent, {ok, self()}); - {error, Reason} -> - exit(Reason) - end, - loop(). - -... - - - - Format a crash report. - -

Equivalent to format(CrashReport, latin1).

- - - - - Format a crash report. + + Terminate a process synchronously. + -

This function can be used by a user defined event handler to - format a crash report. The crash report is sent using - error_logger:error_report(crash_report, CrashReport). - That is, the event to be handled is of the format - {error_report, GL, {Pid, crash_report, CrashReport}} - where GL is the group leader pid of the process - Pid which sent the crash report.

+

Equivalent to + stop(Process, normal, infinity).

 + - - Format a crash report. + + Terminate a process synchronously. + + + -

This function can be used by a user defined event handler to - format a crash report. When Depth is given as an - positive integer, it will be used in the format string to - limit the output as follows: io_lib:format("~P", - [Term,Depth]).

+

Orders the process to exit with the specified Reason and + waits for it to terminate.

+

Returns ok if the process exits with + the specified Reason within Timeout milliseconds.

+

If the call times out, a timeout exception is raised.

+

If the process does not exist, a noproc + exception is raised.

+

The implementation of this function is based on the + terminate system message, and requires that the + process handles system messages correctly. + For information about system messages, see + sys(3) and section + + sys and proc_lib in OTP Design Principles.

 - - - Extract the initial call of a proc_libspawned process. - -

Extracts the initial call of a process that was started - using one of the spawn or start functions described above. - Process can either be a pid, an integer tuple (from - which a pid can be created), or the process information of a - process Pid fetched through an - erlang:process_info(Pid) function call.

- -

The list Args no longer contains the actual arguments, - but the same number of atoms as the number of arguments; the first atom - is always 'Argument__1', the second 'Argument__2', and - so on. The reason is that the argument list could waste a significant - amount of memory, and if the argument list contained funs, it could - be impossible to upgrade the code for the module.

-

If the process was spawned using a fun, initial_call/1 no - longer returns the actual fun, but the module, function for the local - function implementing the fun, and the arity, for instance - {some_module,-work/3-fun-0-,0} (meaning that the fun was - created in the function some_module:work/3). - The reason is that keeping the fun would prevent code upgrade for the - module, and that a significant amount of memory could be wasted.

- - - - Extract and translate the initial call of a proc_libspawned process. + Extract and translate the initial call of a + proc_libspawned process. -

This function is used by the c:i/0 and - c:regs/0 functions in order to present process - information.

-

Extracts the initial call of a process that was started - using one of the spawn or start functions described above, - and translates it to more useful information. Process +

This function is used by functions + c:i/0 and + c:regs/0 + to present process information.

+

This function extracts the initial call of a process that was + started using one of the spawn or start functions in this module, + and translates it to more useful information. + Process can either be a pid, an integer tuple (from which a pid can be created), or the process information of a process Pid fetched through an erlang:process_info(Pid) function call.

-

If the initial call is to one of the system defined behaviors +

If the initial call is to one of the system-defined behaviors such as gen_server or gen_event, it is translated to more useful information. If a gen_server is spawned, the returned Module is the name of the callback module and Function is init (the function that initiates the new server).

A supervisor and a supervisor_bridge are also - gen_server processes. In order to return information + gen_server processes. To return information that this process is a supervisor and the name of the - call-back module, Module is supervisor and + callback module, Module is supervisor and Function is the name of the supervisor callback - module. Arity is 1 since the init/1 + module. Arity is 1, as the init/1 function is called initially in the callback module.

By default, {proc_lib,init_p,5} is returned if no information about the initial call can be found. It is @@ -305,57 +383,12 @@ init(Parent) -> spawned with the proc_lib module.

 - - - Hibernate a process until a message is sent to it - -

This function does the same as (and does call) the BIF - hibernate/3, - but ensures that exception handling and logging continues to - work as expected when the process wakes up. Always use this - function instead of the BIF for processes started using - proc_lib functions.

- - - - - Terminate a process synchronously. - - -

Equivalent to stop(Process, - normal, infinity).

- - - - - Terminate a process synchronously. - - - - -

Orders the process to exit with the given Reason and - waits for it to terminate.

-

The function returns ok if the process exits with - the given Reason within Timeout - milliseconds.

-

If the call times out, a timeout exception is - raised.

-

If the process does not exist, a noproc - exception is raised.

-

The implementation of this function is based on the - terminate system message, and requires that the - process handles system messages correctly. - See sys(3) - and OTP - Design Principles for information about system - messages.

- -
- SEE ALSO -

error_logger(3)

+ See Also +

+ error_logger(3)

 diff --git a/lib/stdlib/doc/src/proplists.xml b/lib/stdlib/doc/src/proplists.xml index 832df9556a..fe6b8cc3bf 100644 --- a/lib/stdlib/doc/src/proplists.xml +++ b/lib/stdlib/doc/src/proplists.xml @@ -30,51 +30,66 @@ 2002-09-28 A - proplists.sgml + proplists.xml
proplists - Support functions for property lists + Support functions for property lists.

Property lists are ordinary lists containing entries in the form of either tuples, whose first elements are keys used for lookup and - insertion, or atoms, which work as shorthand for tuples {Atom, true}. (Other terms are allowed in the lists, but are ignored - by this module.) If there is more than one entry in a list for a + insertion, or atoms, which work as shorthand for tuples + {Atom, true}. (Other terms are allowed in the lists, but are + ignored by this module.) If there is more than one entry in a list for a certain key, the first occurrence normally overrides any later (irrespective of the arity of the tuples).

+

Property lists are useful for representing inherited properties, - such as options passed to a function where a user may specify options + such as options passed to a function where a user can specify options overriding the default settings, object properties, annotations, - etc.

-

Two keys are considered equal if they match (=:=). In other - words, numbers are compared literally rather than by value, so that, - for instance, 1 and 1.0 are different keys.

+ and so on.

+ +

Two keys are considered equal if they match (=:=). That is, + numbers are compared literally rather than by value, so that, + for example, 1 and 1.0 are different keys.

 + + -

Similar to get_all_values/2, but each value is - wrapped in a list unless it is already itself a list, and the - resulting list of lists is concatenated. This is often useful for - "incremental" options; e.g., append_values(a, [{a, [1,2]}, {b, 0}, {a, 3}, {c, -1}, {a, [4]}]) will return the list - [1,2,3,4].

+

Similar to + get_all_values/2, + but each value is wrapped in a list unless it is already itself a + list. The resulting list of lists is concatenated. This is often + useful for "incremental" options.

+

Example:

+ +append_values(a, [{a, [1,2]}, {b, 0}, {a, 3}, {c, -1}, {a, [4]}]) +

returns:

+ +[1,2,3,4] +

Minimizes the representation of all entries in the list. This is equivalent to .

-

See also: property/1, unfold/1.

+

See also + property/1, + unfold/1.

 + @@ -83,96 +98,111 @@ List.

 +

Expands particular properties to corresponding sets of - properties (or other terms). For each pair {Property, Expansion} in Expansions, if E is - the first entry in ListIn with the same key as - Property, and E and Property - have equivalent normal forms, then E is replaced with - the terms in Expansion, and any following entries with - the same key are deleted from ListIn.

-

For example, the following expressions all return [fie, bar, baz, fum]:

+ properties (or other terms). For each pair {Property, + Expansion} in Expansions: if + E is the first entry in ListIn with the + same key as Property, and E and + Property have equivalent normal forms, then + E is replaced with the terms in Expansion, + and any following entries with the same key are deleted from + ListIn.

+

For example, the following expressions all return + [fie, bar, baz, fum]:

- expand([{foo, [bar, baz]}], - [fie, foo, fum]) - expand([{{foo, true}, [bar, baz]}], - [fie, foo, fum]) - expand([{{foo, false}, [bar, baz]}], - [fie, {foo, false}, fum]) -

However, no expansion is done in the following call:

+expand([{foo, [bar, baz]}], [fie, foo, fum]) +expand([{{foo, true}, [bar, baz]}], [fie, foo, fum]) +expand([{{foo, false}, [bar, baz]}], [fie, {foo, false}, fum]) +

However, no expansion is done in the following call + because {foo, false} shadows foo:

- expand([{{foo, true}, [bar, baz]}], - [{foo, false}, fie, foo, fum]) -

because {foo, false} shadows foo.

-

Note that if the original property term is to be preserved in the +expand([{{foo, true}, [bar, baz]}], [{foo, false}, fie, foo, fum]) +

Notice that if the original property term is to be preserved in the result when expanded, it must be included in the expansion list. The inserted terms are not expanded recursively. If - Expansions contains more than one property with the same - key, only the first occurrence is used.

-

See also: normalize/2.

+ Expansions contains more than one property with + the same key, only the first occurrence is used.

+

See also + normalize/2.

 + -

Similar to get_value/2, but returns the list of - values for all entries {Key, Value} in - List. If no such entry exists, the result is the empty - list.

-

See also: get_value/2.

+

Similar to + get_value/2, + but returns the list of values for all entries + {Key, Value} in List. If no such entry + exists, the result is the empty list.

 +

Returns the value of a boolean key/value option. If - lookup(Key, List) would yield {Key, true}, - this function returns true; otherwise false - is returned.

-

See also: get_value/2, lookup/2.

+ lookup(Key, List) would yield + {Key, true}, this function returns true, + otherwise false.

+

See also + get_value/2, + lookup/2.

 + -

Returns an unordered list of the keys used in List, - not containing duplicates.

+

Returns an unordered list of the keys used in + List, not containing duplicates.

 + -

Equivalent to get_value(Key, List, undefined).

+

Equivalent to + get_value(Key, List, undefined).

 +

Returns the value of a simple key/value property in - List. If lookup(Key, List) would yield - {Key, Value}, this function returns the corresponding - Value, otherwise Default is returned.

-

See also: get_all_values/2, get_bool/2, - get_value/2, lookup/2.

+ List. If lookup(Key, + List) would yield {Key, Value}, + this function returns the corresponding Value, otherwise + Default.

+

See also + get_all_values/2, + get_bool/2, + get_value/2, + lookup/2.

 +

Returns true if List contains at least one entry associated with Key, otherwise - false is returned.

+ false.

 + @@ -181,128 +211,160 @@ List, if one exists, otherwise returns none. For an atom A in the list, the tuple {A, true} is the entry associated with A.

-

See also: get_bool/2, get_value/2, - lookup_all/2.

+

See also + get_bool/2, + get_value/2, + lookup_all/2.

 + -

Returns the list of all entries associated with Key - in List. If no such entry exists, the result is the - empty list.

-

See also: lookup/2.

+

Returns the list of all entries associated with + Key in List. If no such entry + exists, the result is the empty list.

+

See also + lookup/2.

 +

Passes ListIn through a sequence of substitution/expansion stages. For an aliases operation, - the function substitute_aliases/2 is applied using the - given list of aliases; for a negations operation, - substitute_negations/2 is applied using the given - negation list; for an expand operation, the function - expand/2 is applied using the given list of expansions. - The final result is automatically compacted (cf. - compact/1).

+ function + substitute_aliases/2 is applied using the + specified list of aliases:

+ + +

For a negations operation, substitute_negations/2 + is applied using the specified negation list.

+ + +

For an expand operation, function + expand/2 + is applied using the specified list of expansions.

+ + +

The final result is automatically compacted (compare + compact/1).

Typically you want to substitute negations first, then aliases, then perform one or more expansions (sometimes you want to pre-expand particular entries before doing the main expansion). You might want to substitute negations and/or aliases repeatedly, to allow such forms in the right-hand side of aliases and expansion lists.

-

See also: compact/1, expand/2, - substitute_aliases/2, substitute_negations/2.

+

See also + substitute_negations/2.

 +

Creates a normal form (minimal) representation of a property. If - PropertyIn is {Key, true} where - Key is an atom, this returns Key, otherwise - the whole term PropertyIn is returned.

-

See also: property/2.

+ PropertyIn is {Key, true}, where + Key is an atom, Key is returned, otherwise + the whole term PropertyIn is returned.

+

See also + property/2.

 + -

Creates a normal form (minimal) representation of a simple - key/value property. Returns Key if Value is - true and Key is an atom, otherwise a tuple - {Key, Value} is returned.

-

See also: property/1.

+

Creates a normal form (minimal) representation of a simple key/value + property. Returns Key if Value + is true and Key is an atom, otherwise a + tuple {Key, Value} is returned.

+

See also + property/1.

 +

Partitions List into a list of sublists and a - remainder. Lists contains one sublist for each key in - Keys, in the corresponding order. The relative order of - the elements in each sublist is preserved from the original - List. Rest contains the elements in - List that are not associated with any of the given keys, + remainder. Lists contains one sublist for each key + in Keys, in the corresponding order. The relative + order of the elements in each sublist is preserved from the original + List. Rest contains the + elements in List that are not associated with any + of the specified keys, also with their original relative order preserved.

-

Example: - split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c])

-

returns

-

{[[a], [{b, 5}, b],[{c, 2}, {c, 3, 4}]], [{e, 1}, d]}

+

Example:

+ +split([{c, 2}, {e, 1}, a, {c, 3, 4}, d, {b, 5}, b], [a, b, c]) +

returns:

+ +{[[a], [{b, 5}, b],[{c, 2}, {c, 3, 4}]], [{e, 1}, d]} +

Substitutes keys of properties. For each entry in - ListIn, if it is associated with some key K1 - such that {K1, K2} occurs in Aliases, the + ListIn, if it is associated with some key + K1 such that {K1, K2} occurs in + Aliases, the key of the entry is changed to K2. If the same K1 occurs more than once in Aliases, only the first occurrence is used.

-

Example: substitute_aliases([{color, colour}], L) - will replace all tuples {color, ...} in L +

For example, substitute_aliases([{color, colour}], L) + replaces all tuples {color, ...} in L with {colour, ...}, and all atoms color with colour.

-

See also: normalize/2, substitute_negations/2.

+

See also + normalize/2, + + substitute_negations/2.

 +

Substitutes keys of boolean-valued properties and simultaneously negates their values. For each entry in - ListIn, if it is associated with some key K1 - such that {K1, K2} occurs in Negations, then - if the entry was {K1, true} it will be replaced with - {K2, false}, otherwise it will be replaced with - {K2, true}, thus changing the name of the option and - simultaneously negating the value given by - get_bool(ListIn). If the same K1 occurs more - than once in Negations, only the first occurrence is - used.

-

Example: substitute_negations([{no_foo, foo}], L) - will replace any atom no_foo or tuple + ListIn, if it is associated with some key + K1 such that {K1, K2} occurs in + Negations: if the entry was + {K1, true}, it is replaced with {K2, false}, otherwise + with {K2, true}, thus changing the name of the option and + simultaneously negating the value specified by + + get_bool(Key, ListIn. + If the same K1 occurs more than once in + Negations, only the first occurrence is used.

+

For example, substitute_negations([{no_foo, foo}], L) + replaces any atom no_foo or tuple {no_foo, true} in L with {foo, false}, - and any other tuple {no_foo, ...} with - {foo, true}.

-

See also: get_bool/2, normalize/2, - substitute_aliases/2.

+ and any other tuple {no_foo, ...} with {foo, true}.

+

See also + get_bool/2, + normalize/2, + + substitute_aliases/2.

 + -

Unfolds all occurrences of atoms in ListIn to tuples - {Atom, true}.

+

Unfolds all occurrences of atoms in ListIn to + tuples {Atom, true}.

 diff --git a/lib/stdlib/doc/src/qlc.xml b/lib/stdlib/doc/src/qlc.xml index 2966e94ec1..fe14a6334c 100644 --- a/lib/stdlib/doc/src/qlc.xml +++ b/lib/stdlib/doc/src/qlc.xml @@ -24,102 +24,121 @@ qlc Hans Bolinder - nobody + - nobody - no + + 2004-08-25 PA1 - qlc.sgml + qlc.xml
qlc - Query Interface to Mnesia, ETS, Dets, etc + Query interface to Mnesia, ETS, Dets, and so on. + -

The qlc module provides a query interface to Mnesia, ETS, - Dets and other data structures that implement an iterator style - traversal of objects.

+

This module provides a query interface to + Mnesia, + ETS, + Dets, + and other data structures that provide an iterator style + traversal of objects.

 -
Overview - -

The qlc module implements a query interface to QLC - tables. Typical QLC tables are ETS, Dets, and Mnesia - tables. There is also support for user defined tables, see the - Implementing a QLC - table section. - A query is stated using +

+ Overview +

This module provides a query interface to QLC + tables. Typical QLC tables are Mnesia, ETS, and + Dets tables. Support is also provided for user-defined tables, see section + + Implementing a QLC Table. + + A query is expressed using Query List Comprehensions (QLCs). The answers to a query are determined by data in QLC tables that fulfill the constraints expressed by the QLCs of the query. QLCs are similar - to ordinary list comprehensions as described in the Erlang - Reference Manual and Programming Examples except that variables - introduced in patterns cannot be used in list expressions. In - fact, in the absence of optimizations and options such as - cache and unique (see below), every QLC free of - QLC tables evaluates to the same list of answers as the + to ordinary list comprehensions as described in + + Erlang Reference Manual and + + Programming Examples, except that variables + introduced in patterns cannot be used in list expressions. + In the absence of optimizations and options such as + cache and unique (see section + Common Options, every + QLC free of QLC tables evaluates to the same list of answers as the identical ordinary list comprehension.

While ordinary list comprehensions evaluate to lists, calling - qlc:q/1,2 returns a Query - Handle. To obtain all the answers to a query, qlc:eval/1,2 should be called with the + q/1,2 returns a + query handle. + To obtain all the answers to a query, + eval/1,2 is to be called with the query handle as first argument. Query handles are essentially - functional objects ("funs") created in the module calling q/1,2. - As the funs refer to the module's code, one should - be careful not to keep query handles too long if the module's - code is to be replaced. - Code replacement is described in the Erlang Reference - Manual. The list of answers can also be traversed in - chunks by use of a Query Cursor. Query cursors are - created by calling qlc:cursor/1,2 with a query handle as - first argument. Query cursors are essentially Erlang processes. + functional objects (funs) created in the module calling q/1,2. + As the funs refer to the module code, be careful not to keep query + handles too long if the module code is to be replaced. + Code replacement is described in section + + Compilation and Code Loading in the Erlang Reference Manual. + The list of answers can also be traversed in chunks by use of a + query cursor. + Query cursors are created by calling + cursor/1,2 with a query + handle as first argument. Query cursors are essentially Erlang processes. One answer at a time is sent from the query cursor process to the process that created the cursor.

-
-
Syntax - +
+ Syntax

Syntactically QLCs have the same parts as ordinary list comprehensions:

- [Expression || Qualifier1, Qualifier2, ...] + +[Expression || Qualifier1, Qualifier2, ...] -

Expression (the template) is an arbitrary +

Expression (the template) is any Erlang expression. Qualifiers are either filters or generators. Filters are Erlang expressions returning - bool(). Generators have the form + boolean(). Generators have the form , where ListExpression is an expression evaluating to a query handle or a list. Query handles are returned from - qlc:table/2, qlc:append/1,2, qlc:sort/1,2, - qlc:keysort/2,3, qlc:q/1,2, and - qlc:string_to_handle/1,2,3.

- + append/1,2, + keysort/2,3, + q/1,2, + sort/1,2, + + string_to_handle/1,2,3, and + table/2.

-
Evaluation - -

The evaluation of a query handle begins by the inspection of - options and the collection of information about tables. As a - result qualifiers are modified during the optimization phase. - Next all list expressions are evaluated. If a cursor has been - created evaluation takes place in the cursor process. For those - list expressions that are QLCs, the list expressions of the - QLCs' generators are evaluated as well. One has to be careful if - list expressions have side effects since the order in which list - expressions are evaluated is unspecified. Finally the answers - are found by evaluating the qualifiers from left to right, - backtracking when some filter returns false, or - collecting the template when all filters return true.

- -

Filters that do not return bool() but fail are handled - differently depending on their syntax: if the filter is a guard +

+ Evaluation +

A query handle is evaluated in the following order:

+ + + +

Inspection of options and the collection of information about + tables. As a result, qualifiers are modified during the optimization + phase.

+ + +

All list expressions are evaluated. If a cursor has been created, + evaluation takes place in the cursor process. For list expressions + that are QLCs, the list expressions of the generators of the QLCs + are evaluated as well. Be careful if list expressions have side + effects, as list expressions are evaluated in unspecified order.

+ + +

The answers are found by evaluating the qualifiers from left to + right, backtracking when some filter returns false, or + collecting the template when all filters return true.

+ + + +

Filters that do not return boolean() but fail are handled + differently depending on their syntax: if the filter is a guard, it returns false, otherwise the query evaluation fails. This behavior makes it possible for the qlc module to do some optimizations without affecting the meaning of a query. For @@ -131,302 +150,311 @@ candidate objects can often be found by looking up some key values of the table or by traversing the table using a match specification. It is necessary to place the guard filters - immediately after the table's generator, otherwise the candidate - objects will not be restricted to a small set. The reason is + immediately after the table generator, otherwise the candidate + objects are not restricted to a small set. The reason is that objects that could make the query evaluation fail must not - be excluded by looking up a key or running a match - specification.

- + be excluded by looking up a key or running a match specification.

-
Join - +
+ Join

The qlc module supports fast join of two query handles. Fast join is possible if some position P1 of one query handler and some position P2 of another query handler are - tested for equality. Two fast join methods have been - implemented:

+ tested for equality. Two fast join methods are provided:

- Lookup join traverses all objects of one query handle and - finds objects of the other handle (a QLC table) such that the +

Lookup join traverses all objects of one query handle + and finds objects of the other handle (a QLC table) such that the values at P1 and P2 match or compare equal. The qlc module does not create - any indices but looks up values using the key position and - the indexed positions of the QLC table. + any indexes but looks up values using the key position and + the indexed positions of the QLC table.

 - Merge join sorts the objects of each query handle if +

Merge join sorts the objects of each query handle if necessary and filters out objects where the values at - P1 and P2 do not compare equal. If there are - many objects with the same value of P2 a temporary - file will be used for the equivalence classes. + P1 and P2 do not compare equal. If + many objects with the same value of P2 exist, a temporary + file is used for the equivalence classes.

The qlc module warns at compile time if a QLC combines query handles in such a way that more than one join is - possible. In other words, there is no query planner that can - choose a good order between possible join operations. It is up + possible. That is, no query planner is provided that can + select a good order between possible join operations. It is up to the user to order the joins by introducing query handles.

The join is to be expressed as a guard filter. The filter must be placed immediately after the two joined generators, possibly after guard filters that use variables from no other generators - but the two joined generators. The qlc module inspects + but the two joined generators. The qlc module inspects the operands of =:=/2, ==/2, is_record/2, element/2, and logical operators (and/2, or/2, andalso/2, orelse/2, xor/2) when determining which joins to consider.

-
-
Common options - -

The following options are accepted by cursor/2, - eval/2, fold/4, and info/2:

+
+ + Common Options +

The following options are accepted by + cursor/2, + eval/2, + fold/4, and + info/2:

- {cache_all, Cache} where Cache is +

{cache_all, Cache}, where Cache is equal to ets or list adds a {cache, Cache} option to every list expression - of the query except tables and lists. Default is - {cache_all, no}. The option cache_all is - equivalent to {cache_all, ets}. + of the query except tables and lists. Defaults to + {cache_all, no}. Option cache_all is + equivalent to {cache_all, ets}.

 - {max_list_size, MaxListSize} where MaxListSize is the +

{max_list_size, + MaxListSize}, where MaxListSize is the size in bytes of terms on the external format. If the accumulated size of collected objects exceeds - MaxListSize the objects are written onto a temporary - file. This option is used by the {cache, list} - option as well as by the merge join method. Default is - 512*1024 bytes. + MaxListSize, the objects are written onto a temporary + file. This option is used by option {cache, list} + and by the merge join method. Defaults to 512*1024 bytes.

 - {tmpdir_usage, TmpFileUsage} determines the +

{tmpdir_usage, TmpFileUsage} determines the action taken when qlc is about to create temporary - files on the directory set by the tmpdir option. If the - value is not_allowed an error tuple is returned, + files on the directory set by option tmpdir. If the + value is not_allowed, an error tuple is returned, otherwise temporary files are created as needed. Default is - allowed which means that no further action is taken. + allowed, which means that no further action is taken. The values info_msg, warning_msg, and error_msg mean that the function with the corresponding - name in the module error_logger is called for printing - some information (currently the stacktrace). + name in module + error_logger + is called for printing some information (currently the stacktrace).

 - {tmpdir, TempDirectory} sets the directory used by - merge join for temporary files and by the - {cache, list} option. The option also overrides - the tmpdir option of keysort/3 and - sort/2. The default value is "" which means that - the directory returned by file:get_cwd() is used. +

{tmpdir, TempDirectory} sets the directory used by + merge join for temporary files and by option + {cache, list}. The option also overrides + option tmpdir of + keysort/3 and + sort/2. + Defaults to "", which means that + the directory returned by file:get_cwd() is used.

 - {unique_all, true} adds a +

{unique_all, true} adds a {unique, true} option to every list expression of - the query. Default is {unique_all, false}. The - option unique_all is equivalent to - {unique_all, true}. + the query. Defaults to {unique_all, false}. + Option unique_all is equivalent to + {unique_all, true}.

 -
-
Getting started - -

As already mentioned - queries are stated in the list comprehension syntax as described - in the Erlang - Reference Manual. In the following some familiarity - with list comprehensions is assumed. There are examples in - Programming - Examples that can get you started. It should be - stressed that list comprehensions do not add any computational +

+ + Getting Started +

As mentioned earlier, + queries are expressed in the list comprehension syntax as described + in section + Expressions + in Erlang Reference Manual. In the following, some familiarity + with list comprehensions is assumed. The examples in section + + List Comprehensions in Programming Examples can get you + started. Notice that list comprehensions do not add any computational power to the language; anything that can be done with list - comprehensions can also be done without them. But they add a - syntax for expressing simple search problems which is compact + comprehensions can also be done without them. But they add + syntax for expressing simple search problems, which is compact and clear once you get used to it.

Many list comprehension expressions can be evaluated by the - qlc module. Exceptions are expressions such that + qlc module. Exceptions are expressions, such that variables introduced in patterns (or filters) are used in some - generator later in the list comprehension. As an example - consider an implementation of lists:append(L): - . - Y is introduced in the first generator and used in the second. + generator later in the list comprehension. As an example, + consider an implementation of lists:append(L): + . + Y is introduced in the first generator and used in the second. The ordinary list comprehension is normally to be preferred when there is a choice as to which to use. One difference is that - qlc:eval/1,2 collects answers in a list which is finally + eval/1,2 + collects answers in a list that is finally reversed, while list comprehensions collect answers on the stack - which is finally unwound.

+ that is finally unwound.

What the qlc module primarily adds to list comprehensions is that data can be read from QLC tables in small - chunks. A QLC table is created by calling qlc:table/2. + chunks. A QLC table is created by calling + qlc:table/2. Usually qlc:table/2 is not called directly from the query - but via an interface function of some data structure. There are - a few examples of such functions in Erlang/OTP: - mnesia:table/1,2, ets:table/1,2, and - dets:table/1,2. For a given data structure there can be - several functions that create QLC tables, but common for all - these functions is that they return a query handle created by - qlc:table/2. Using the QLC tables provided by OTP is - probably sufficient in most cases, but for the more advanced - user the section Implementing a QLC - table describes the implementation of a function + but through an interface function of some data structure. + Erlang/OTP includes a few examples of such functions: + mnesia:table/1,2, + ets:table/1,2, and + dets:table/1,2. + For a given data structure, many functions can create QLC tables, but + common for these functions is that they return a query handle created by + qlc:table/2. + Using the QLC tables provided by Erlang/OTP is usually + probably sufficient, but for the more advanced user section + Implementing a QLC + Table describes the implementation of a function calling qlc:table/2.

-

Besides qlc:table/2 there are other functions that - return query handles. They might not be used as often as tables, - but are useful from time to time. qlc:append traverses - objects from several tables or lists after each other. If, for - instance, you want to traverse all answers to a query QH and +

Besides qlc:table/2, other functions + return query handles. They are used more seldom than tables, + but are sometimes useful. + qlc:append/1,2 traverses + objects from many tables or lists after each other. If, for + example, you want to traverse all answers to a query QH and then finish off by a term {finished}, you can do that by - calling qlc:append(QH, [{finished}]). append first - returns all objects of QH, then {finished}. If there is - one tuple {finished} among the answers to QH it will be - returned twice from append.

+ calling qlc:append(QH, [{finished}]). append/2 first + returns all objects of QH, then {finished}. If a tuple + {finished} exists among the answers to QH, it is + returned twice from append/2.

As another example, consider concatenating the answers to two - queries QH1 and QH2 while removing all duplicates. The means to - accomplish this is to use the unique option:

+ queries QH1 and QH2 while removing all duplicates. This is + accomplished by using option unique:

- + + -

The cost is substantial: every returned answer will be stored - in an ETS table. Before returning an answer it is looked up in +

The cost is substantial: every returned answer is stored + in an ETS table. Before returning an answer, it is looked up in the ETS table to check if it has already been returned. Without - the unique options all answers to QH1 would be returned - followed by all answers to QH2. The unique options keeps + the unique option, all answers to QH1 would be returned + followed by all answers to QH2. The unique option keeps the order between the remaining answers.

-

If the order of the answers is not important there is the - alternative to sort the answers uniquely:

+

If the order of the answers is not important, there is an + alternative to the unique option, namely to sort the + answers uniquely:

- + + -

This query also removes duplicates but the answers will be - sorted. If there are many answers temporary files will be used. - Note that in order to get the first unique answer all answers - have to be found and sorted. Both alternatives find duplicates - by comparing answers, that is, if A1 and A2 are answers found in - that order, then A2 is a removed if A1 == A2.

+

This query also removes duplicates but the answers are + sorted. If there are many answers, temporary files are used. + Notice that to get the first unique answer, all answers + must be found and sorted. Both alternatives find duplicates by comparing + answers, that is, if A1 and A2 are answers found in + that order, then A2 is a removed if A1 == A2.

-

To return just a few answers cursors can be used. The following +

To return only a few answers, cursors can be used. The following code returns no more than five answers using an ETS table for storing the unique answers:

- + -

Query list comprehensions are convenient for stating - constraints on data from two or more tables. An example that +

QLCs are convenient for stating + constraints on data from two or more tables. The following example does a natural join on two query handles on position 2:

- + -

The qlc module will evaluate this differently depending on - the query - handles QH1 and QH2. If, for example, X2 is - matched against the key of a QLC table the lookup join method - will traverse the objects of QH2 while looking up key - values in the table. On the other hand, if neither X2 nor +

The qlc module evaluates this differently depending on the + query handles QH1 and QH2. If, for example, X2 is + matched against the key of a QLC table, the lookup join method + traverses the objects of QH2 while looking up key + values in the table. However, if not X2 or Y2 is matched against the key or an indexed position of a - QLC table, the merge join method will make sure that QH1 + QLC table, the merge join method ensures that QH1 and QH2 are both sorted on position 2 and next do the join by traversing the objects one by one.

-

The join option can be used to force the qlc module - to use a - certain join method. For the rest of this section it is assumed +

Option join can be used to force the qlc module to use + a certain join method. For the rest of this section it is assumed that the excessively slow join method called "nested loop" has been chosen:

- + -

In this case the filter will be applied to every possible pair - of answers to QH1 and QH2, one at a time. If there are M answers - to QH1 and N answers to QH2 the filter will be run M*N - times.

- -

If QH2 is a call to the function for gb_trees as defined - in the Implementing - a QLC table section, gb_table:table/1, the - iterator for the gb-tree will be initiated for each answer to - QH1 after which the objects of the gb-tree will be returned one +

In this case the filter is applied to every possible pair + of answers to QH1 and QH2, one at a time. + If there are M answers to QH1 and N answers to QH2, + the filter is run M*N times.

+ +

If QH2 is a call to the function for + gb_trees, as defined + in section Implementing + a QLC Table, then gb_table:table/1, the + iterator for the gb-tree is initiated for each answer to + QH1. The objects of the gb-tree are then returned one by one. This is probably the most efficient way of traversing - the table in that case since it takes minimal computational - power to get the following object. But if QH2 is not a table but - a more complicated QLC, it can be more efficient use some RAM + the table in that case, as it takes minimal computational + power to get the following object. But if QH2 is not a table but + a more complicated QLC, it can be more efficient to use some RAM memory for collecting the answers in a cache, particularly if there are only a few answers. It must then be assumed that - evaluating QH2 has no side effects so that the meaning of the - query does not change if QH2 is evaluated only once. One way of - caching the answers is to evaluate QH2 first of all and - substitute the list of answers for QH2 in the query. Another way - is to use the cache option. It is stated like this:

- - - -

or just

- - - -

The effect of the cache option is that when the - generator QH2' is run the first time every answer is stored in - an ETS table. When next answer of QH1 is tried, answers to QH2' - are copied from the ETS table which is very fast. As for the - unique option the cost is a possibly substantial amount - of RAM memory. The {cache, list} option offers the + evaluating QH2 has no side effects so that the meaning of the + query does not change if QH2 is evaluated only once. One way of + caching the answers is to evaluate QH2 first of all and + substitute the list of answers for QH2 in the query. Another way + is to use option cache. It is expressed like this:

+ + + + +

or only

+ + + + +

The effect of option cache is that when + generator QH2' is run the first time, every answer is stored in + an ETS table. When the next answer of QH1 is tried, + answers to QH2' + are copied from the ETS table, which is very fast. As for + option unique the cost is a possibly substantial amount + of RAM memory.

+ +

Option {cache, list} offers the possibility to store the answers in a list on the process heap. - While this has the potential of being faster than ETS tables - since there is no need to copy answers from the table it can - often result in slower evaluation due to more garbage - collections of the process' heap as well as increased RAM memory - consumption due to larger heaps. Another drawback with cache - lists is that if the size of the list exceeds a limit a - temporary file will be used. Reading the answers from a file is - very much slower than copying them from an ETS table. But if the - available RAM memory is scarce setting the limit to some low value is an alternative.

-

There is an option cache_all that can be set to +

Option cache_all can be set to ets or list when evaluating a query. It adds a cache or {cache, list} option to every list expression except QLC tables and lists on all levels of the query. This can be used for testing if caching would improve - efficiency at all. If the answer is yes further testing is - needed to pinpoint the generators that should be cached.

- + efficiency at all. If the answer is yes, further testing is + needed to pinpoint the generators that are to be cached.

-
Implementing a QLC table - -

As an example of - how to use the qlc:table/2 - function the implementation of a QLC table for the gb_trees module is given:

+
+ + Implementing a QLC Table +

As an example of + how to use function table/2, + the implementation of a QLC table for the gb_trees module is given:

- +

TF is the traversal function. The qlc module requires that there is a way of traversing all objects of the - data structure; in gb_trees there is an iterator function - suitable for that purpose. Note that for each object returned a + data structure. gb_trees has an iterator function + suitable for that purpose. Notice that for each object returned, a new fun is created. As long as the list is not terminated by - [] it is assumed that the tail of the list is a nullary + [], it is assumed that the tail of the list is a nullary function and that calling the function returns further objects (and functions).

The lookup function is optional. It is assumed that the lookup function always finds values much faster than it would take to traverse the table. The first argument is the position of the - key. Since qlc_next returns the objects as - {Key, Value} pairs the position is 1. Note that the lookup - function should return {Key, Value} pairs, just as the - traversal function does.

+ key. As qlc_next/1 returns the objects as {Key, Value} + pairs, the position is 1. Notice that the lookup function is to return + {Key, Value} pairs, as the traversal function does.

The format function is also optional. It is called by - qlc:info to give feedback at runtime of how the query - will be evaluated. One should try to give as good feedback as - possible without showing too much details. In the example at - most 7 objects of the table are shown. The format function + info/1,2 + to give feedback at runtime of how the query + is to be evaluated. Try to give as good feedback as + possible without showing too much details. In the example, at + most seven objects of the table are shown. The format function handles two cases: all means that all objects of the - table will be traversed; {lookup, 1, KeyValues} - means that the lookup function will be used for looking up key + table are traversed; {lookup, 1, KeyValues} + means that the lookup function is used for looking up key values.

-

Whether the whole table will be traversed or just some keys - looked up depends on how the query is stated. If the query has +

Whether the whole table is traversed or only some keys + looked up depends on how the query is expressed. If the query has the form

- + + -

and P is a tuple, the qlc module analyzes P and F in - compile time to find positions of the tuple P that are tested +

and P is a tuple, the qlc module analyzes + P and F in + compile time to find positions of tuple P that are tested for equality to constants. If such a position at runtime turns out to be the key position, the lookup function can be used, - otherwise all objects of the table have to be traversed. It is - the info function InfoFun that returns the key position. + otherwise all objects of the table must be traversed. + The info function InfoFun returns the key position. There can be indexed positions as well, also returned by the info function. An index is an extra table that makes lookup on - some position fast. Mnesia maintains indices upon request, - thereby introducing so called secondary keys. The qlc + some position fast. Mnesia maintains indexes upon request, + and introduces so called secondary keys. The qlc module prefers to look up objects using the key before secondary keys regardless of the number of constants to look up.

-
-
Key equality - -

In Erlang there are two operators for testing term equality, - namely ==/2 and =:=/2. The difference between them - is all about the integers that can be represented by floats. For - instance, 2 == 2.0 evaluates to +

+ Key Equality +

Erlang/OTP has two operators for testing term equality: ==/2 + and =:=/2. The difference is all about the integers that can be + represented by floats. For example, 2 == 2.0 evaluates to true while 2 =:= 2.0 evaluates to false. Normally this is a minor issue, but the qlc module cannot ignore the difference, which affects the user's choice of operators in QLCs.

-

If the qlc module can find out at compile time that some +

If the qlc module at compile time can determine that some constant is free of integers, it does not matter which one of ==/2 or =:=/2 is used:

@@ -560,16 +587,16 @@ ets:match_spec_run(lists:flatmap(fun(V) -> [a,2.71]), ets:match_spec_compile([{{'$1'},[],['$1']}])) -

In the example the ==/2 operator has been handled - exactly as =:=/2 would have been handled. On the other - hand, if it cannot be determined at compile time that some - constant is free of integers and the table uses =:=/2 - when comparing keys for equality (see the option key_equality), the - qlc module will not try to look up the constant. The +

In the example, operator ==/2 has been handled + exactly as =:=/2 would have been handled. However, + if it cannot be determined at compile time that some + constant is free of integers, and the table uses =:=/2 + when comparing keys for equality (see option key_equality), then the + qlc module does not try to look up the constant. The reason is that there is in the general case no upper limit on the number of key values that can compare equal to such a - constant; every combination of integers and floats has to be + constant; every combination of integers and floats must be looked up:

@@ -586,11 +613,11 @@ ets:table(53264,
 3> lists:sort(qlc:e(Q2)).
 [a,b,c]
-

Looking up just {2,2} would not return b and +

Looking up only {2,2} would not return b and c.

If the table uses ==/2 when comparing keys for equality, - the qlc module will look up the constant regardless of + the qlc module looks up the constant regardless of which operator is used in the QLC. However, ==/2 is to be preferred:

@@ -608,19 +635,18 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), [b]

Lookup join is handled analogously to lookup of constants in a - table: if the join operator is ==/2 and the table where + table: if the join operator is ==/2, and the table where constants are to be looked up uses =:=/2 when testing - keys for equality, the qlc module will not consider + keys for equality, then the qlc module does not consider lookup join for that table.

-
-

Parse trees for Erlang expression, see the abstract format - documentation in the ERTS User's Guide.

 +

Parse trees for Erlang expression, see section The Abstract Format + in the ERTS User's Guide.

 @@ -633,14 +659,14 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), -

Match specification, see the match specification - documentation in the ERTS User's Guide and ms_transform(3).

 +

Match specification, see section Match Specifications in Erlang + in the ERTS User's Guide and ms_transform(3).

 -

Actually an integer > 1.

 +

An integer > 1.

 @@ -671,7 +697,7 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),

A literal query - list comprehension.

 + list comprehension.

 @@ -682,7 +708,7 @@ ets:match_spec_run(ets:lookup(86033, {2,2}),

See file_sorter(3).

 + marker="file_sorter">file_sorter(3).

 @@ -693,15 +719,14 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), - Return a query handle. -

Returns a query handle. When evaluating the query handle - QH all answers to the first query handle in - QHL are returned followed by all answers - to the rest of the query handles in QHL.

+

Returns a query handle. When evaluating query handle + QH, all answers to the first query handle in + QHL are returned, followed by all answers + to the remaining query handles in QHL.

 @@ -709,11 +734,10 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), Return a query handle. -

Returns a query handle. When evaluating the query handle - QH3 all answers to - QH1 are returned followed by all answers +

Returns a query handle. When evaluating query handle + QH3, all answers to + QH1 are returned, followed by all answers to QH2.

-

append(QH1, QH2) is equivalent to append([QH1, QH2]).

 @@ -724,15 +748,18 @@ ets:match_spec_run(ets:lookup(86033, {2,2}), Create a query cursor. -

Creates a query cursor and +

Creates a query cursor and makes the calling process the owner of the cursor. The - cursor is to be used as argument to next_answers/1,2 - and (eventually) delete_cursor/1. Calls - erlang:spawn_opt to spawn and link a process which - will evaluate the query handle. The value of the option + cursor is to be used as argument to + + next_answers/1,2 and (eventually) + delete_cursor/1. + Calls + erlang:spawn_opt/2 to spawn and link to + a process that evaluates the query handle. The value of option spawn_options is used as last argument when calling - spawn_opt. The default value is [link].

- + spawn_opt/2. Defaults to [link].

+

Example:

 1> QH = qlc:q([{X,Y} || X <- [a,b], Y <- [1,2]]),
 QC = qlc:cursor(QH),
@@ -759,15 +786,15 @@ ok
- - + + Return all answers to a query. -

Evaluates a query handle in the +

Evaluates a query handle in the calling process and collects all answers in a list.

- +

Example:

 1> QH = qlc:q([{X,Y} || X <- [a,b], Y <- [1,2]]),
 qlc:eval(QH).
@@ -786,11 +813,11 @@ ok
the query handle together with an extra argument AccIn. The query handle and the function are evaluated in the calling process. - Function must return a new accumulator + Function must return a new accumulator, which is passed to the next call. Acc0 is returned if there are no answers to the query handle.

- +

Example:

 1> QH = [1,2,3,4,5,6],
 qlc:fold(fun(X, Sum) -> X + Sum end, 0, QH).
@@ -818,30 +845,46 @@ ok
Return code describing a query handle. -

Returns information about a +

Returns information about a query handle. The information describes the simplifications and optimizations that are the results of preparing the - query for evaluation. This function is probably useful - mostly during debugging.

- + query for evaluation. This function is probably mainly useful + during debugging.

The information has the form of an Erlang expression where QLCs most likely occur. Depending on the format functions of - mentioned QLC tables it may not be absolutely accurate.

- -

The default is to return a sequence of QLCs in a block, but - if the option {flat, false} is given, one single - QLC is returned. The default is to return a string, but if - the option {format, abstract_code} is given, - abstract code is returned instead. In the abstract code - port identifiers, references, and pids are represented by - strings. The default is to return - all elements in lists, but if the - {n_elements, NElements} option is given, only a - limited number of elements are returned. The default is to - show all of objects and match specifications, but if the - {depth, Depth} option is given, parts of terms - below a certain depth are replaced by '...'.

- + mentioned QLC tables, it is not certain that the information + is absolutely accurate.

+

Options:

+ + +

The default is to return a sequence of QLCs in a block, but + if option {flat, false} is specified, one single + QLC is returned.

+ + +

The default is to return a string, but if + option {format, abstract_code} is specified, + abstract code is returned instead. In the abstract code, + port identifiers, references, and pids are represented by + strings.

+ + +

The default is to return all elements in lists, but if + option {n_elements, NElements} is specified, only + a limited number of elements are returned.

+ + +

The default is to show all parts of + objects and match specifications, + but if option {depth, Depth} is specified, parts + of terms below a certain depth are replaced by '...'.

+ + +

info(QH) is equivalent to + info(QH, []).

+

Examples:

+

In the following example two simple QLCs are inserted only to + hold option {unique, true}:

 1> QH = qlc:q([{X,Y} || X <- [x,y], Y <- [a,b]]),
 io:format("~s~n", [qlc:info(QH, unique_all)]).
@@ -865,10 +908,11 @@ begin
           ],
           [{unique,true}])
 end
- -

In this example two simple QLCs have been inserted just to - hold the {unique, true} option.

- +

In the following example QLC V2 has + been inserted to show the joined generators and the join + method chosen. A convention is used for lookup join: the + first generator (G2) is the one traversed, the second + (G1) is the table where constants are looked up.

 1> E1 = ets:new(e1, []),
 E2 = ets:new(e2, []),
@@ -898,15 +942,6 @@ begin
                [{X,Z}|{W,Y}] <- V2
           ])
 end
- -

In this example the query list comprehension V2 has - been inserted to show the joined generators and the join - method chosen. A convention is used for lookup join: the - first generator (G2) is the one traversed, the second - one (G1) is the table where constants are looked up.

- -

info(QH) is equivalent to - info(QH, []).

 @@ -915,18 +950,16 @@ end Return a query handle. -

Returns a query handle. When evaluating the query handle - QH2 the answers to the query handle +

Returns a query handle. When evaluating query handle + QH2, the answers to query handle QH1 are sorted by file_sorter:keysort/4 + marker="file_sorter#keysort/4">file_sorter:keysort/4 according to the options.

- -

The sorter will use temporary files only if +

The sorter uses temporary files only if QH1 does not evaluate to a list and the size of the binary representation of the answers exceeds - Size bytes, where Size is the value of the - size option.

- + Size bytes, where Size is the value of option + size.

keysort(KeyPos, QH1) is equivalent to keysort(KeyPos, QH1, []).

@@ -941,10 +974,10 @@ end

Returns some or all of the remaining answers to a query cursor. Only the owner of QueryCursor can retrieve answers.

-

The optional argument NumberOfAnswersdetermines the - maximum number of answers returned. The default value is +

Optional argument NumberOfAnswers determines the + maximum number of answers returned. Defaults to 10. If less than the requested number of answers is - returned, subsequent calls to next_answers will + returned, subsequent calls to next_answers return [].

 @@ -954,92 +987,87 @@ end Return a handle for a query list comprehension. -

Returns a query handle for a query - list comprehension. The query list comprehension must be the - first argument to qlc:q/1,2 or it will be evaluated - as an ordinary list comprehension. It is also necessary to - add the line

- +

Returns a query handle for a QLC. + The QLC must be the first argument to this function, otherwise + it is evaluated as an ordinary list comprehension. It is also + necessary to add the following line to the source code:

-include_lib("stdlib/include/qlc.hrl"). - -

to the source file. This causes a parse transform to - substitute a fun for the query list comprehension. The - (compiled) fun will be called when the query handle is - evaluated.

- -

When calling qlc:q/1,2 from the Erlang shell the - parse transform is automatically called. When this happens - the fun substituted for the query list comprehension is not - compiled but will be evaluated by erl_eval(3). This - is also true when expressions are evaluated by means of +

This causes a parse transform to substitute a fun for the QLC. The + (compiled) fun is called when the query handle is evaluated.

+

When calling qlc:q/1,2 from the Erlang shell, the + parse transform is automatically called. When this occurs, the fun + substituted for the QLC is not compiled but is evaluated by + erl_eval(3). This + is also true when expressions are evaluated by file:eval/1,2 or in the debugger.

- -

To be very explicit, this will not work:

- +

To be explicit, this does not work:

 ...
 A = [X || {X} <- [{1},{2}]],
 QH = qlc:q(A),
 ...
- -

The variable A will be bound to the evaluated value +

Variable A is bound to the evaluated value of the list comprehension ([1,2]). The compiler complains with an error message ("argument is not a query list comprehension"); the shell process stops with a badarg reason.

-

q(QLC) is equivalent to q(QLC, []).

- -

The {cache, ets} option can be used to cache - the answers to a query list comprehension. The answers are - stored in one ETS table for each cached query list - comprehension. When a cached query list comprehension is - evaluated again, answers are fetched from the table without - any further computations. As a consequence, when all answers - to a cached query list comprehension have been found, the - ETS tables used for caching answers to the query list - comprehension's qualifiers can be emptied. The option - cache is equivalent to {cache, ets}.

- -

The {cache, list} option can be used to cache - the answers to a query list comprehension just like - {cache, ets}. The difference is that the answers - are kept in a list (on the process heap). If the answers - would occupy more than a certain amount of RAM memory a - temporary file is used for storing the answers. The option - max_list_size sets the limit in bytes and the temporary - file is put on the directory set by the tmpdir option.

- -

The cache option has no effect if it is known that - the query list comprehension will be evaluated at most once. - This is always true for the top-most query list - comprehension and also for the list expression of the first - generator in a list of qualifiers. Note that in the presence - of side effects in filters or callback functions the answers - to query list comprehensions can be affected by the - cache option.

- -

The {unique, true} option can be used to remove - duplicate answers to a query list comprehension. The unique - answers are stored in one ETS table for each query list - comprehension. The table is emptied every time it is known - that there are no more answers to the query list - comprehension. The option unique is equivalent to - {unique, true}. If the unique option is - combined with the {cache, ets} option, two ETS - tables are used, but the full answers are stored in one - table only. If the unique option is combined with the - {cache, list} option the answers are sorted - twice using keysort/3; once to remove duplicates, and - once to restore the order.

- -

The cache and unique options apply not only - to the query list comprehension itself but also to the - results of looking up constants, running match - specifications, and joining handles.

- +

Options:

+ + +

Option {cache, ets} can be used to cache + the answers to a QLC. The answers are stored in one ETS + table for each cached QLC. When a cached QLC is + evaluated again, answers are fetched from the table without + any further computations. Therefore, when all answers to a + cached QLC have been found, the ETS tables used for + caching answers to the qualifiers of the QLC can be emptied. + Option cache is equivalent to {cache, ets}.

+ + +

Option {cache, list} can be used to cache + the answers to a QLC like + {cache, ets}. The difference is that the answers + are kept in a list (on the process heap). If the answers + would occupy more than a certain amount of RAM memory, a + temporary file is used for storing the answers. Option + max_list_size sets the limit in bytes and the temporary + file is put on the directory set by option tmpdir.

+

Option cache has no effect if it is known that + the QLC is to be evaluated at most once. + This is always true for the top-most QLC + and also for the list expression of the first + generator in a list of qualifiers. Notice that in the presence + of side effects in filters or callback functions, the answers + to QLCs can be affected by option cache.

+ + +

Option {unique, true} can be used to remove + duplicate answers to a QLC. The unique + answers are stored in one ETS table for each QLC. + The table is emptied every time it is known + that there are no more answers to the QLC. + Option unique is equivalent to + {unique, true}. If option unique is + combined with option {cache, ets}, two ETS + tables are used, but the full answers are stored in one + table only. If option unique is combined with option + {cache, list}, the answers are sorted + twice using + keysort/3; + once to remove duplicates and once to restore the order.

+ + +

Options cache and unique apply not only + to the QLC itself but also to the results of looking up constants, + running match specifications, and joining handles.

+

Example:

+

In the following example the cached results of the merge join are + traversed for each value of A. Notice that without option + cache the join would have been carried out + three times, once for each value of A.

 1> Q = qlc:q([{A,X,Z,W} ||
 A <- [a,b,c],
@@ -1076,29 +1104,31 @@ begin
                X =:= Y
           ])
 end
- -

In this example the cached results of the merge join are - traversed for each value of A. Note that without the - cache option the join would have been carried out - three times, once for each value of A

- -

sort/1,2 and keysort/2,3 can also be used for +

sort/1,2 and + keysort/2,3 + can also be used for caching answers and for removing duplicates. When sorting answers are cached in a list, possibly stored on a temporary file, and no ETS tables are used.

-

Sometimes (see qlc:table/2 below) traversal + marker="#table/2">table/2) traversal of tables can be done by looking up key values, which is - assumed to be fast. Under certain (rare) circumstances it - could happen that there are too many key values to look up. - The - {max_lookup, MaxLookup} option can then be used + assumed to be fast. Under certain (rare) circumstances + there can be too many key values to look up. + + Option {max_lookup, MaxLookup} can then be used to limit the number of lookups: if more than - MaxLookup lookups would be required no lookups are - done but the table traversed instead. The default value is - infinity which means that there is no limit on the + MaxLookup lookups would be required, no lookups are + done but the table is traversed instead. Defaults to + infinity, which means that there is no limit on the number of keys to look up.

+

Example:

+

In the following example, using the gb_table module from + section Implementing a + QLC Table, there are six keys to look up: + {1,a}, {1,b}, {1,c}, {2,a}, + {2,b}, and {2,c}. The reason is that the two + elements of key {X, Y} are compared separately.

 1> T = gb_trees:empty(),
 QH = qlc:q([X || {{X,Y},_} <- gb_table:table(T),
@@ -1119,39 +1149,41 @@ ets:match_spec_run(
                      end,
                      [{1,a},{1,b},{1,c},{2,a},{2,b},{2,c}]),
        ets:match_spec_compile([{{{'$1','$2'},'_'},[],['$1']}]))
- -

In this example using the gb_table module from the - Implementing a - QLC table section there are six keys to look up: - {1,a}, {1,b}, {1,c}, {2,a}, - {2,b}, and {2,c}. The reason is that the two - elements of the key {X, Y} are compared separately.

- -

The {lookup, true} option can be used to ensure - that the qlc module will look up constants in some - QLC table. If there - are more than one QLC table among the generators' list - expressions, constants have to be looked up in at least one - of the tables. The evaluation of the query fails if there - are no constants to look up. This option is useful in - situations when it would be unacceptable to traverse all - objects in some table. Setting the lookup option to - false ensures that no constants will be looked up - ({max_lookup, 0} has the same effect). The - default value is any which means that constants will - be looked up whenever possible.

- -

The {join, Join} option can be used to ensure - that a certain join method will be used: - {join, lookup} invokes the lookup join method; - {join, merge} invokes the merge join method; and - {join, nested_loop} invokes the method of - matching every pair of objects from two handles. The last - method is mostly very slow. The evaluation of the query - fails if the qlc module cannot carry out the chosen - join method. The - default value is any which means that some fast join - method will be used if possible.

+

Options:

+ + +

Option {lookup, true} can be used to ensure + that the qlc module looks up constants in some + QLC table. If there are more than one QLC table among the + list expressions of the generators, + constants must be looked up in at least one + of the tables. The evaluation of the query fails if there + are no constants to look up. This option is useful + when it would be unacceptable to traverse all + objects in some table. Setting option lookup to + false ensures that no constants are looked up + ({max_lookup, 0} has the same effect). + Defaults to any, which means that constants are + looked up whenever possible.

+ + +

Option {join, Join} can be used to ensure + that a certain join method is used:

+ + {join, lookup} invokes the lookup join + method. + {join, merge} invokes the merge join + method. + {join, nested_loop} invokes the method of + matching every pair of objects from two handles. This + method is mostly very slow. + +

The evaluation of the query fails if the qlc module + cannot carry out the chosen join method. Defaults to + any, which means that some fast join + method is used if possible.

+ + @@ -1160,21 +1192,18 @@ ets:match_spec_run( Return a query handle. -

Returns a query handle. When evaluating the query handle - QH2 the answers to the query handle +

Returns a query handle. When evaluating query handle + QH2, the answers to query handle QH1 are sorted by file_sorter:sort/3 according - to the options.

- -

The sorter will use temporary files only if + marker="file_sorter#sort/3">file_sorter:sort/3 + according to the options.

+

The sorter uses temporary files only if QH1 does not evaluate to a list and the size of the binary representation of the answers exceeds - Size bytes, where Size is the value of the - size option.

- + Size bytes, where Size is the value of option + size.

sort(QH1) is equivalent to sort(QH1, []).

- @@ -1184,31 +1213,27 @@ ets:match_spec_run( Return a handle for a query list comprehension. -

A string version of qlc:q/1,2. When the query handle - is evaluated the fun created by the parse transform is - interpreted by erl_eval(3). The query string is to be - one single query list comprehension terminated by a - period.

- +

A string version of q/1,2. + When the query handle is evaluated, the fun created by the parse + transform is interpreted by + erl_eval(3). + The query string is to be one single QLC terminated by a period.

+

Example:

 1> L = [1,2,3],
 Bs = erl_eval:add_binding('L', L, erl_eval:new_bindings()),
 QH = qlc:string_to_handle("[X+1 || X <- L].", [], Bs),
 qlc:eval(QH).
 [2,3,4]
-

string_to_handle(QueryString) is equivalent to string_to_handle(QueryString, []).

-

string_to_handle(QueryString, - Options) - is equivalent to + Options) is equivalent to string_to_handle(QueryString, Options, erl_eval:new_bindings()).

- -

This function is probably useful mostly when called from - outside of Erlang, for instance from a driver written in C.

+

This function is probably mainly useful when called from + outside of Erlang, for example from a driver written in C.

 @@ -1216,199 +1241,222 @@ ets:match_spec_run( Return a query handle for a table. -

Returns a query handle for a - QLC table. In Erlang/OTP there is support for ETS, Dets and - Mnesia tables, but it is also possible to turn many other - data structures into QLC tables. The way to accomplish this - is to let function(s) in the module implementing the data - structure create a query handle by calling - qlc:table/2. The different ways to traverse the table - as well as properties of the table are handled by callback +

Returns a query handle for a QLC table. + In Erlang/OTP there is support for ETS, Dets, and + Mnesia tables, but many other data structures can be turned + into QLC tables. This is accomplished by letting function(s) in the + module implementing the data structure create a query handle by + calling qlc:table/2. The different ways to traverse the table + and properties of the table are handled by callback functions provided as options to qlc:table/2.

- -

The callback function TraverseFun is - used for traversing the table. It is to return a list of - objects terminated by either [] or a nullary fun to - be used for traversing the not yet traversed objects of the - table. Any other return value is immediately returned as - value of the query evaluation. Unary - TraverseFuns are to accept a match - specification as argument. The match specification is - created by the parse transform by analyzing the pattern of - the generator calling qlc:table/2 and filters using - variables introduced in the pattern. If the parse transform - cannot find a match specification equivalent to the pattern - and filters, TraverseFun will be called - with a match specification returning every object. Modules - that can utilize match specifications for optimized - traversal of tables should call qlc:table/2 with a - unary - TraverseFun while other modules can - provide a nullary - TraverseFun. ets:table/2 is an - example of the former; gb_table:table/1 in the - Implementing a - QLC table section is an example of the latter.

- -

PreFun is a unary callback function - that is called once before the table is read for the first - time. If the call fails, the query evaluation fails. - Similarly, the nullary callback function - PostFun is called once after the table - was last read. The return value, which is caught, is - ignored. If PreFun has been called for a - table, - PostFun is guaranteed to be called for - that table, even if the evaluation of the query fails for - some reason. The order in which pre (post) functions for - different tables are evaluated is not specified. Other table - access than reading, such as calling - InfoFun, is assumed to be OK at any - time. The argument PreArgs is a list of - tagged values. Currently there are two tags, - parent_value and stop_fun, used by Mnesia for - managing transactions. The value of parent_value is - the value returned by ParentFun, or - undefined if there is no ParentFun. - ParentFun is called once just before the - call of - PreFun in the context of the process - calling - eval, fold, or - cursor. The value of stop_fun is a nullary fun - that deletes the cursor if called from the parent, or - undefined if there is no cursor.

- -

The binary callback - function LookupFun is used for looking - up objects in the table. The first argument - Position is the key position or an - indexed position and the second argument - Keys is a sorted list of unique values. - The return value is to be a list of all objects (tuples) - such that the element at Position is a member of - Keys. Any other return value is - immediately returned as value of the query evaluation. - LookupFun is called instead of - traversing the table if the parse transform at compile time - can find out that the filters match and compare the element - at Position in such a way that only - Keys need to be looked up in order to - find all potential answers. The key position is obtained by - calling - InfoFun(keypos) and the indexed - positions by calling - InfoFun(indices). If the key position - can be used for lookup it is always chosen, otherwise the - indexed position requiring the least number of lookups is - chosen. If there is a tie between two indexed positions the - one occurring first in the list returned by - InfoFun is chosen. Positions requiring - more than max_lookup - lookups are ignored.

- -

The unary callback function InfoFun is - to return information about the table. undefined - should be returned if the value of some tag is unknown:

- - indices. Returns a list of indexed - positions, a list of positive integers. - - is_unique_objects. Returns true if - the objects returned by TraverseFun are unique. + +

Callback function TraverseFun is + used for traversing the table. It is to return a list of + objects terminated by either [] or a nullary fun to + be used for traversing the not yet traversed objects of the + table. Any other return value is immediately returned as + value of the query evaluation. Unary + TraverseFuns are to accept a match + specification as argument. The match specification is + created by the parse transform by analyzing the pattern of + the generator calling qlc:table/2 and filters using + variables introduced in the pattern. If the parse transform + cannot find a match specification equivalent to the pattern + and filters, TraverseFun is called + with a match specification returning every object.

+ + +

Modules that can use match specifications for optimized + traversal of tables are to call qlc:table/2 with an unary + TraverseFun. An example is + + ets:table/2.

+ + +

Other modules can provide a nullary + TraverseFun. An example is + gb_table:table/1 in section + Implementing a + QLC Table.

+ + - keypos. Returns the position of the table's - key, a positive integer. + +

Unary callback function PreFun is + called once before the table is read for the first time. + If the call fails, the query evaluation fails.

+

Argument PreArgs is a list of tagged values. + There are two tags, parent_value and stop_fun, used + by Mnesia for managing transactions.

+ + +

The value of parent_value is + the value returned by ParentFun, or + undefined if there is no ParentFun. + ParentFun is called once just before the + call of PreFun in the context of the + process calling + eval/1,2, + fold/3,4, or + cursor/1,2. +

+ + +

The value of stop_fun is a nullary fun + that deletes the cursor if called from the parent, or + undefined if there is no cursor.

+ + - is_sorted_key. Returns true if - the objects returned by TraverseFun are sorted - on the key. + +

Nullary callback function + PostFun is called once after the table + was last read. The return value, which is caught, is ignored. + If PreFun has been called for a table, + PostFun is guaranteed to be called for + that table, even if the evaluation of the query fails for + some reason.

+

The pre (post) functions for different tables are evaluated in + unspecified order.

+

Other table access than reading, such as calling + InfoFun, is assumed to be OK at any time.

 - num_of_objects. Returns the number of - objects in the table, a non-negative integer. + +

Binary callback + function LookupFun is used for looking + up objects in the table. The first argument + Position is the key position or an + indexed position and the second argument + Keys is a sorted list of unique values. + The return value is to be a list of all objects (tuples), + such that the element at Position is a member of + Keys. Any other return value is + immediately returned as value of the query evaluation. + LookupFun is called instead of + traversing the table if the parse transform at compile time + can determine that the filters match and compare the element + at Position in such a way that only + Keys need to be looked up to + find all potential answers.

+

The key position is obtained by calling + InfoFun(keypos) and the indexed + positions by calling + InfoFun(indices). If the key position + can be used for lookup, it is always chosen, otherwise the + indexed position requiring the least number of lookups is + chosen. If there is a tie between two indexed positions, the + one occurring first in the list returned by + InfoFun is chosen. Positions requiring + more than max_lookup + lookups are ignored.

 - - -

The unary callback function FormatFun - is used by qlc:info/1,2 - for displaying the call that created the table's query - handle. The default value, undefined, means that - info/1,2 displays a call to '$MOD':'$FUN'/0. - It is up to FormatFun to present the - selected objects of the table in a suitable way. However, if - a character list is chosen for presentation it must be an - Erlang expression that can be scanned and parsed (a trailing - dot will be added by qlc:info though). - FormatFun is called with an argument - that describes the selected objects based on optimizations - done as a result of analyzing the filters of the QLC where - the call to - qlc:table/2 occurs. The possible values of the - argument are:

- - - {lookup, Position, Keys, NElements, DepthFun}. - LookupFun is used for looking up objects in the - table. + +

Unary callback function InfoFun is + to return information about the table. undefined + is to be returned if the value of some tag is unknown:

+ + indices + Returns a list of indexed positions, a list of positive + integers. + is_unique_objects + Returns true if the objects returned by + TraverseFun are unique. + + keypos + Returns the position of the table key, a positive integer. + + is_sorted_key + Returns true if the objects returned by + TraverseFun are sorted on the key. + + num_of_objects + Returns the number of objects in the table, a non-negative + integer. + + - {match_spec, MatchExpression}. No way of - finding all possible answers by looking up keys was - found, but the filters could be transformed into a - match specification. All answers are found by calling - TraverseFun(MatchExpression). + +

Unary callback function FormatFun + is used by info/1,2 + for displaying the call that created the query handle of the + table. Defaults to undefined, which means that + info/1,2 displays a call to '$MOD':'$FUN'/0. + It is up to FormatFun to present the + selected objects of the table in a suitable way. However, if + a character list is chosen for presentation, it must be an + Erlang expression that can be scanned and parsed (a trailing + dot is added by info/1,2 though).

+

FormatFun is called with an argument + that describes the selected objects based on optimizations + done as a result of analyzing the filters of the QLC where + the call to qlc:table/2 occurs. The argument can have the + following values:

+ + {lookup, Position, Keys, NElements, DepthFun}. + +

LookupFun is used for looking up objects in the + table.

+ + {match_spec, MatchExpression} + +

No way of finding all possible answers by looking up keys + was found, but the filters could be transformed into a + match specification. All answers are found by calling + TraverseFun(MatchExpression).

+ + {all, NElements, DepthFun} + +

No optimization was found. A match specification matching + all objects is used if TraverseFun is unary.

+

NElements is the value of the info/1,2 option + n_elements.

+

DepthFun is a function that can be used for + limiting the size of terms; calling + DepthFun(Term) substitutes '...' for + parts of Term below the depth specified by the + info/1,2 option depth.

+

If calling FormatFun with an + argument including NElements and + DepthFun fails, FormatFun + is called once again with an argument excluding + NElements and DepthFun + ({lookup, Position, Keys} or + all).

+ + - {all, NElements, DepthFun}. No optimization was - found. A match specification matching all objects will be - used if TraverseFun is unary. +

The value of option + key_equality is to be '=:=' if the table + considers two keys equal if they match, and to be + '==' if two keys are equal if they compare equal. + Defaults to '=:='.

 - -

NElements is the value of the info/1,2 option - n_elements, and DepthFun is a function that - can be used for limiting the size of terms; calling - DepthFun(Term) substitutes '...' for parts of - Term below the depth specified by the info/1,2 - option depth. If calling - FormatFun with an argument including - NElements and DepthFun fails, - FormatFun is called once again with an - argument excluding - NElements and DepthFun - ({lookup, Position, Keys} or - all).

- -

The value of - key_equality is to be '=:=' if the table - considers two keys equal if they match, and to be - '==' if two keys are equal if they compare equal. The - default is '=:='.

- -

See ets(3), - dets(3) and - mnesia(3) - for the various options recognized by table/1,2 in - respective module.

+

For the various options recognized by table/1,2 + in respective module, see + ets(3), + dets(3), and + mnesia(3). +

-
See Also -

dets(3), +

dets(3), + erl_eval(3), + erlang(3), + error_logger(3), + ets(3), + file(3), + file_sorter(3), + mnesia(3), + shell(3), - Erlang Reference Manual, - erl_eval(3), - erlang(3), - ets(3), - file(3), - error_logger(3), - file_sorter(3), - mnesia(3), + Erlang Reference Manual, - Programming Examples, - shell(3)

+ Programming Examples

- diff --git a/lib/stdlib/doc/src/queue.xml b/lib/stdlib/doc/src/queue.xml index e1a96f5c65..a46ca47033 100644 --- a/lib/stdlib/doc/src/queue.xml +++ b/lib/stdlib/doc/src/queue.xml @@ -28,63 +28,74 @@ 1 Bjarne Däcker - 97-01-15 + 1997-01-15 B - queue.sgml + queue.xml
queue - Abstract Data Type for FIFO Queues + Abstract data type for FIFO queues. -

This module implements (double ended) FIFO queues +

This module provides (double-ended) FIFO queues in an efficient manner.

+

All functions fail with reason badarg if arguments - are of wrong type, for example queue arguments are not - queues, indexes are not integers, list arguments are + are of wrong type, for example, queue arguments are not + queues, indexes are not integers, and list arguments are not lists. Improper lists cause internal crashes. An index out of range for a queue also causes a failure with reason badarg.

+

Some functions, where noted, fail with reason empty for an empty queue.

+

The data representing a queue as used by this module - should be regarded as opaque by other modules. Any code + is to be regarded as opaque by other modules. Any code assuming knowledge of the format is running on thin ice.

+

All operations has an amortized O(1) running time, except - len/1, join/2, split/2, filter/2 - and member/2 that have O(n). + filter/2, + join/2, + len/1, + member/2, + split/2 that have O(n). To minimize the size of a queue minimizing the amount of garbage built by queue operations, the queues do not contain explicit length information, and that is why len/1 is O(n). If better performance for this particular operation is essential, it is easy for the caller to keep track of the length.

-

Queues are double ended. The mental picture of + +

Queues are double-ended. The mental picture of a queue is a line of people (items) waiting for their turn. The queue front is the end with the item that has waited the longest. The queue rear is the end an item enters when it starts to wait. If instead using the mental picture of a list, the front is called head and the rear is called tail.

+

Entering at the front and exiting at the rear are reverse operations on the queue.

-

The module has several sets of interface functions. The - "Original API", the "Extended API" and the "Okasaki API".

+ +

This module has three sets of interface functions: the + "Original API", the "Extended API", and the "Okasaki API".

+

The "Original API" and the "Extended API" both use the - mental picture of a waiting line of items. Both also + mental picture of a waiting line of items. Both have reverse operations suffixed "_r".

+

The "Original API" item removal functions return compound terms with both the removed item and the resulting queue. - The "Extended API" contain alternative functions that build - less garbage as well as functions for just inspecting the + The "Extended API" contains alternative functions that build + less garbage and functions for just inspecting the queue ends. Also the "Okasaki API" functions build less garbage.

-

The "Okasaki API" is inspired by "Purely Functional Data structures" + +

The "Okasaki API" is inspired by "Purely Functional Data Structures" by Chris Okasaki. It regards queues as lists. - The API is by many regarded as strange and avoidable. - For example many reverse operations have lexically reversed names, + This API is by many regarded as strange and avoidable. + For example, many reverse operations have lexically reversed names, some with more readable but perhaps less understandable aliases.

 - -
Original API
@@ -92,7 +103,8 @@ -

As returned by new/0.

 +

As returned by + new/0.

 @@ -101,205 +113,229 @@ - - Create an empty queue + + Filter a queue. -

Returns an empty queue.

+

Returns a queue Q2 that is the result of calling + Fun(Item) on all items in + Q1, in order from front to rear.

+

If Fun(Item) returns true, + Item is copied to the result queue. If it returns false, + Item is not copied. If it returns a list, + the list elements are inserted instead of Item in the + result queue.

+

So, Fun(Item) returning + [Item] is thereby + semantically equivalent to returning true, just + as returning [] is semantically equivalent to + returning false. But returning a list builds + more garbage than returning an atom.

 + - - Test if a term is a queue + + Convert a list to a queue. -

Tests if Term is a queue and returns true if so and - false otherwise.

+

Returns a queue containing the items in L in the + same order; the head item of the list becomes the front + item of the queue.

 + - - Test if a queue is empty + + Insert an item at the rear of a queue. -

Tests if Q is empty and returns true if so and - false otherwise.

+

Inserts Item at the rear of queue + Q1. + Returns the resulting queue Q2.

 + - - Get the length of a queue + + Insert an item at the front of a queue. -

Calculates and returns the length of queue Q.

+

Inserts Item at the front of queue + Q1. + Returns the resulting queue Q2.

 - - Insert an item at the rear of a queue + + Test if a queue is empty. -

Inserts Item at the rear of queue Q1. - Returns the resulting queue Q2.

+

Tests if Q is empty and returns true if + so, otherwise otherwise.

 + - - Insert an item at the front of a queue + + Test if a term is a queue. -

Inserts Item at the front of queue Q1. - Returns the resulting queue Q2.

+

Tests if Term is a queue and returns true + if so, otherwise false.

 + - - Remove the front item from a queue + + Join two queues. -

Removes the item at the front of queue Q1. Returns the - tuple {{value, Item}, Q2}, where Item is the - item removed and Q2 is the resulting queue. If Q1 is - empty, the tuple {empty, Q1} is returned.

+

Returns a queue Q3 that is the result of joining + Q1 and Q2 with + Q1 in front of Q2.

 + - - Remove the rear item from a queue + + Get the length of a queue. -

Removes the item at the rear of the queue Q1. Returns the - tuple {{value, Item}, Q2}, where Item is the - item removed and Q2 is the new queue. If Q1 is - empty, the tuple {empty, Q1} is returned.

+

Calculates and returns the length of queue Q.

 - - Convert a list to a queue + + Test if an item is in a queue. -

Returns a queue containing the items in L in the - same order; the head item of the list will become the front - item of the queue.

+

Returns true if Item matches some element + in Q, otherwise false.

 + - - Convert a queue to a list + + Create an empty queue. -

Returns a list of the items in the queue in the same order; - the front item of the queue will become the head of the list.

+

Returns an empty queue.

 - - Reverse a queue + + Remove the front item from a queue. -

Returns a queue Q2 that contains the items of - Q1 in the reverse order.

+

Removes the item at the front of queue Q1. + Returns tuple {{value, Item}, Q2}, + where Item is the item removed and + Q2 is the resulting queue. If + Q1 is empty, tuple + {empty, Q1} is returned.

 + - - Split a queue in two + + Remove the rear item from a queue. -

Splits Q1 in two. The N front items - are put in Q2 and the rest in Q3

+

Removes the item at the rear of queue Q1. + Returns tuple {{value, Item}, Q2}, + where Item is the item removed and + Q2 is the new queue. If Q1 is + empty, tuple {empty, Q1} is returned.

 + - - Join two queues + + Reverse a queue. -

Returns a queue Q3 that is the result of joining - Q1 and Q2 with Q1 in front of - Q2.

+

Returns a queue Q2 containing the items of + Q1 in the reverse order.

 + - - Filter a queue + + Split a queue in two. -

Returns a queue Q2 that is the result of calling - Fun(Item) on all items in Q1, - in order from front to rear.

-

If Fun(Item) returns true, Item - is copied to the result queue. If it returns false, - Item is not copied. If it returns a list - the list elements are inserted instead of Item in the - result queue.

-

So, Fun(Item) returning [Item] is thereby - semantically equivalent to returning true, just - as returning [] is semantically equivalent to - returning false. But returning a list builds - more garbage than returning an atom.

+

Splits Q1 in two. The N + front items are put in Q2 and the rest in + Q3.

 + - - Test if an item is in a queue + + Convert a queue to a list. -

Returns true if Item matches some element - in Q, otherwise false.

+

Returns a list of the items in the queue in the same order; + the front item of the queue becomes the head of the list.

 - -
Extended API
- - - Return the front item of a queue - -

Returns Item at the front of queue Q.

-

Fails with reason empty if Q is empty.

- - - - - Return the rear item of a queue - -

Returns Item at the rear of queue Q.

-

Fails with reason empty if Q is empty.

- - - Remove the front item from a queue + Remove the front item from a queue.

Returns a queue Q2 that is the result of removing the front item from Q1.

Fails with reason empty if Q1 is empty.

 + - Remove the rear item from a queue + Remove the rear item from a queue.

Returns a queue Q2 that is the result of removing the rear item from Q1.

Fails with reason empty if Q1 is empty.

 + + + + Return the front item of a queue. + +

Returns Item at the front of queue + Q.

+

Fails with reason empty if Q is empty.

+ + + + + + Return the rear item of a queue. + +

Returns Item at the rear of queue + Q.

+

Fails with reason empty if Q is empty.

+ + + - Return the front item of a queue + Return the front item of a queue. -

Returns the tuple {value, Item} where Item is the - front item of Q, or empty if Q is empty.

+

Returns tuple {value, Item}, where + Item is the front item of Q, + or empty if Q is empty.

 + - Return the rear item of a queue + Return the rear item of a queue. -

Returns the tuple {value, Item} where Item is the - rear item of Q, or empty if Q is empty.

+

Returns tuple {value, Item}, where + Item is the rear item of Q, + or empty if Q is empty.

 -
Okasaki API
@@ -307,58 +343,92 @@ - Insert an item at the head of a queue + Insert an item at the head of a queue. -

Inserts Item at the head of queue Q1. Returns +

Inserts Item at the head of queue + Q1. Returns the new queue Q2.

 + + + + Return the tail item of a queue. + +

Returns the tail item of queue Q.

+

Fails with reason empty if Q is empty.

+ + + - Return the item at the head of a queue + Return the item at the head of a queue. -

Returns Item from the head of queue Q.

+

Returns Item from the head of queue + Q.

Fails with reason empty if Q is empty.

 + - - Remove the head item from a queue + + Remove the tail item from a queue.

Returns a queue Q2 that is the result of removing - the head item from Q1.

+ the tail item from Q1.

Fails with reason empty if Q1 is empty.

 + - - Insert an item at the tail of a queue + + Remove the tail item from a queue. -

Inserts Item as the tail item of queue Q1. Returns - the new queue Q2.

+

Returns a queue Q2 that is the result of removing + the tail item from Q1.

+

Fails with reason empty if Q1 is empty.

+

The name lait/1 is a misspelling - do not use it anymore.

 + - - Return the tail item of a queue + Return the tail item of a queue.

Returns the tail item of queue Q.

Fails with reason empty if Q is empty.

 + - - - - Remove the tail item from a queue + v + Remove the tail item from a queue.

Returns a queue Q2 that is the result of removing the tail item from Q1.

Fails with reason empty if Q1 is empty.

-

The name lait/1 is a misspelling - do not use it anymore.

 - + + + Insert an item at the tail of a queue. + +

Inserts Item as the tail item of queue + Q1. Returns + the new queue Q2.

+ + + + + + Remove the head item from a queue. + +

Returns a queue Q2 that is the result of removing + the head item from Q1.

+

Fails with reason empty if Q1 is empty.

+ + + + diff --git a/lib/stdlib/doc/src/rand.xml b/lib/stdlib/doc/src/rand.xml index 50057259c6..1dcc3de000 100644 --- a/lib/stdlib/doc/src/rand.xml +++ b/lib/stdlib/doc/src/rand.xml @@ -33,215 +33,231 @@ rand.xml
rand - Pseudo random number generation + Pseudo random number generation. -

Random number generator.

- -

The module contains several different algorithms and can be - extended with more in the future. The current uniform - distribution algorithms uses the - - scrambled Xorshift algorithms by Sebastiano Vigna and the - normal distribution algorithm uses the - - Ziggurat Method by Marsaglia and Tsang. -

- -

The implemented algorithms are:

+

This module provides a random number generator. The module contains + a number of algorithms. The uniform distribution algorithms use the + scrambled Xorshift algorithms by + Sebastiano Vigna. The normal distribution algorithm uses the + Ziggurat Method by Marsaglia + and Tsang.

+ +

The following algorithms are provided:

+ - exsplus Xorshift116+, 58 bits precision and period of 2^116-1. - exs64 Xorshift64*, 64 bits precision and a period of 2^64-1. - exs1024 Xorshift1024*, 64 bits precision and a period of 2^1024-1. + exsplus + +

Xorshift116+, 58 bits precision and period of 2^116-1

+ + exs64 + +

Xorshift64*, 64 bits precision and a period of 2^64-1

+ + exs1024 + +

Xorshift1024*, 64 bits precision and a period of 2^1024-1

+ -

The current default algorithm is exsplus. The default - may change in future. If a specific algorithm is required make - sure to always use seed/1 - to initialize the state. -

+

The default algorithm is exsplus. If a specific algorithm is + required, ensure to always use + seed/1 to initialize the state.

Every time a random number is requested, a state is used to - calculate it and a new state produced. The state can either be - implicit or it can be an explicit argument and return value. -

+ calculate it and a new state is produced. The state can either be + implicit or be an explicit argument and return value.

The functions with implicit state use the process dictionary - variable rand_seed to remember the current state.

+ variable rand_seed to remember the current state.

+ +

If a process calls + uniform/0 or + uniform/1 without + setting a seed first, seed/1 + is called automatically with the default algorithm and creates a + non-constant seed.

+ +

The functions with explicit state never use the process dictionary.

+ +

Examples:

+ +

Simple use; creates and seeds the default algorithm + with a non-constant seed if not already done:

+ + 
+R0 = rand:uniform(),
+R1 = rand:uniform(),
-

If a process calls uniform/0 or - uniform/1 without - setting a seed first, seed/1 - is called automatically with the default algorithm and creates a - non-constant seed.

+

Use a specified algorithm:

-

The functions with explicit state never use the process - dictionary.

+ 
+_ = rand:seed(exs1024),
+R2 = rand:uniform(),
+ +

Use a specified algorithm with a constant seed:

-

Examples:

-      %% Simple usage. Creates and seeds the default algorithm
-      %% with a non-constant seed if not already done.
-      R0 = rand:uniform(),
-      R1 = rand:uniform(),
-
-      %% Use a given algorithm.
-      _ = rand:seed(exs1024),
-      R2 = rand:uniform(),
-
-      %% Use a given algorithm with a constant seed.
-      _ = rand:seed(exs1024, {123, 123534, 345345}),
-      R3 = rand:uniform(),
-
-      %% Use the functional api with non-constant seed.
-      S0 = rand:seed_s(exsplus),
-      {R4, S1} = rand:uniform_s(S0),
-
-      %% Create a standard normal deviate.
-      {SND0, S2} = rand:normal_s(S1),
-
- -

This random number generator is not cryptographically - strong. If a strong cryptographic random number generator is - needed, use one of functions in the - crypto - module, for example crypto:strong_rand_bytes/1.

 +_ = rand:seed(exs1024, {123, 123534, 345345}), +R3 = rand:uniform(), + +

Use the functional API with a non-constant seed:

+ + 
+S0 = rand:seed_s(exsplus),
+{R4, S1} = rand:uniform_s(S0),
+ +

Create a standard normal deviate:

+ + 
+{SND0, S2} = rand:normal_s(S1),
+ + +

This random number generator is not cryptographically + strong. If a strong cryptographic random number generator is + needed, use one of functions in the + crypto + module, for example, + crypto:strong_rand_bytes/1.

+ + - -

Algorithm dependent state.

 +

Algorithm-dependent state.

 - -

Algorithm dependent state which can be printed or saved to file.

 +

Algorithm-dependent state that can be printed or saved to + file.

 - - Seed random number generator - - -

Seeds random number generation with the given algorithm and time dependent - data if AlgOrExpState is an algorithm.

-

Otherwise recreates the exported seed in the process - dictionary, and returns the state. - See also: export_seed/0.

+ + Export the random number generation state. + +

Returns the random number state in an external format. + To be used with seed/1.

 + - - Seed random number generator - -

Seeds random number generation with the given algorithm and time dependent - data if AlgOrExpState is an algorithm.

-

Otherwise recreates the exported seed and returns the state. - See also: export_seed/0.

+ + Export the random number generation state. + +

Returns the random number generator state in an external format. + To be used with seed/1.

 + - - Seed the random number generation + + Return a standard normal distributed random float. -

Seeds random number generation with the given algorithm and - integers in the process dictionary and returns - the state.

+

Returns a standard normal deviate float (that is, the mean + is 0 and the standard deviation is 1) and updates the state in + the process dictionary.

 + - - Seed the random number generation + + Return a standard normal distributed random float. -

Seeds random number generation with the given algorithm and - integers and returns the state.

+

Returns, for a specified state, a standard normal + deviate float (that is, the mean is 0 and the standard + deviation is 1) and a new state.

 - - Export the random number generation state - -

Returns the random number state in an external format. - To be used with seed/1.

+ + Seed random number generator. + + +

Seeds random number generation with the specifed algorithm and + time-dependent data if AlgOrExpState is an algorithm.

+

Otherwise recreates the exported seed in the process dictionary, + and returns the state. See also + export_seed/0.

 - - Export the random number generation state - -

Returns the random number generator state in an external format. - To be used with seed/1.

+ + Seed the random number generation. + +

Seeds random number generation with the specified algorithm and + integers in the process dictionary and returns the state.

 - - Return a random float + + Seed random number generator. - -

Returns a random float uniformly distributed in the value - range 0.0 < X < 1.0 and - updates the state in the process dictionary.

+

Seeds random number generation with the specifed algorithm and + time-dependent data if AlgOrExpState is an algorithm.

+

Otherwise recreates the exported seed and returns the state. + See also + export_seed/0.

 + - - Return a random float + + Seed the random number generation. -

Given a state, uniform_s/1 returns a random float - uniformly distributed in the value range 0.0 < - X < 1.0 and a new state.

+

Seeds random number generation with the specified algorithm and + integers and returns the state.

 - - Return a random integer - - -

Given an integer N >= 1, - uniform/1 returns a random integer uniformly - distributed in the value range - 1 <= X <= N and - updates the state in the process dictionary.

+ + Return a random float. + +

Returns a random float uniformly distributed in the value + range 0.0 < X < 1.0 and + updates the state in the process dictionary.

 + - - Return a random integer - -

Given an integer N >= 1 and a state, - uniform_s/2 returns a random integer uniformly - distributed in the value range 1 <= X <= - N and a new state.

+ + Return a random integer. + +

Returns, for a specified integer N >= 1, + a random integer uniformly distributed in the value range + 1 <= X <= N and + updates the state in the process dictionary.

 - - Return a standard normal distributed random float + + Return a random float. -

Returns a standard normal deviate float (that is, the mean - is 0 and the standard deviation is 1) and updates the state in - the process dictionary.

+

Returns, for a specified state, random float + uniformly distributed in the value range 0.0 < + X < 1.0 and a new state.

 + - - Return a standard normal distributed random float + + Return a random integer. -

Given a state, normal_s/1 returns a standard normal - deviate float (that is, the mean is 0 and the standard - deviation is 1) and a new state.

+

Returns, for a specified integer N >= 1 + and a state, a random integer uniformly distributed in the value + range 1 <= X <= N and a + new state.

 - diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml index dea4e43c95..8d090d20b3 100644 --- a/lib/stdlib/doc/src/random.xml +++ b/lib/stdlib/doc/src/random.xml @@ -24,116 +24,140 @@ random Joe Armstrong - Bjarne Dacker + Bjarne Däcker 1 Bjarne Däcker - 96-09-09 + 1996-09-09 A - random.sgml + random.xml
random - Pseudo random number generation + Pseudo-random number generation. -

Random number generator. The method is attributed to - B.A. Wichmann and I.D.Hill, in 'An efficient and portable +

This module provides a random number generator. The method is attributed + to B.A. Wichmann and I.D. Hill in 'An efficient and portable pseudo-random number generator', Journal of Applied - Statistics. AS183. 1982. Also Byte March 1987.

-

The current algorithm is a modification of the version attributed - to Richard A O'Keefe in the standard Prolog library.

+ Statistics. AS183. 1982. Also Byte March 1987.

+ +

The algorithm is a modification of the version attributed + to Richard A. O'Keefe in the standard Prolog library.

+

Every time a random number is requested, a state is used to calculate - it, and a new state produced. The state can either be implicit (kept + it, and a new state is produced. The state can either be implicit (kept in the process dictionary) or be an explicit argument and return value. In this implementation, the state (the type ran()) consists of a tuple of three integers.

-

It should be noted that this random number generator is not cryptographically - strong. If a strong cryptographic random number generator is needed for - example crypto:strong_rand_bytes/1 could be used instead.

-

The new and improved rand module should be used - instead of this module.

 + + +

This random number generator is not cryptographically + strong. If a strong cryptographic random number generator is + needed, use one of functions in the + crypto + module, for example, + crypto:strong_rand_bytes/1.

+ + + +

The improved rand + module is to be used instead of this module.

+ +

The state.

 + - Seeds random number generation with default values + Seed random number generation with default values.

Seeds random number generation with default (fixed) values - in the process dictionary, and returns the old state.

+ in the process dictionary and returns the old state.

 + + + + Seed random number generator. + +

seed({A1, A2, A3}) + is equivalent to + seed(A1, A2, A3).

+ + + - Seeds random number generator + Seed random number generator.

Seeds random number generation with integer values in the process - dictionary, and returns the old state.

-

One easy way of obtaining a unique value to seed with is to:

+ dictionary and returns the old state.

+

The following is an easy way of obtaining a unique value to seed + with:

random:seed(erlang:phash2([node()]), erlang:monotonic_time(), erlang:unique_integer()) -

See - erlang:phash2/1, - node/0, - erlang:monotonic_time/0, and +

For details, see + + erlang:phash2/1, + + erlang:node/0, + + erlang:monotonic_time/0, and - erlang:unique_integer/0) for details.

- - - - - Seeds random number generator - -

- seed({A1, A2, A3}) is equivalent to seed(A1, A2, A3). -

+ erlang:unique_integer/0.

 + - Return default state for random number generation + Return default state for random number generation.

Returns the default state.

 + - Return a random float + Return a random float.

Returns a random float uniformly distributed between 0.0 and 1.0, updating the state in the process dictionary.

 + - Return a random integer + Return a random integer. -

Given an integer N >= 1, uniform/1 returns a - random integer uniformly distributed between 1 and - N, updating the state in the process dictionary.

+

Returns, for a specified integer N >= 1, + a random integer uniformly distributed between 1 and + N, updating the state in the process + dictionary.

 + - Return a random float + Return a random float. -

Given a state, uniform_s/1returns a random float uniformly +

Returns, for a specified state, a random float uniformly distributed between 0.0 and 1.0, and a new state.

 + - Return a random integer + Return a random integer. -

Given an integer N >= 1 and a state, uniform_s/2 - returns a random integer uniformly distributed between 1 and +

Returns, for a specified integer N >= 1 and a + state, a random integer uniformly distributed between 1 and N, and a new state.

 @@ -143,12 +167,18 @@ random:seed(erlang:phash2([node()]), Note

Some of the functions use the process dictionary variable random_seed to remember the current seed.

-

If a process calls uniform/0 or uniform/1 without - setting a seed first, seed/0 is called automatically.

-

The implementation changed in R15. Upgrading to R15 will break - applications that expect a specific output for a given seed. The output - is still deterministic number series, but different compared to releases - older than R15. The seed {0,0,0} will, for example, no longer + +

If a process calls + uniform/0 or + uniform/1 + without setting a seed first, + seed/0 + is called automatically.

+ +

The implementation changed in Erlang/OTP R15. Upgrading to R15 breaks + applications that expect a specific output for a specified seed. The + output is still deterministic number series, but different compared to + releases older than R15. Seed {0,0,0} does, for example, no longer produce a flawed series of only zeros.

 diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index fda79d51d5..7f4f0aa18c 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -35,39 +35,37 @@ re.xml
re - Perl like regular expressions for Erlang + Perl-like regular expressions for Erlang. -

This module contains regular expression matching functions for - strings and binaries.

+ strings and binaries.

The regular expression - syntax and semantics resemble that of Perl.

+ syntax and semantics resemble that of Perl.

-

The library's matching algorithms are currently based on the - PCRE library, but not all of the PCRE library is interfaced and - some parts of the library go beyond what PCRE offers. The sections of - the PCRE documentation which are relevant to this module are included - here.

+

The matching algorithms of the library are based on the + PCRE library, but not all of the PCRE library is interfaced and + some parts of the library go beyond what PCRE offers. The sections of + the PCRE documentation that are relevant to this module are included + here.

-

The Erlang literal syntax for strings uses the "\" - (backslash) character as an escape code. You need to escape - backslashes in literal strings, both in your code and in the shell, - with an additional backslash, i.e.: "\\".

+

The Erlang literal syntax for strings uses the "\" + (backslash) character as an escape code. You need to escape + backslashes in literal strings, both in your code and in the shell, + with an extra backslash, that is, "\\".

 - - + -

Opaque datatype containing a compiled regular expression. - The mp() is guaranteed to be a tuple() having the atom - 're_pattern' as its first element, to allow for matching in - guards. The arity of the tuple() or the content of the other fields - may change in future releases.

+

Opaque data type containing a compiled regular expression. + mp() is guaranteed to be a tuple() having the atom + re_pattern as its first element, to allow for matching in + guards. The arity of the tuple or the content of the other fields + can change in future Erlang/OTP releases.

 @@ -77,6 +75,7 @@ + @@ -85,90 +84,214 @@

The same as compile(Regexp,[])

 + - Compile a regular expression into a match program + Compile a regular expression into a match program. -

This function compiles a regular expression with the syntax - described below into an internal format to be used later as a - parameter to the run/2,3 functions.

-

Compiling the regular expression before matching is useful if - the same expression is to be used in matching against multiple - subjects during the program's lifetime. Compiling once and - executing many times is far more efficient than compiling each - time one wants to match.

-

When the unicode option is given, the regular expression should be given as a valid Unicode charlist(), otherwise as any valid iodata().

- -

The options have the following meanings:

- - unicode - The regular expression is given as a Unicode charlist() and the resulting regular expression code is to be run against a valid Unicode charlist() subject. Also consider the ucp option when using Unicode characters. - anchored - The pattern is forced to be "anchored", that is, it is constrained to match only at the first matching point in the string that is being searched (the "subject string"). This effect can also be achieved by appropriate constructs in the pattern itself. - caseless - Letters in the pattern match both upper and lower case letters. It is equivalent to Perl's /i option, and it can be changed within a pattern by a (?i) option setting. Uppercase and lowercase letters are defined as in the ISO-8859-1 character set. - dollar_endonly - A dollar metacharacter in the pattern matches only at the end of the subject string. Without this option, a dollar also matches immediately before a newline at the end of the string (but not before any other newlines). The dollar_endonly option is ignored if multiline is given. There is no equivalent option in Perl, and no way to set it within a pattern. - dotall - A dot in the pattern matches all characters, including those that indicate newline. Without it, a dot does not match when the current position is at a newline. This option is equivalent to Perl's /s option, and it can be changed within a pattern by a (?s) option setting. A negative class such as [^a] always matches newline characters, independent of this option's setting. - extended - Whitespace data characters in the pattern are ignored except when escaped or inside a character class. Whitespace does not include the VT character (ASCII 11). In addition, characters between an unescaped # outside a character class and the next newline, inclusive, are also ignored. This is equivalent to Perl's /x option, and it can be changed within a pattern by a (?x) option setting. - -This option makes it possible to include comments inside complicated patterns. Note, however, that this applies only to data characters. Whitespace characters may never appear within special character sequences in a pattern, for example within the sequence (?( which introduces a conditional subpattern. - firstline - An unanchored pattern is required to match before or at the first newline in the subject string, though the matched text may continue over the newline. - multiline -

By default, PCRE treats the subject string as consisting of a single line of characters (even if it actually contains newlines). The "start of line" metacharacter (^) matches only at the start of the string, while the "end of line" metacharacter ($) matches only at the end of the string, or before a terminating newline (unless dollar_endonly is given). This is the same as Perl.

- -

When multiline is given, the "start of line" and "end of line" constructs match immediately following or immediately before internal newlines in the subject string, respectively, as well as at the very start and end. This is equivalent to Perl's /m option, and it can be changed within a pattern by a (?m) option setting. If there are no newlines in a subject string, or no occurrences of ^ or $ in a pattern, setting multiline has no effect.

 - no_auto_capture - Disables the use of numbered capturing parentheses in the pattern. Any opening parenthesis that is not followed by ? behaves as if it were followed by ?: but named parentheses can still be used for capturing (and they acquire numbers in the usual way). There is no equivalent of this option in Perl. - - dupnames - Names used to identify capturing subpatterns need not be unique. This can be helpful for certain types of pattern when it is known that only one instance of the named subpattern can ever be matched. There are more details of named subpatterns below - ungreedy - This option inverts the "greediness" of the quantifiers so that they are not greedy by default, but become greedy if followed by "?". It is not compatible with Perl. It can also be set by a (?U) option setting within the pattern. - {newline, NLSpec} - -

Override the default definition of a newline in the subject string, which is LF (ASCII 10) in Erlang.

- - cr - Newline is indicated by a single character CR (ASCII 13) - lf - Newline is indicated by a single character LF (ASCII 10), the default - crlf - Newline is indicated by the two-character CRLF (ASCII 13 followed by ASCII 10) sequence. - anycrlf - Any of the three preceding sequences should be recognized. - any - Any of the newline sequences above, plus the Unicode sequences VT (vertical tab, U+000B), FF (formfeed, U+000C), NEL (next line, U+0085), LS (line separator, U+2028), and PS (paragraph separator, U+2029). - - - bsr_anycrlf - Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters. - bsr_unicode - Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default). - no_start_optimize - This option disables optimization that may malfunction if "Special start-of-pattern items" are present in the regular expression. A typical example would be when matching "DEFABC" against "(*COMMIT)ABC", where the start optimization of PCRE would skip the subject up to the "A" and would never realize that the (*COMMIT) instruction should have made the matching fail. This option is only relevant if you use "start-of-pattern items", as discussed in the section "PCRE regular expression details" below. - ucp - Specifies that Unicode Character Properties should be used when - resolving \B, \b, \D, \d, \S, \s, \W and \w. Without this flag, only - ISO-Latin-1 properties are used. Using Unicode properties hurts - performance, but is semantically correct when working with Unicode - characters beyond the ISO-Latin-1 range. - never_utf - Specifies that the (*UTF) and/or (*UTF8) "start-of-pattern items" are forbidden. This flag can not be combined with unicode. Useful if ISO-Latin-1 patterns from an external source are to be compiled. - - +

Compiles a regular expression, with the syntax + described below, into an internal format to be used later as a + parameter to + run/2 and + run/3.

+

Compiling the regular expression before matching is useful if + the same expression is to be used in matching against multiple + subjects during the lifetime of the program. Compiling once and + executing many times is far more efficient than compiling each + time one wants to match.

+

When option unicode is specified, the regular expression + is to be specified as a valid Unicode charlist(), otherwise as + any valid iodata().

+ +

Options:

+ + unicode + +

The regular expression is specified as a Unicode + charlist() and the resulting regular expression code is to + be run against a valid Unicode charlist() subject. Also + consider option ucp when using Unicode characters.

+ + anchored + +

The pattern is forced to be "anchored", that is, it is + constrained to match only at the first matching point in the + string that is searched (the "subject string"). This effect can + also be achieved by appropriate constructs in the pattern + itself.

+ + caseless + +

Letters in the pattern match both uppercase and lowercase + letters. It is equivalent to Perl option /i and can be + changed within a pattern by a (?i) option setting. + Uppercase and lowercase letters are defined as in the ISO 8859-1 + character set.

+ + dollar_endonly + +

A dollar metacharacter in the pattern matches only at the end of + the subject string. Without this option, a dollar also matches + immediately before a newline at the end of the string (but not + before any other newlines). This option is ignored if option + multiline is specified. There is no equivalent option in + Perl, and it cannot be set within a pattern.

+ + dotall + +

A dot in the pattern matches all characters, including those + indicating newline. Without it, a dot does not match when the + current position is at a newline. This option is equivalent to + Perl option /s and it can be changed within a pattern by a + (?s) option setting. A negative class, such as [^a], + always matches newline characters, independent of the setting of + this option.

+ + extended + +

Whitespace data characters in the pattern are ignored except + when escaped or inside a character class. Whitespace does not + include character 'vt' (ASCII 11). Characters between an + unescaped # outside a character class and the next newline, + inclusive, are also ignored. This is equivalent to Perl option + /x and can be changed within a pattern by a (?x) + option setting.

+

With this option, comments inside complicated patterns can be + included. However, notice that this applies only to data + characters. Whitespace characters can never appear within special + character sequences in a pattern, for example within sequence + (?( that introduces a conditional subpattern.

+ + firstline + +

An unanchored pattern is required to match before or at the first + newline in the subject string, although the matched text can + continue over the newline.

+ + multiline + +

By default, PCRE treats the subject string as consisting of a + single line of characters (even if it contains newlines). The + "start of line" metacharacter (^) matches only at the + start of the string, while the "end of line" metacharacter + ($) matches only at the end of the string, or before a + terminating newline (unless option dollar_endonly is + specified). This is the same as in Perl.

+

When this option is specified, the "start of line" and "end of + line" constructs match immediately following or immediately + before internal newlines in the subject string, respectively, as + well as at the very start and end. This is equivalent to Perl + option /m and can be changed within a pattern by a + (?m) option setting. If there are no newlines in a subject + string, or no occurrences of ^ or $ in a pattern, + setting multiline has no effect.

 + no_auto_capture + +

Disables the use of numbered capturing parentheses in the + pattern. Any opening parenthesis that is not followed by ? + behaves as if it is followed by ?:. Named parentheses can + still be used for capturing (and they acquire numbers in the + usual way). There is no equivalent option in Perl.

+ + dupnames + +

Names used to identify capturing subpatterns need not be unique. + This can be helpful for certain types of pattern when it is known + that only one instance of the named subpattern can ever be + matched. More details of named subpatterns are provided below.

+ + ungreedy + +

Inverts the "greediness" of the quantifiers so that they are not + greedy by default, but become greedy if followed by "?". It is + not compatible with Perl. It can also be set by a (?U) + option setting within the pattern.

+ + {newline, NLSpec} + +

Overrides the default definition of a newline in the subject + string, which is LF (ASCII 10) in Erlang.

+ + cr + +

Newline is indicated by a single character cr + (ASCII 13).

+ + lf + +

Newline is indicated by a single character LF (ASCII 10), the + default.

+ + crlf + +

Newline is indicated by the two-character CRLF (ASCII 13 + followed by ASCII 10) sequence.

+ + anycrlf + +

Any of the three preceding sequences is to be recognized.

+ + any + +

Any of the newline sequences above, and the Unicode sequences + VT (vertical tab, U+000B), FF (formfeed, U+000C), NEL (next + line, U+0085), LS (line separator, U+2028), and PS (paragraph + separator, U+2029).

+ + + + bsr_anycrlf + +

Specifies specifically that \R is to match only the CR, + LF, or CRLF sequences, not the Unicode-specific newline + characters.

+ + bsr_unicode + +

Specifies specifically that \R is to match all the Unicode + newline characters (including CRLF, and so on, the default).

+ + no_start_optimize + +

Disables optimization that can malfunction if "Special + start-of-pattern items" are present in the regular expression. A + typical example would be when matching "DEFABC" against + "(*COMMIT)ABC", where the start optimization of PCRE would skip + the subject up to "A" and never realize that the (*COMMIT) + instruction is to have made the matching fail. This option is only + relevant if you use "start-of-pattern items", as discussed in + section PCRE Regular Expression + Details.

+ + ucp + +

Specifies that Unicode character properties are to be used when + resolving \B, \b, \D, \d, \S, \s, \W and \w. Without this flag, + only ISO Latin-1 properties are used. Using Unicode properties + hurts performance, but is semantically correct when working with + Unicode characters beyond the ISO Latin-1 range.

+ + never_utf + +

Specifies that the (*UTF) and/or (*UTF8) "start-of-pattern + items" are forbidden. This flag cannot be combined with option + unicode. Useful if ISO Latin-1 patterns from an external + source are to be compiled.

+ + + - Inspects a compiled regular expression + Inspects a compiled regular expression. -

This function takes a compiled regular expression and an item, returning the relevant data from the regular expression. Currently the only supported item is namelist, which returns the tuple {namelist, [ binary()]}, containing the names of all (unique) named subpatterns in the regular expression.

-

Example:

- +

Takes a compiled regular expression and an item, and returns the + relevant data from the regular expression. The only + supported item is namelist, which returns the tuple + {namelist, [binary()]}, containing the names of all (unique) + named subpatterns in the regular expression. For example:

+ 1> {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)"). {ok,{re_pattern,3,0,0, <<69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255, @@ -181,8 +304,15 @@ This option makes it possible to include comments inside complicated patterns. N 255,255,...>>}} 4> re:inspect(MPD,namelist). {namelist,[<<"B">>,<<"C">>]} -

Note specifically in the second example that the duplicate name only occurs once in the returned list, and that the list is in alphabetical order regardless of where the names are positioned in the regular expression. The order of the names is the same as the order of captured subexpressions if {capture, all_names} is given as an option to re:run/3. You can therefore create a name-to-value mapping from the result of re:run/3 like this:

- +

Notice in the second example that the duplicate name only occurs + once in the returned list, and that the list is in alphabetical order + regardless of where the names are positioned in the regular + expression. The order of the names is the same as the order of + captured subexpressions if {capture, all_names} is specified as + an option to run/3. + You can therefore create a name-to-value mapping from the result of + run/3 like this:

+ 1> {ok,MP} = re:compile("(?<A>A)|(?<B>B)|(?<C>C)"). {ok,{re_pattern,3,0,0, <<69,82,67,80,119,0,0,0,0,0,0,0,1,0,0,0,255,255,255,255, @@ -193,249 +323,318 @@ This option makes it possible to include comments inside complicated patterns. N {match,[<<"A">>,<<>>,<<>>]} 4> NameMap = lists:zip(N,L). [{<<"A">>,<<"A">>},{<<"B">>,<<>>},{<<"C">>,<<>>}] -

More items are expected to be added in the future.

+ + + + + + Match a subject against regular expression and replace matching + elements with Replacement. + +

Same as replace(Subject, RE, + Replacement, []).

 + + + + Match a subject against regular expression and replace matching + elements with Replacement. + +

Replaces the matched part of the Subject string + with the contents of Replacement.

+

The permissible options are the same as for + run/3, except that option + capture is not allowed. Instead a {return, + ReturnType} is present. The default return type is + iodata, constructed in a way to minimize copying. The + iodata result can be used directly in many I/O operations. If a + flat list() is desired, specify {return, list}. If a + binary is desired, specify {return, binary}.

+

As in function run/3, an mp() compiled with option + unicode requires Subject to be a Unicode + charlist(). If compilation is done implicitly and the + unicode compilation option is specified to this function, both + the regular expression and Subject are to + specified as valid Unicode charlist()s.

+

The replacement string can contain the special character + &, which inserts the whole matching expression in the + result, and the special sequence \N (where N is an integer > + 0), \gN, or \g{N}, resulting in the subexpression + number N, is inserted in the result. If no subexpression with that + number is generated by the regular expression, nothing is + inserted.

+

To insert an & or a \ in the result, precede it + with a \. Notice that Erlang already gives a special meaning to + \ in literal strings, so a single \ must be written as + "\\" and therefore a double \ as "\\\\".

+

Example:

+ +re:replace("abcd","c","[&]",[{return,list}]). +

gives

+ +"ab[c]d" +

while

+ +re:replace("abcd","c","[\\&]",[{return,list}]). +

gives

+ +"ab[&]d" +

As with run/3, compilation errors raise the badarg + exception. compile/2 + can be used to get more information about the error.

+ + + - Match a subject against regular expression and capture subpatterns + Match a subject against regular expression and capture + subpatterns. -

The same as run(Subject,RE,[]).

+

Same as run(Subject,RE,[]).

 + - Match a subject against regular expression and capture subpatterns - See compile/2 above. + Match a subject against regular expression and capture + subpatterns. + See + compile/2. - -

Executes a regexp matching, returning match/{match, - Captured} or nomatch. The regular expression can be - given either as iodata() in which case it is - automatically compiled (as by re:compile/2) and executed, - or as a pre-compiled mp() in which case it is executed - against the subject directly.

- -

When compilation is involved, the exception badarg is - thrown if a compilation error occurs. Call re:compile/2 - to get information about the location of the error in the - regular expression.

- -

If the regular expression is previously compiled, the option - list can only contain the options anchored, - global, notbol, noteol, report_errors, - notempty, notempty_atstart, {offset, integer() >= 0}, - {match_limit, integer() >= 0}, - {match_limit_recursion, integer() >= 0}, - {newline, - NLSpec} and - {capture, ValueSpec}/{capture, ValueSpec, - Type}. Otherwise all options valid for the - re:compile/2 function are allowed as well. Options - allowed both for compilation and execution of a match, namely - anchored and {newline, NLSpec}, - will affect both - the compilation and execution if present together with a non - pre-compiled regular expression.

- -

If the regular expression was previously compiled with the - option unicode, the Subject should be provided as - a valid Unicode charlist(), otherwise any iodata() - will do. If compilation is involved and the option - unicode is given, both the Subject and the regular - expression should be given as valid Unicode - charlists().

- -

The {capture, ValueSpec}/{capture, ValueSpec, Type} - defines what to return from the function upon successful - matching. The capture tuple may contain both a - value specification telling which of the captured - substrings are to be returned, and a type specification, telling - how captured substrings are to be returned (as index tuples, - lists or binaries). The capture option makes the function - quite flexible and powerful. The different options are described - in detail below.

- -

If the capture options describe that no substring capturing - at all is to be done ({capture, none}), the function will - return the single atom match upon successful matching, - otherwise the tuple - {match, ValueList} is returned. Disabling capturing can - be done either by specifying none or an empty list as - ValueSpec.

- -

The report_errors option adds the possibility that an - error tuple is returned. The tuple will either indicate a - matching error (match_limit or - match_limit_recursion) or a compilation error, where the - error tuple has the format {error, {compile, - CompileErr}}. Note that if the option - report_errors is not given, the function never returns - error tuples, but will report compilation errors as a badarg - exception and failed matches due to exceeded match limits simply - as nomatch.

- -

The options relevant for execution are:

- - - anchored - - Limits re:run/3 to matching at the first matching - position. If a pattern was compiled with anchored, or - turned out to be anchored by virtue of its contents, it cannot - be made unanchored at matching time, hence there is no - unanchored option. - - global - - -

Implements global (repetitive) search (the g flag in - Perl). Each match is returned as a separate - list() containing the specific match as well as any - matching subexpressions (or as specified by the capture - option). The Captured part of the return value will - hence be a list() of list()s when this - option is given.

- -

The interaction of the global option with a regular - expression which matches an empty string surprises some users. - When the global option is given, re:run/3 handles empty - matches in the same way as Perl: a zero-length match at any - point will be retried with the options [anchored, - notempty_atstart] as well. If that search gives a result of length - > 0, the result is included. For example:

- - re:run("cat","(|at)",[global]). - -

The following matching will be performed:

- - At offset 0 - The regexp (|at) will first match at the initial - position of the string cat, giving the result set - [{0,0},{0,0}] (the second {0,0} is due to the - subexpression marked by the parentheses). As the length of the - match is 0, we don't advance to the next position yet. - At offset 0 with [anchored, notempty_atstart] - The search is retried - with the options [anchored, notempty_atstart] at the same - position, which does not give any interesting result of longer - length, so the search position is now advanced to the next - character (a). - At offset 1 - This time, the search results in - [{1,0},{1,0}], so this search will also be repeated - with the extra options. - At offset 1 with [anchored, notempty_atstart] - Now the ab alternative - is found and the result will be [{1,2},{1,2}]. The result is - added to the list of results and the position in the - search string is advanced two steps. - At offset 3 - The search now once again - matches the empty string, giving [{3,0},{3,0}]. - At offset 1 with [anchored, notempty_atstart] - This will give no result of length > 0 and we are at - the last position, so the global search is complete. - -

The result of the call is:

- - {match,[[{0,0},{0,0}],[{1,0},{1,0}],[{1,2},{1,2}],[{3,0},{3,0}]]} - - - notempty - -

An empty string is not considered to be a valid match if this - option is given. If there are alternatives in the pattern, they - are tried. If all the alternatives match the empty string, the - entire match fails. For example, if the pattern

- a?b? -

is applied to a string not beginning with "a" or "b", it - would normally match the empty string at the start of the - subject. With the notempty option, this match is not - valid, so re:run/3 searches further into the string for - occurrences of "a" or "b".

- - notempty_atstart - -

This is like notempty, except that an empty string - match that is not at the start of the subject is permitted. If - the pattern is anchored, such a match can occur only if the - pattern contains \K.

-

Perl has no direct equivalent of notempty or notempty_atstart, but it does - make a special case of a pattern match of the empty string - within its split() function, and when using the /g modifier. It - is possible to emulate Perl's behavior after matching a null - string by first trying the match again at the same offset with - notempty_atstart and anchored, and then, if that fails, by - advancing the starting offset (see below) and trying an ordinary - match again.

- - notbol - - This option specifies that the first character of the subject - string is not the beginning of a line, so the circumflex - metacharacter should not match before it. Setting this without - multiline (at compile time) causes circumflex never to - match. This option only affects the behavior of the circumflex - metacharacter. It does not affect \A. - - noteol - - This option specifies that the end of the subject string - is not the end of a line, so the dollar metacharacter should not - match it nor (except in multiline mode) a newline immediately - before it. Setting this without multiline (at compile time) - causes dollar never to match. This option affects only the - behavior of the dollar metacharacter. It does not affect \Z or - \z. - - report_errors - -

This option gives better control of the error handling in re:run/3. When it is given, compilation errors (if the regular expression isn't already compiled) as well as run-time errors are explicitly returned as an error tuple.

-

The possible run-time errors are:

- - match_limit - - The PCRE library sets a limit on how many times the - internal match function can be called. The default value for - this is 10000000 in the library compiled for Erlang. If - {error, match_limit} is returned, it means that the - execution of the regular expression has reached this - limit. Normally this is to be regarded as a nomatch, - which is the default return value when this happens, but by - specifying report_errors, you will get informed when - the match fails due to to many internal calls. - - match_limit_recursion - - This error is very similar to match_limit, but - occurs when the internal match function of PCRE is - "recursively" called more times than the - "match_limit_recursion" limit, which is by default 10000000 as - well. Note that as long as the match_limit and - match_limit_default values are kept at the default - values, the match_limit_recursion error can not occur, - as the match_limit error will occur before that (each - recursive call is also a call, but not vice versa). Both - limits can however be changed, either by setting limits - directly in the regular expression string (see reference - section below) or by giving options to re:run/3 - - -

It is important to understand that what is referred to as - "recursion" when limiting matches is not actually recursion on - the C stack of the Erlang machine, neither is it recursion on - the Erlang process stack. The version of PCRE compiled into the - Erlang VM uses machine "heap" memory to store values that needs to be - kept over recursion in regular expression matches.

- - {match_limit, integer() >= 0} - -

This option limits the execution time of a match in an - implementation-specific way. It is described in the following - way by the PCRE documentation:

- - +

Executes a regular expression matching, and returns + match/{match, Captured} or nomatch. The + regular expression can be specified either as iodata() in + which case it is automatically compiled (as by compile/2) and + executed, or as a precompiled mp() in which case it is executed + against the subject directly.

+

When compilation is involved, exception badarg is thrown if a + compilation error occurs. Call compile/2 to get information + about the location of the error in the regular expression.

+

If the regular expression is previously compiled, the option list can + only contain the following options:

+ + anchored + {capture, ValueSpec}/{capture, + ValueSpec, Type} + global + {match_limit, integer() >= 0} + {match_limit_recursion, integer() >= 0} + {newline, NLSpec} + notbol + notempty + notempty_atstart + noteol + {offset, integer() >= 0} + report_errors + +

Otherwise all options valid for function compile/2 are also + allowed. Options allowed both for compilation and execution of a + match, namely anchored and {newline, + NLSpec}, affect both the compilation and execution if + present together with a non-precompiled regular expression.

+

If the regular expression was previously compiled with option + unicode, Subject is to be provided as a + valid Unicode charlist(), otherwise any iodata() will + do. If compilation is involved and option unicode is specified, + both Subject and the regular expression are to be + specified as valid Unicode charlists().

+

{capture, ValueSpec}/{capture, + ValueSpec, Type} defines what to return + from the function upon successful matching. The capture tuple + can contain both a value specification, telling which of the captured + substrings are to be returned, and a type specification, telling how + captured substrings are to be returned (as index tuples, lists, or + binaries). The options are described in detail below.

+

If the capture options describe that no substring capturing is to be + done ({capture, none}), the function returns the single atom + match upon successful matching, otherwise the tuple + {match, ValueList}. Disabling capturing can be + done either by specifying none or an empty list as + ValueSpec.

+

Option report_errors adds the possibility that an error tuple + is returned. The tuple either indicates a matching error + (match_limit or match_limit_recursion), or a compilation + error, where the error tuple has the format {error, {compile, + CompileErr}}. Notice that if option + report_errors is not specified, the function never returns + error tuples, but reports compilation errors as a badarg + exception and failed matches because of exceeded match limits simply + as nomatch.

+

The following options are relevant for execution:

+ + anchored + +

Limits run/3 to matching at the first matching + position. If a pattern was compiled with anchored, or + turned out to be anchored by virtue of its contents, it cannot + be made unanchored at matching time, hence there is no + unanchored option.

 + global + +

Implements global (repetitive) search (flag g in Perl). + Each match is returned as a separate list() containing the + specific match and any matching subexpressions (or as specified + by option capture. The Captured part + of the return value is hence a list() of list()s + when this option is specified.

+

The interaction of option global with a regular + expression that matches an empty string surprises some users. + When option global is specified, run/3 handles + empty matches in the same way as Perl: a zero-length match at any + point is also retried with options [anchored, + notempty_atstart]. If that search gives a result of length + > 0, the result is included. Example:

+ +re:run("cat","(|at)",[global]). +

The following matchings are performed:

+ + At offset 0 + +

The regular expression (|at) first match at the + initial position of string cat, giving the result set + [{0,0},{0,0}] (the second {0,0} is because of + the subexpression marked by the parentheses). As the length + of the match is 0, we do not advance to the next position + yet.

+ + At offset 0 with [anchored, + notempty_atstart] + +

The search is retried with options [anchored, + notempty_atstart] at the same position, which does not + give any interesting result of longer length, so the search + position is advanced to the next character (a).

+ + At offset 1 + +

The search results in [{1,0},{1,0}], so this search is + also repeated with the extra options.

+ + At offset 1 with [anchored, + notempty_atstart] + +

Alternative ab is found and the result is + [{1,2},{1,2}]. The result is added to the list of results and + the position in the search string is advanced two steps.

+ + At offset 3 + +

The search once again matches the empty string, giving + [{3,0},{3,0}].

+ + At offset 1 with [anchored, + notempty_atstart] + +

This gives no result of length > 0 and we are at the last + position, so the global search is complete.

+ + +

The result of the call is:

+ +{match,[[{0,0},{0,0}],[{1,0},{1,0}],[{1,2},{1,2}],[{3,0},{3,0}]]} + + notempty + +

An empty string is not considered to be a valid match if this + option is specified. If alternatives in the pattern exist, they + are tried. If all the alternatives match the empty string, the + entire match fails.

+

Example:

+

If the following pattern is applied to a string not beginning + with "a" or "b", it would normally match the empty string at the + start of the subject:

+ +a?b? +

With option notempty, this match is invalid, so + run/3 searches further into the string for occurrences of + "a" or "b".

+ + notempty_atstart + +

Like notempty, except that an empty string match that is + not at the start of the subject is permitted. If the pattern is + anchored, such a match can occur only if the pattern contains + \K.

+

Perl has no direct equivalent of notempty or + notempty_atstart, but it does make a special case of a + pattern match of the empty string within its split() function, + and when using modifier /g. The Perl behavior can be + emulated after matching a null string by first trying the + match again at the same offset with notempty_atstart and + anchored, and then, if that fails, by advancing the + starting offset (see below) and trying an ordinary match + again.

+ + notbol + +

Specifies that the first character of the subject string is not + the beginning of a line, so the circumflex metacharacter is not + to match before it. Setting this without multiline (at + compile time) causes circumflex never to match. This option only + affects the behavior of the circumflex metacharacter. It does not + affect \A.

+ + noteol + +

Specifies that the end of the subject string is not the end of a + line, so the dollar metacharacter is not to match it nor (except + in multiline mode) a newline immediately before it. Setting this + without multiline (at compile time) causes dollar never to + match. This option affects only the behavior of the dollar + metacharacter. It does not affect \Z or \z.

+ + report_errors + +

Gives better control of the error handling in run/3. When + specified, compilation errors (if the regular expression is not + already compiled) and runtime errors are explicitly returned as + an error tuple.

+

The following are the possible runtime errors:

+ + match_limit + +

The PCRE library sets a limit on how many times the internal + match function can be called. Defaults to 10,000,000 in the + library compiled for Erlang. If {error, match_limit} + is returned, the execution of the regular expression has + reached this limit. This is normally to be regarded as a + nomatch, which is the default return value when this + occurs, but by specifying report_errors, you are + informed when the match fails because of too many internal + calls.

+ + match_limit_recursion + +

This error is very similar to match_limit, but occurs + when the internal match function of PCRE is "recursively" + called more times than the match_limit_recursion limit, + which defaults to 10,000,000 as well. Notice that as long as + the match_limit + and match_limit_default values are + kept at the default values, the match_limit_recursion + error cannot occur, as the match_limit error occurs + before that (each recursive call is also a call, but not + conversely). Both limits can however be changed, either by + setting limits directly in the regular expression string (see + section PCRE Regular + Eexpression Details) or by specifying options to + run/3.

+ + +

It is important to understand that what is referred to as + "recursion" when limiting matches is not recursion on the C stack + of the Erlang machine or on the Erlang process stack. The PCRE + version compiled into the Erlang VM uses machine "heap" memory to + store values that must be kept over recursion in regular + expression matches.

+ + {match_limit, integer() >= 0} + +

Limits the execution time of a match in an + implementation-specific way. It is described as follows by the + PCRE documentation:

+ The match_limit field provides a means of preventing PCRE from using up a vast amount of resources when running patterns that are not going to match, but which have a very large number of possibilities in their @@ -448,26 +647,22 @@ imposed on the number of times this function is called during a match, which has the effect of limiting the amount of backtracking that can take place. For patterns that are not anchored, the count restarts from zero for each position in the subject string. - -

This means that runaway regular expression matches can fail - faster if the limit is lowered using this option. The default - value compiled into the Erlang virtual machine is 10000000

- -

This option does in no way affect the execution of the - Erlang virtual machine in terms of "long running - BIF's". re:run always give control back to the scheduler - of Erlang processes at intervals that ensures the real time - properties of the Erlang system.

 - - - {match_limit_recursion, integer() >= 0} - -

This option limits the execution time and memory - consumption of a match in an implementation-specific way, very - similar to match_limit. It is described in the following - way by the PCRE documentation:

- - +

This means that runaway regular expression matches can fail + faster if the limit is lowered using this option. The default + value 10,000,000 is compiled into the Erlang VM.

+ +

This option does in no way affect the execution of the Erlang + VM in terms of "long running BIFs". run/3 always gives + control back to the scheduler of Erlang processes at intervals + that ensures the real-time properties of the Erlang system.

+ + + {match_limit_recursion, integer() >= 0} + +

Limits the execution time and memory consumption of a match in an + implementation-specific way, very similar to match_limit. + It is described as follows by the PCRE documentation:

+ The match_limit_recursion field is similar to match_limit, but instead of limiting the total number of times that match() is called, it limits the depth of recursion. The recursion depth is a smaller number @@ -477,3273 +672,3535 @@ match_limit. Limiting the recursion depth limits the amount of machine stack that can be used, or, when PCRE has been compiled to use memory on the heap -instead of the stack, the amount of heap memory that can be -used. - -

The Erlang virtual machine uses a PCRE library where heap - memory is used when regular expression match recursion happens, - why this limits the usage of machine heap, not C stack.

- -

Specifying a lower value may result in matches with deep recursion failing, when they should actually have matched:

- +instead of the stack, the amount of heap memory that can be used. +

The Erlang VM uses a PCRE library where heap memory is used when + regular expression match recursion occurs. This therefore limits + the use of machine heap, not C stack.

+

Specifying a lower value can result in matches with deep + recursion failing, when they should have matched:

+ 1> re:run("aaaaaaaaaaaaaz","(a+)*z"). {match,[{0,14},{0,13}]} 2> re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5}]). nomatch 3> re:run("aaaaaaaaaaaaaz","(a+)*z",[{match_limit_recursion,5},report_errors]). {error,match_limit_recursion} - -

This option, as well as the match_limit option should - only be used in very rare cases. Understanding of the PCRE - library internals is recommended before tampering with these - limits.

- - - {offset, integer() >= 0} - - Start matching at the offset (position) given in the - subject string. The offset is zero-based, so that the default is - {offset,0} (all of the subject string). - - {newline, NLSpec} - -

Override the default definition of a newline in the subject string, which is LF (ASCII 10) in Erlang.

- - cr - Newline is indicated by a single character CR (ASCII 13) - lf - Newline is indicated by a single character LF (ASCII 10), the default - crlf - Newline is indicated by the two-character CRLF (ASCII 13 followed by ASCII 10) sequence. - anycrlf - Any of the three preceding sequences should be recognized. - any - Any of the newline sequences above, plus the Unicode sequences VT (vertical tab, U+000B), FF (formfeed, U+000C), NEL (next line, U+0085), LS (line separator, U+2028), and PS (paragraph separator, U+2029). - - - bsr_anycrlf - Specifies specifically that \R is to match only the cr, lf or crlf sequences, not the Unicode specific newline characters. (overrides compilation option) - bsr_unicode - Specifies specifically that \R is to match all the Unicode newline characters (including crlf etc, the default).(overrides compilation option) - - {capture, ValueSpec}/{capture, ValueSpec, Type} - - -

Specifies which captured substrings are returned and in what - format. By default, - re:run/3 captures all of the matching part of the - substring as well as all capturing subpatterns (all of the - pattern is automatically captured). The default return type is - (zero-based) indexes of the captured parts of the string, given as - {Offset,Length} pairs (the index Type of - capturing).

- -

As an example of the default behavior, the following call:

- - re:run("ABCabcdABC","abcd",[]). - -

returns, as first and only captured string the matching part of the subject ("abcd" in the middle) as a index pair {3,4}, where character positions are zero based, just as in offsets. The return value of the call above would then be:

- {match,[{3,4}]} -

Another (and quite common) case is where the regular expression matches all of the subject, as in:

- re:run("ABCabcdABC",".*abcd.*",[]). -

where the return value correspondingly will point out all of the string, beginning at index 0 and being 10 characters long:

- {match,[{0,10}]} - -

If the regular expression contains capturing subpatterns, - like in the following case:

- - re:run("ABCabcdABC",".*(abcd).*",[]). - -

all of the matched subject is captured, as - well as the captured substrings:

- - {match,[{0,10},{3,4}]} - -

the complete matching pattern always giving the first return value in the - list and the rest of the subpatterns being added in the - order they occurred in the regular expression.

- -

The capture tuple is built up as follows:

- - ValueSpec -

Specifies which captured (sub)patterns are to be returned. The ValueSpec can either be an atom describing a predefined set of return values, or a list containing either the indexes or the names of specific subpatterns to return.

-

The predefined sets of subpatterns are:

- - all - All captured subpatterns including the complete matching string. This is the default. - all_names - All named subpatterns in the regular expression, as if a list() - of all the names in alphabetical order was given. The list of all names can also be retrieved with the inspect/2 function. - first - Only the first captured subpattern, which is always the complete matching part of the subject. All explicitly captured subpatterns are discarded. - all_but_first - All but the first matching subpattern, i.e. all explicitly captured subpatterns, but not the complete matching part of the subject string. This is useful if the regular expression as a whole matches a large part of the subject, but the part you're interested in is in an explicitly captured subpattern. If the return type is list or binary, not returning subpatterns you're not interested in is a good way to optimize. - none - Do not return matching subpatterns at all, yielding the single atom match as the return value of the function when matching successfully instead of the {match, list()} return. Specifying an empty list gives the same behavior. - -

The value list is a list of indexes for the subpatterns to return, where index 0 is for all of the pattern, and 1 is for the first explicit capturing subpattern in the regular expression, and so forth. When using named captured subpatterns (see below) in the regular expression, one can use atom()s or string()s to specify the subpatterns to be returned. For example, consider the regular expression:

- ".*(abcd).*" -

matched against the string "ABCabcdABC", capturing only the "abcd" part (the first explicit subpattern):

- re:run("ABCabcdABC",".*(abcd).*",[{capture,[1]}]). -

The call will yield the following result:

- {match,[{3,4}]} -

as the first explicitly captured subpattern is "(abcd)", matching "abcd" in the subject, at (zero-based) position 3, of length 4.

-

Now consider the same regular expression, but with the subpattern explicitly named 'FOO':

- ".*(?<FOO>abcd).*" -

With this expression, we could still give the index of the subpattern with the following call:

- re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,[1]}]). -

giving the same result as before. But, since the subpattern is named, we can also specify its name in the value list:

- re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,['FOO']}]). -

which would yield the same result as the earlier examples, namely:

- {match,[{3,4}]} - -

The values list might specify indexes or names not present in - the regular expression, in which case the return values vary - depending on the type. If the type is index, the tuple - {-1,0} is returned for values having no corresponding - subpattern in the regexp, but for the other types - (binary and list), the values are the empty binary - or list respectively.

- - - Type -

Optionally specifies how captured substrings are to be returned. If omitted, the default of index is used. The Type can be one of the following:

- - index - Return captured substrings as pairs of byte indexes into the subject string and length of the matching string in the subject (as if the subject string was flattened with iolist_to_binary/1 or unicode:characters_to_binary/2 prior to matching). Note that the unicode option results in byte-oriented indexes in a (possibly virtual) UTF-8 encoded binary. A byte index tuple {0,2} might therefore represent one or two characters when unicode is in effect. This might seem counter-intuitive, but has been deemed the most effective and useful way to way to do it. To return lists instead might result in simpler code if that is desired. This return type is the default. - list - Return matching substrings as lists of characters (Erlang string()s). It the unicode option is used in combination with the \C sequence in the regular expression, a captured subpattern can contain bytes that are not valid UTF-8 (\C matches bytes regardless of character encoding). In that case the list capturing may result in the same types of tuples that unicode:characters_to_list/2 can return, namely three-tuples with the tag incomplete or error, the successfully converted characters and the invalid UTF-8 tail of the conversion as a binary. The best strategy is to avoid using the \C sequence when capturing lists. - binary - Return matching substrings as binaries. If the unicode option is used, these binaries are in UTF-8. If the \C sequence is used together with unicode the binaries may be invalid UTF-8. +

This option and option match_limit are only to be used in + rare cases. Understanding of the PCRE library internals is + recommended before tampering with these limits.

+ + {offset, integer() >= 0} + +

Start matching at the offset (position) specified in the + subject string. The offset is zero-based, so that the default is + {offset,0} (all of the subject string).

+ + {newline, NLSpec} + +

Overrides the default definition of a newline in the subject + string, which is LF (ASCII 10) in Erlang.

+ + cr + +

Newline is indicated by a single character CR (ASCII 13).

+ + lf + +

Newline is indicated by a single character LF (ASCII 10), + the default.

+ + crlf + +

Newline is indicated by the two-character CRLF (ASCII 13 + followed by ASCII 10) sequence.

+ + anycrlf + +

Any of the three preceding sequences is be recognized.

+ + any + +

Any of the newline sequences above, and the Unicode + sequences VT (vertical tab, U+000B), FF (formfeed, U+000C), NEL + (next line, U+0085), LS (line separator, U+2028), and PS + (paragraph separator, U+2029).

+ + + + bsr_anycrlf + +

Specifies specifically that \R is to match only the CR + LF, or CRLF sequences, not the Unicode-specific newline + characters. (Overrides the compilation option.)

+ + bsr_unicode + +

Specifies specifically that \R is to match all the Unicode + newline characters (including CRLF, and so on, the default). + (Overrides the compilation option.)

+ + {capture, ValueSpec}/{capture, + ValueSpec, Type} + +

Specifies which captured substrings are returned and in what + format. By default, run/3 captures all of the matching + part of the substring and all capturing subpatterns (all of the + pattern is automatically captured). The default return type is + (zero-based) indexes of the captured parts of the string, + specified as {Offset,Length} pairs (the index + Type of capturing).

+

As an example of the default behavior, the following call + returns, as first and only captured string, the matching part of + the subject ("abcd" in the middle) as an index pair {3,4}, + where character positions are zero-based, just as in offsets:

+ +re:run("ABCabcdABC","abcd",[]). +

The return value of this call is:

+ +{match,[{3,4}]} +

Another (and quite common) case is where the regular expression + matches all of the subject:

+ +re:run("ABCabcdABC",".*abcd.*",[]). +

Here the return value correspondingly points out all of the + string, beginning at index 0, and it is 10 characters long:

+ +{match,[{0,10}]} +

If the regular expression contains capturing subpatterns, like + in:

+ +re:run("ABCabcdABC",".*(abcd).*",[]). +

all of the matched subject is captured, as well as the captured + substrings:

+ +{match,[{0,10},{3,4}]} +

The complete matching pattern always gives the first return + value in the list and the remaining subpatterns are added in the + order they occurred in the regular expression.

+

The capture tuple is built up as follows:

+ + ValueSpec + +

Specifies which captured (sub)patterns are to be returned. + ValueSpec can either be an atom describing + a predefined set of return values, or a list containing the + indexes or the names of specific subpatterns to return.

+

The following are the predefined sets of subpatterns:

+ + all + +

All captured subpatterns including the complete matching + string. This is the default.

+ + all_names + +

All named subpatterns in the regular expression, + as if a list() of all the names in + alphabetical order was specified. The list of all + names can also be retrieved with + + inspect/2.

+ + first + +

Only the first captured subpattern, which is always the + complete matching part of the subject. All explicitly + captured subpatterns are discarded.

+ + all_but_first + +

All but the first matching subpattern, that is, all + explicitly captured subpatterns, but not the complete + matching part of the subject string. This is useful if + the regular expression as a whole matches a large part of + the subject, but the part you are interested in is in an + explicitly captured subpattern. If the return type is + list or binary, not returning subpatterns + you are not interested in is a good way to optimize.

+ + none + +

Returns no matching subpatterns, gives the single + atom match as the return value of the function + when matching successfully instead of the {match, + list()} return. Specifying an empty list gives the + same behavior.

+ + +

The value list is a list of indexes for the subpatterns to + return, where index 0 is for all of the pattern, and 1 is for + the first explicit capturing subpattern in the regular + expression, and so on. When using named captured subpatterns + (see below) in the regular expression, one can use + atom()s or string()s to specify the subpatterns + to be returned. For example, consider the regular + expression:

+ +".*(abcd).*" +

matched against string "ABCabcdABC", capturing only the + "abcd" part (the first explicit subpattern):

+ +re:run("ABCabcdABC",".*(abcd).*",[{capture,[1]}]). +

The call gives the following result, as the first explicitly + captured subpattern is "(abcd)", matching "abcd" in the + subject, at (zero-based) position 3, of length 4:

+ +{match,[{3,4}]} +

Consider the same regular expression, but with the subpattern + explicitly named 'FOO':

+ +".*(?<FOO>abcd).*" +

With this expression, we could still give the index of the + subpattern with the following call:

+ +re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,[1]}]). +

giving the same result as before. But, as the subpattern is + named, we can also specify its name in the value list:

+ +re:run("ABCabcdABC",".*(?<FOO>abcd).*",[{capture,['FOO']}]). +

This would give the same result as the earlier examples, + namely:

+ +{match,[{3,4}]} +

The values list can specify indexes or names not present in + the regular expression, in which case the return values vary + depending on the type. If the type is index, the tuple + {-1,0} is returned for values with no corresponding + subpattern in the regular expression, but for the other types + (binary and list), the values are the empty + binary or list, respectively.

+ + Type + +

Optionally specifies how captured substrings are to be + returned. If omitted, the default of index is used.

+

Type can be one of the following:

+ + index + +

Returns captured substrings as pairs of byte indexes + into the subject string and length of the matching string + in the subject (as if the subject string was flattened + with + erlang:iolist_to_binary/1 or + + unicode:characters_to_binary/2 before + matching). Notice that option unicode results in + byte-oriented indexes in a (possibly virtual) + UTF-8 encoded binary. A byte index tuple + {0,2} can therefore represent one or two + characters when unicode is in effect. This can seem + counter-intuitive, but has been deemed the most effective + and useful way to do it. To return lists instead can + result in simpler code if that is desired. This return + type is the default.

+ + list + +

Returns matching substrings as lists of characters + (Erlang string()s). It option unicode is + used in combination with the \C sequence in the + regular expression, a captured subpattern can contain + bytes that are not valid UTF-8 (\C matches bytes + regardless of character encoding). In that case the + list capturing can result in the same types of + tuples that + + unicode:characters_to_list/2 can return, + namely three-tuples with tag incomplete or + error, the successfully converted characters and + the invalid UTF-8 tail of the conversion as a binary. The + best strategy is to avoid using the \C sequence + when capturing lists.

+ + binary + +

Returns matching substrings as binaries. If option + unicode is used, these binaries are in UTF-8. If + the \C sequence is used together with + unicode, the binaries can be invalid UTF-8.

+ + + + +

In general, subpatterns that were not assigned a value in the + match are returned as the tuple {-1,0} when type is + index. Unassigned subpatterns are returned as the empty + binary or list, respectively, for other return types. Consider + the following regular expression:

+ +".*((?<FOO>abdd)|a(..d)).*" +

There are three explicitly capturing subpatterns, where the + opening parenthesis position determines the order in the result, + hence ((?<FOO>abdd)|a(..d)) is subpattern index 1, + (?<FOO>abdd) is subpattern index 2, and (..d) + is subpattern index 3. When matched against the following + string:

+ +"ABCabcdABC" +

the subpattern at index 2 does not match, as "abdd" is not + present in the string, but the complete pattern matches (because + of the alternative a(..d)). The subpattern at index 2 is + therefore unassigned and the default return value is:

+ +{match,[{0,10},{3,4},{-1,0},{4,3}]} +

Setting the capture Type to binary + gives:

+ +{match,[<<"ABCabcdABC">>,<<"abcd">>,<<>>,<<"bcd">>]} +

Here the empty binary (<<>>) represents the + unassigned subpattern. In the binary case, some information + about the matching is therefore lost, as + <<>> can + also be an empty string captured.

+

If differentiation between empty matches and non-existing + subpatterns is necessary, use the type index and do + the conversion to the final type in Erlang code.

+

When option global is speciified, the capture + specification affects each match separately, so that:

+ +re:run("cacb","c(a|b)",[global,{capture,[1],list}]). +

gives

+ +{match,[["a"],["b"]]} + - - -

In general, subpatterns that were not assigned a value in the match are returned as the tuple {-1,0} when type is index. Unassigned subpatterns are returned as the empty binary or list, respectively, for other return types. Consider the regular expression:

- ".*((?<FOO>abdd)|a(..d)).*" -

There are three explicitly capturing subpatterns, where the opening parenthesis position determines the order in the result, hence ((?<FOO>abdd)|a(..d)) is subpattern index 1, (?<FOO>abdd) is subpattern index 2 and (..d) is subpattern index 3. When matched against the following string:

- "ABCabcdABC" -

the subpattern at index 2 won't match, as "abdd" is not present in the string, but the complete pattern matches (due to the alternative a(..d). The subpattern at index 2 is therefore unassigned and the default return value will be:

- {match,[{0,10},{3,4},{-1,0},{4,3}]} -

Setting the capture Type to binary would give the following:

- {match,[<<"ABCabcdABC">>,<<"abcd">>,<<>>,<<"bcd">>]} -

where the empty binary (<<>>) represents the unassigned subpattern. In the binary case, some information about the matching is therefore lost, the <<>> might just as well be an empty string captured.

-

If differentiation between empty matches and non existing subpatterns is necessary, use the type index - and do the conversion to the final type in Erlang code.

- -

When the option global is given, the capture - specification affects each match separately, so that:

- - re:run("cacb","c(a|b)",[global,{capture,[1],list}]). - -

gives the result:

- - {match,[["a"],["b"]]} - - - -

The options solely affecting the compilation step are described in the re:compile/2 function.

- - - - - Match a subject against regular expression and replace matching elements with Replacement - -

The same as replace(Subject,RE,Replacement,[]).

- - - - - Match a subject against regular expression and replace matching elements with Replacement - -

Replaces the matched part of the Subject string with the contents of Replacement.

-

The permissible options are the same as for re:run/3, except that the capture option is not allowed. - Instead a {return, ReturnType} is present. The default return type is iodata, constructed in a - way to minimize copying. The iodata result can be used directly in many I/O-operations. If a flat list() is - desired, specify {return, list} and if a binary is preferred, specify {return, binary}.

- -

As in the re:run/3 function, an mp() compiled - with the unicode option requires the Subject to be - a Unicode charlist(). If compilation is done implicitly - and the unicode compilation option is given to this - function, both the regular expression and the Subject - should be given as valid Unicode charlist()s.

- -

The replacement string can contain the special character - &, which inserts the whole matching expression in the - result, and the special sequence \N (where N is an integer > 0), - \gN or \g{N} resulting in the subexpression number N will be - inserted in the result. If no subexpression with that number is - generated by the regular expression, nothing is inserted.

-

To insert an & or \ in the result, precede it - with a \. Note that Erlang already gives a special - meaning to \ in literal strings, so a single \ - has to be written as "\\" and therefore a double \ - as "\\\\". Example:

- re:replace("abcd","c","[&]",[{return,list}]). -

gives

- "ab[c]d" -

while

- re:replace("abcd","c","[\\&]",[{return,list}]). -

gives

- "ab[&]d" -

As with re:run/3, compilation errors raise the badarg - exception, re:compile/2 can be used to get more information - about the error.

+

For a descriptions of options only affecting the compilation step, + see compile/2.

 + - Split a string by tokens specified as a regular expression + Split a string by tokens specified as a regular expression. + -

The same as split(Subject,RE,[]).

+

Same as split(Subject, RE, []).

 Split a string by tokens specified as a regular expression - See compile/2 above. + See + compile/2. -

This function splits the input into parts by finding tokens - according to the regular expression supplied.

- -

The splitting is done basically by running a global regexp match and - dividing the initial string wherever a match occurs. The matching part - of the string is removed from the output.

- -

As in the re:run/3 function, an mp() compiled - with the unicode option requires the Subject to be - a Unicode charlist(). If compilation is done implicitly - and the unicode compilation option is given to this - function, both the regular expression and the Subject - should be given as valid Unicode charlist()s.

- -

The result is given as a list of "strings", the - preferred datatype given in the return option (default iodata).

-

If subexpressions are given in the regular expression, the - matching subexpressions are returned in the resulting list as - well. An example:

- - re:split("Erlang","[ln]",[{return,list}]). - -

will yield the result:

- - ["Er","a","g"] - -

while

- - re:split("Erlang","([ln])",[{return,list}]). - -

will yield

- - ["Er","l","a","n","g"] - -

The text matching the subexpression (marked by the parentheses - in the regexp) is - inserted in the result list where it was found. In effect this means - that concatenating the result of a split where the whole regexp is a - single subexpression (as in the example above) will always result in - the original string.

- -

As there is no matching subexpression for the last part in - the example (the "g"), there is nothing inserted after - that. To make the group of strings and the parts matching the - subexpressions more obvious, one might use the group - option, which groups together the part of the subject string with the - parts matching the subexpressions when the string was split:

- - re:split("Erlang","([ln])",[{return,list},group]). - -

gives:

- - [["Er","l"],["a","n"],["g"]] - -

Here the regular expression matched first the "l", - causing "Er" to be the first part in the result. When - the regular expression matched, the (only) subexpression was - bound to the "l", so the "l" is inserted - in the group together with "Er". The next match is of - the "n", making "a" the next part to be - returned. Since the subexpression is bound to the substring - "n" in this case, the "n" is inserted into - this group. The last group consists of the rest of the string, - as no more matches are found.

- - -

By default, all parts of the string, including the empty - strings, are returned from the function. For example:

- - re:split("Erlang","[lg]",[{return,list}]). - -

will return:

- - ["Er","an",[]] - -

since the matching of the "g" in the end of the string - leaves an empty rest which is also returned. This behaviour - differs from the default behaviour of the split function in - Perl, where empty strings at the end are by default removed. To - get the - "trimming" default behavior of Perl, specify - trim as an option:

- - re:split("Erlang","[lg]",[{return,list},trim]). - -

The result will be:

- - ["Er","an"] - -

The "trim" option in effect says; "give me as - many parts as possible except the empty ones", which might - be useful in some circumstances. You can also specify how many - parts you want, by specifying {parts,N}:

- - re:split("Erlang","[lg]",[{return,list},{parts,2}]). - -

This will give:

- - ["Er","ang"] - -

Note that the last part is "ang", not - "an", as we only specified splitting into two parts, - and the splitting stops when enough parts are given, which is - why the result differs from that of trim.

- -

More than three parts are not possible with this indata, so

- - re:split("Erlang","[lg]",[{return,list},{parts,4}]). - -

will give the same result as the default, which is to be - viewed as "an infinite number of parts".

- -

Specifying 0 as the number of parts gives the same - effect as the option trim. If subexpressions are - captured, empty subexpression matches at the end are also - stripped from the result if trim or {parts,0} is - specified.

+

Splits the input into parts by finding tokens according to the + regular expression supplied. The splitting is basically done by + running a global regular expression match and dividing the initial + string wherever a match occurs. The matching part of the string is + removed from the output.

+

As in run/3, an mp() + compiled with option unicode requires + Subject to be a Unicode charlist(). If + compilation is done implicitly and the unicode compilation + option is specified to this function, both the regular expression and + Subject are to be specified as valid Unicode + charlist()s.

+

The result is given as a list of "strings", the preferred + data type specified in option return (default + iodata).

+

If subexpressions are specified in the regular expression, the + matching subexpressions are returned in the resulting list as + well. For example:

+ +re:split("Erlang","[ln]",[{return,list}]). +

gives

+ +["Er","a","g"] +

while

+ +re:split("Erlang","([ln])",[{return,list}]). +

gives

+ +["Er","l","a","n","g"] +

The text matching the subexpression (marked by the parentheses in the + regular expression) is inserted in the result list where it was found. + This means that concatenating the result of a split where the whole + regular expression is a single subexpression (as in the last example) + always results in the original string.

+

As there is no matching subexpression for the last part in the + example (the "g"), nothing is inserted after that. To make + the group of strings and the parts matching the subexpressions more + obvious, one can use option group, which groups together the + part of the subject string with the parts matching the subexpressions + when the string was split:

+ +re:split("Erlang","([ln])",[{return,list},group]). +

gives

+ +[["Er","l"],["a","n"],["g"]] +

Here the regular expression first matched the "l", + causing "Er" to be the first part in the result. When + the regular expression matched, the (only) subexpression was + bound to the "l", so the "l" is inserted + in the group together with "Er". The next match is of + the "n", making "a" the next part to be + returned. As the subexpression is bound to substring + "n" in this case, the "n" is inserted into + this group. The last group consists of the remaining string, + as no more matches are found.

+

By default, all parts of the string, including the empty strings, + are returned from the function, for example:

+ +re:split("Erlang","[lg]",[{return,list}]). +

gives

+ +["Er","an",[]] +

as the matching of the "g" in the end of the string + leaves an empty rest, which is also returned. This behavior + differs from the default behavior of the split function in + Perl, where empty strings at the end are by default removed. To + get the "trimming" default behavior of Perl, specify + trim as an option:

+ +re:split("Erlang","[lg]",[{return,list},trim]). +

gives

+ +["Er","an"] +

The "trim" option says; "give me as many parts as + possible except the empty ones", which sometimes can be + useful. You can also specify how many parts you want, by specifying + {parts,N}:

+ +re:split("Erlang","[lg]",[{return,list},{parts,2}]). +

gives

+ +["Er","ang"] +

Notice that the last part is "ang", not + "an", as splitting was specified into two parts, + and the splitting stops when enough parts are given, which is + why the result differs from that of trim.

+

More than three parts are not possible with this indata, so

+ +re:split("Erlang","[lg]",[{return,list},{parts,4}]). +

gives the same result as the default, which is to be + viewed as "an infinite number of parts".

+

Specifying 0 as the number of parts gives the same + effect as option trim. If subexpressions are + captured, empty subexpressions matched at the end are also + stripped from the result if trim or {parts,0} is + specified.

+

The trim behavior corresponds exactly to the Perl default. + {parts,N}, where N is a positive integer, corresponds + exactly to the Perl behavior with a positive numerical third + parameter. The default behavior of split/3 corresponds + to the Perl behavior when a negative integer is specified as + the third parameter for the Perl routine.

+

Summary of options not previously described for function + run/3:

+ + {return,ReturnType} + +

Specifies how the parts of the original string are presented in + the result list. Valid types:

+ + iodata + +

The variant of iodata() that gives the least copying + of data with the current implementation (often a binary, but + do not depend on it).

 + binary + +

All parts returned as binaries.

 + list + +

All parts returned as lists of characters + ("strings").

+ + + + group + +

Groups together the part of the string with + the parts of the string matching the subexpressions of the + regular expression.

+

The return value from the function is in this case a + list() of list()s. Each sublist begins with the + string picked out of the subject string, followed by the parts + matching each of the subexpressions in order of occurrence in the + regular expression.

+ + {parts,N} + +

Specifies the number of parts the subject string is to be + split into.

+

The number of parts is to be a positive integer for a specific + maximum number of parts, and infinity for the + maximum number of parts possible (the default). Specifying + {parts,0} gives as many parts as possible disregarding + empty parts at the end, the same as specifying trim.

+ + trim + +

Specifies that empty parts at the end of the result list are + to be disregarded. The same as specifying {parts,0}. This + corresponds to the default behavior of the split + built-in function in Perl.

+ + + + + -

If you are familiar with Perl, the trim - behaviour corresponds exactly to the Perl default, the - {parts,N} where N is a positive integer corresponds - exactly to the Perl behaviour with a positive numerical third - parameter and the default behaviour of re:split/3 corresponds - to that when the Perl routine is given a negative integer as the - third parameter.

+
+ + Perl-Like Regular Expression Syntax +

The following sections contain reference material for the regular + expressions used by this module. The information is based on the PCRE + documentation, with changes where this module behaves differently to + the PCRE library.

+
-

Summary of options not previously described for the re:run/3 function:

- - {return,ReturnType} -

Specifies how the parts of the original string are presented in the result list. The possible types are:

- - iodata - The variant of iodata() that gives the least copying of data with the current implementation (often a binary, but don't depend on it). - binary - All parts returned as binaries. - list - All parts returned as lists of characters ("strings"). - +
+ + PCRE Regular Expression Details +

The syntax and semantics of the regular expressions supported by PCRE are + described in detail in the following sections. Perl's regular expressions + are described in its own documentation, and regular expressions in general + are covered in many books, some with copious examples. + Jeffrey Friedl's "Mastering Regular Expressions", published by O'Reilly, + covers regular expressions in great detail. This description of the PCRE + regular expressions is intended as reference material.

+ +

The reference material is divided into the following sections:

+ + + Special Start-of-Pattern Items - group - - -

Groups together the part of the string with - the parts of the string matching the subexpressions of the - regexp.

-

The return value from the function will in this case be a - list() of list()s. Each sublist begins with the - string picked out of the subject string, followed by the parts - matching each of the subexpressions in order of occurrence in the - regular expression.

- + Characters and Metacharacters - {parts,N} - - -

Specifies the number of parts the subject string is to be - split into.

- -

The number of parts should be a positive integer for a specific maximum on the - number of parts and infinity for the maximum number of - parts possible (the default). Specifying {parts,0} gives as many parts as - possible disregarding empty parts at the end, the same as - specifying trim

+ Backslash + Circumflex and Dollar + Full Stop (Period, Dot) and \N - trim - - -

Specifies that empty parts at the end of the result list are - to be disregarded. The same as specifying {parts,0}. This - corresponds to the default behaviour of the split - built in function in Perl.

+ Matching a Single Data Unit + + Square Brackets and Character + Classes + Posix Character Classes + Vertical Bar + Internal Option Setting + Subpatterns + Duplicate Subpattern Numbers + + Named Subpatterns + Repetition + Atomic Grouping and Possessive + Quantifiers + Back References + Assertions + Conditional Subpatterns + Comments + Recursive Patterns + Subpatterns as Subroutines - + Oniguruma Subroutine Syntax + + Backtracking Control + +
- - - -
- PERL LIKE REGULAR EXPRESSIONS SYNTAX -

- The following sections contain reference material for the - regular expressions used by this module. The regular expression - reference is based on the PCRE documentation, with changes in - cases where the re module behaves differently to the PCRE library.

+ + Special Start-of-Pattern Items +

Some options that can be passed to + compile/2 can also be set by special items at the start + of a pattern. These are not Perl-compatible, but are provided to make + these options accessible to pattern writers who are not able to change + the program that processes the pattern. Any number of these items can + appear, but they must all be together right at the start of the + pattern string, and the letters must be in upper case.

+ +

UTF Support

+ +

Unicode support is basically UTF-8 based. To use Unicode characters, you + either call compile/2 or + run/3 with option + unicode, or the pattern must start with one of these special + sequences:

+ + +(*UTF8) +(*UTF) + +

Both options give the same effect, the input string is interpreted as + UTF-8. Notice that with these instructions, the automatic conversion of + lists to UTF-8 is not performed by the re functions. Therefore, + using these sequences is not recommended. + Add option unicode when running + compile/2 instead.

+ +

Some applications that allow their users to supply patterns can wish to + restrict them to non-UTF data for security reasons. If option + never_utf is set at compile time, (*UTF), and so on, are not + allowed, and their appearance causes an error.

+ +

Unicode Property Support

+ +

The following is another special sequence that can appear at the start of + a pattern:

+ + +(*UCP) + +

This has the same effect as setting option ucp: it causes + sequences such as \d and \w to use Unicode properties to + determine character types, instead of recognizing only characters with + codes < 256 through a lookup table.

+ +

Disabling Startup Optimizations

+ +

If a pattern starts with (*NO_START_OPT), + it has the same effect as + setting option no_start_optimize at compile time.

+ +

Newline Conventions

+ + +

PCRE supports five conventions for indicating line breaks in strings: a + single CR (carriage return) character, a single LF (line feed) character, + the two-character sequence CRLF, any of the three preceding, and any + Unicode newline sequence.

+ +

A newline convention can also be specified by starting a pattern string + with one of the following five sequences:

+ + + (*CR)Carriage return + (*LF)Line feed + (*CRLF)>Carriage return followed by + line feed + (*ANYCRLF)Any of the three above + (*ANY)All Unicode newline sequences + + +

These override the default and the options specified to + compile/2. For example, the + following pattern changes the convention to CR:

+ + +(*CR)a.b + +

This pattern matches a\nb, as LF is no longer a newline. + If more than one of them is present, the last one is used.

+ +

The newline convention affects where the circumflex and dollar assertions + are true. It also affects the interpretation of the dot metacharacter when + dotall is not set, and the behavior of \N. However, it does not + affect what the \R escape sequence matches. By default, this is any + Unicode newline sequence, for Perl compatibility. However, this can be + changed; see the description of \R in section + Newline Sequences. A change + of the \R setting can be combined with a change of the newline + convention.

+ +

Setting Match and Recursion Limits

+ +

The caller of run/3 can set a + limit on the number of times the internal match() function is called and + on the maximum depth of recursive calls. These facilities are provided to + catch runaway matches that are provoked by patterns with huge matching + trees (a typical example is a pattern with nested unlimited repeats) and + to avoid running out of system stack by too much recursion. When one of + these limits is reached, pcre_exec() gives an error return. The + limits can also be set by items at the start of the pattern of the + following forms:

+ + +(*LIMIT_MATCH=d) +(*LIMIT_RECURSION=d) + +

Here d is any number of decimal digits. However, the value of the setting + must be less than the value set by the caller of run/3 for it to + have any effect. That is, the pattern writer can lower the limit set by + the programmer, but not raise it. If there is more than one setting of one + of these limits, the lower value is used.

+ +

The default value for both the limits is 10,000,000 in the Erlang + VM. Notice that the recursion limit does not affect the stack depth of the + VM, as PCRE for Erlang is compiled in such a way that the match function + never does recursion on the C stack.

-
PCRE regular expression details - -

The syntax and semantics of the regular expressions that are supported by PCRE -are described in detail below. Perl's regular expressions are described in its own documentation, and -regular expressions in general are covered in a number of books, some of which -have copious examples. Jeffrey Friedl's "Mastering Regular Expressions", -published by O'Reilly, covers regular expressions in great detail. This -description of PCRE's regular expressions is intended as reference material.

-

The reference material is divided into the following sections:

- -Special start-of-pattern items -Characters and metacharacters -Backslash -Circumflex and dollar -Full stop (period, dot) and \N -Matching a single data unit -Square brackets and character classes -POSIX character classes -Vertical bar -Internal option setting -Subpatterns -Duplicate subpattern numbers -Named subpatterns -Repetition -Atomic grouping and possessive quantifiers -Back references -Assertions -Conditional subpatterns -Comments -Recursive patterns -Subpatterns as subroutines -Oniguruma subroutine syntax - -Backtracking control - - -
- - -
Special start-of-pattern items - -

A number of options that can be passed to re:compile/2 can also be set -by special items at the start of a pattern. These are not Perl-compatible, but -are provided to make these options accessible to pattern writers who are not -able to change the program that processes the pattern. Any number of these -items may appear, but they must all be together right at the start of the -pattern string, and the letters must be in upper case.

- -

UTF support

-

-Unicode support is basically UTF-8 based. To use Unicode characters, you either -call re:compile/2/re:run/3 with the unicode option, or the - pattern must start with one of these special sequences:

- -

(*UTF8)

-

(*UTF)

- - -

Both options give the same effect, the input string is interpreted -as UTF-8. Note that with these instructions, the automatic conversion -of lists to UTF-8 is not performed by the re functions, why -using these options is not recommended. Add the unicode option -when running re:compile/2 instead.

- -

-Some applications that allow their users to supply patterns may wish to -restrict them to non-UTF data for security reasons. If the never_utf -option is set at compile time, (*UTF) etc. are not allowed, and their -appearance causes an error. -

- -

Unicode property support

-

Another special sequence that may appear at the start of a pattern is

- -

(*UCP)

- -

This has the same effect as setting the ucp option: it causes sequences -such as \d and \w to use Unicode properties to determine character types, -instead of recognizing only characters with codes less than 256 via a lookup -table. -

- -

Disabling start-up optimizations

-

-If a pattern starts with (*NO_START_OPT), it has the same effect as setting the -no_Start_optimize option at compile time.

- -

Newline conventions

- -

PCRE supports -five -different conventions for indicating line breaks in -strings: a single CR (carriage return) character, a single LF (linefeed) -character, the two-character sequence CRLF -, any of the three preceding, or any -Unicode newline sequence.

- -

It is also possible to specify a newline convention by starting a pattern -string with one of the following five sequences:

- - - (*CR) carriage return - (*LF) linefeed - (*CRLF) carriage return, followed by linefeed - (*ANYCRLF) any of the three above - (*ANY) all Unicode newline sequences - - -

These override the default and the options given to re:compile/2. For -example, the pattern:

- - -

(*CR)a.b

- - -

changes the convention to CR. That pattern matches "a\nb" because LF is no -longer a newline. If more than one of them is present, the last one -is used.

- -

The newline convention affects where the circumflex and dollar assertions are -true. It also affects the interpretation of the dot metacharacter when -dotall is not set, and the behaviour of \N. However, it does not affect -what the \R escape sequence matches. By default, this is any Unicode newline -sequence, for Perl compatibility. However, this can be changed; see the -description of \R in the section entitled - -"Newline sequences" - -below. A change of \R setting can be combined with a change of newline -convention.

- -

Setting match and recursion limits

- -

The caller of re:run/3 can set a limit on the number of times the internal match() function is called and on the maximum depth of recursive calls. These facilities are provided to catch runaway matches that are provoked by patterns with huge matching trees (a typical example is a pattern with nested unlimited repeats) and to avoid running out of system stack by too much recursion. When one of these limits is reached, pcre_exec() gives an error return. The limits can also be set by items at the start of the pattern of the form

- -

(*LIMIT_MATCH=d)

-

(*LIMIT_RECURSION=d)

- -

where d is any number of decimal digits. However, the value of the setting must be less than the value set by the caller of re:run/3 for it to have any effect. In other words, the pattern writer can lower the limit set by the programmer, but not raise it. If there is more than one setting of one of these limits, the lower value is used.

- -

The current default value for both the limits are 10000000 in the Erlang -VM. Note that the recursion limit does not actually affect the stack -depth of the VM, as PCRE for Erlang is compiled in such a way that the -match function never does recursion on the "C-stack".

- -
- -
Characters and metacharacters - - -

A regular expression is a pattern that is matched against a subject -string from left to right. Most characters stand for themselves in a -pattern, and match the corresponding characters in the subject. As a -trivial example, the pattern

- - -

The quick brown fox

- - -

matches a portion of a subject string that is identical to -itself. When caseless matching is specified (the caseless -option), letters are matched independently of case.

- -

The power of regular expressions comes from the ability to include -alternatives and repetitions in the pattern. These are encoded in the -pattern by the use of metacharacters, which do not stand for -themselves but instead are interpreted in some special way.

- -

There are two different sets of metacharacters: those that are recognized -anywhere in the pattern except within square brackets, and those that are -recognized within square brackets. Outside square brackets, the metacharacters -are as follows:

- - - \ general escape character with several uses - ^ assert start of string (or line, in multiline mode) - $ assert end of string (or line, in multiline mode) - . match any character except newline (by default) - [ start character class definition - | start of alternative branch - ( start subpattern - ) end subpattern - ? extends the meaning of (, - also 0 or 1 quantifier, - also quantifier minimizer - * 0 or more quantifier - + 1 or more quantifier, - also "possessive quantifier" - { start min/max quantifier - - -

Part of a pattern that is in square brackets is called a "character class". In -a character class the only metacharacters are:

- - - \ general escape character - ^ negate the class, but only if the first character - - indicates character range - [ POSIX character class (only if followed by POSIX - syntax) - ] terminates the character class +
+ + Characters and Metacharacters + +

A regular expression is a pattern that is matched against a subject + string from left to right. Most characters stand for themselves in a + pattern and match the corresponding characters in the subject. As a + trivial example, the following pattern matches a portion of a subject + string that is identical to itself:

+ + +The quick brown fox + +

When caseless matching is specified (option caseless), letters + are matched independently of case.

+ +

The power of regular expressions comes from the ability to include + alternatives and repetitions in the pattern. These are encoded in the + pattern by the use of metacharacters, which do not stand for + themselves but instead are interpreted in some special way.

+ +

Two sets of metacharacters exist: those that are recognized anywhere in + the pattern except within square brackets, and those that are recognized + within square brackets. Outside square brackets, the metacharacters are + as follows:

+ + + \General escape character with many uses + ^Assert start of string (or line, in multiline mode) + + $Assert end of string (or line, in multiline mode) + .Match any character except newline (by default) + [Start character class definition + |Start of alternative branch + (Start subpattern + )End subpattern + ?Extends the meaning of (, also 0 or 1 quantifier, also + quantifier minimizer + *0 or more quantifiers + +1 or more quantifier, also "possessive quantifier" + + {Start min/max quantifier -

The following sections describe the use of each of the metacharacters.

- - -
- -
Backslash +

Part of a pattern within square brackets is called a "character class". + The following are the only metacharacters in a character class:

+ + \General escape character + ^Negate the class, but only if the first character + -Indicates character range + [Posix character class (only if followed by Posix syntax) + + ]Terminates the character class + -

The backslash character has several uses. Firstly, if it is followed by a -character that is not a number or a letter, it takes away any special meaning that character -may have. This use of backslash as an escape character applies both inside and -outside character classes.

- -

For example, if you want to match a * character, you write \* in the pattern. -This escaping action applies whether or not the following character would -otherwise be interpreted as a metacharacter, so it is always safe to precede a -non-alphanumeric with backslash to specify that it stands for itself. In -particular, if you want to match a backslash, you write \\.

- -

In unicode mode, only ASCII numbers and letters have any special meaning after a -backslash. All other characters (in particular, those whose codepoints are -greater than 127) are treated as literals.

+

The following sections describe the use of each metacharacter.

+
-

If a pattern is compiled with the extended option, white space in the -pattern (other than in a character class) and characters between a # outside -a character class and the next newline are ignored. An escaping backslash can -be used to include a white space or # character as part of the pattern.

+
+ + Backslash +

The backslash character has many uses. First, if it is followed by a + character that is not a number or a letter, it takes away any special + meaning that a character can have. This use of backslash as an escape + character applies both inside and outside character classes.

+ +

For example, if you want to match a * character, you write \* in the + pattern. This escaping action applies if the following character would + otherwise be interpreted as a metacharacter, so it is always safe to + precede a non-alphanumeric with backslash to specify that it stands for + itself. In particular, if you want to match a backslash, write \\.

+ +

In unicode mode, only ASCII numbers and letters have any special + meaning after a backslash. All other characters (in particular, those + whose code points are > 127) are treated as literals.

+ +

If a pattern is compiled with option extended, whitespace in the + pattern (other than in a character class) and characters between a # + outside a character class and the next newline are ignored. An escaping + backslash can be used to include a whitespace or # character as part of + the pattern.

+ +

To remove the special meaning from a sequence of characters, put them + between \Q and \E. This is different from Perl in that $ and @ are + handled as literals in \Q...\E sequences in PCRE, while $ and @ cause + variable interpolation in Perl. Notice the following examples:

-

If you want to remove the special meaning from a sequence of characters, you -can do so by putting them between \Q and \E. This is different from Perl in -that $ and @ are handled as literals in \Q...\E sequences in PCRE, whereas in -Perl, $ and @ cause variable interpolation. Note the following examples:

- Pattern PCRE matches Perl matches - - \Qabc$xyz\E abc$xyz abc followed by the contents of $xyz - \Qabc\$xyz\E abc\$xyz abc\$xyz - \Qabc\E\$\Qxyz\E abc$xyz abc$xyz - - -

The \Q...\E sequence is recognized both inside and outside -character classes. An isolated \E that is not preceded by \Q is -ignored. If \Q is not followed by \E later in the pattern, the literal -interpretation continues to the end of the pattern (that is, \E is -assumed at the end). If the isolated \Q is inside a character class, -this causes an error, because the character class is not -terminated.

- -

Non-printing characters

- -

A second use of backslash provides a way of encoding non-printing characters -in patterns in a visible manner. There is no restriction on the appearance of -non-printing characters, apart from the binary zero that terminates a pattern, -but when a pattern is being prepared by text editing, it is often easier to use -one of the following escape sequences than the binary character it represents:

- - - \a alarm, that is, the BEL character (hex 07) - \cx "control-x", where x is any ASCII character - \e escape (hex 1B) - \f form feed (hex 0C) - \n linefeed (hex 0A) - \r carriage return (hex 0D) - \t tab (hex 09) - \ddd character with octal code ddd, or back reference - \xhh character with hex code hh - \x{hhh..} character with hex code hhh.. - - -

The precise effect of \cx on ASCII characters is as follows: if x is a lower -case letter, it is converted to upper case. Then bit 6 of the character (hex -40) is inverted. Thus \cA to \cZ become hex 01 to hex 1A (A is 41, Z is 5A), -but \c{ becomes hex 3B ({ is 7B), and \c; becomes hex 7B (; is 3B). If the -data item (byte or 16-bit value) following \c has a value greater than 127, a -compile-time error occurs. This locks out non-ASCII characters in all modes.

- -

The \c facility was designed for use with ASCII characters, but with the -extension to Unicode it is even less useful than it once was.

- -

By default, after \x, from zero to two hexadecimal digits are read (letters -can be in upper or lower case). Any number of hexadecimal digits may appear -between \x{ and }, but the character code is constrained as follows:

- - 8-bit non-Unicode mode less than 0x100 - 8-bit UTF-8 mode less than 0x10ffff and a valid codepoint - -

Invalid Unicode codepoints are the range 0xd800 to 0xdfff (the so-called -"surrogate" codepoints), and 0xffef.

- -

If characters other than hexadecimal digits appear between \x{ and }, or if -there is no terminating }, this form of escape is not recognized. Instead, the -initial \x will be interpreted as a basic hexadecimal escape, with no -following digits, giving a character whose value is zero.

- -

Characters whose value is less than 256 can be defined by either of the two -syntaxes for \x. There is no difference in the way they are handled. For -example, \xdc is exactly the same as \x{dc}.

- -

After \0 up to two further octal digits are read. If there are fewer than two -digits, just those that are present are used. Thus the sequence \0\x\07 -specifies two binary zeros followed by a BEL character (code value 7). Make -sure you supply two digits after the initial zero if the pattern character that -follows is itself an octal digit.

- -

The handling of a backslash followed by a digit other than 0 is complicated. -Outside a character class, PCRE reads it and any following digits as a decimal -number. If the number is less than 10, or if there have been at least that many -previous capturing left parentheses in the expression, the entire sequence is -taken as a back reference. A description of how this works is given -later, following the discussion of parenthesized subpatterns.

- - -

Inside a character class, or if the decimal number is greater than 9 and there -have not been that many capturing subpatterns, PCRE re-reads up to three octal -digits following the backslash, and uses them to generate a data character. Any -subsequent digits stand for themselves. The value of the character is -constrained in the same way as characters specified in hexadecimal. -For example:

- - - \040 is another way of writing a ASCII space - - \40 is the same, provided there are fewer than 40 - previous capturing subpatterns - \7 is always a back reference - - \11 might be a back reference, or another way of - writing a tab - \011 is always a tab - \0113 is a tab followed by the character "3" - - \113 might be a back reference, otherwise the - character with octal code 113 - - \377 might be a back reference, otherwise - the value 255 (decimal) - - \81 is either a back reference, or a binary zero - followed by the two characters "8" and "1" - - -

Note that octal values of 100 or greater must not be introduced by -a leading zero, because no more than three octal digits are ever -read.

- -

All the sequences that define a single character value can be used both inside -and outside character classes. In addition, inside a character class, \b is -interpreted as the backspace character (hex 08).

-

\N is not allowed in a character class. \B, \R, and \X are not special -inside a character class. Like other unrecognized escape sequences, they are -treated as the literal characters "B", "R", and "X". Outside a character class, these -sequences have different meanings.

- -

Unsupported escape sequences

- -

In Perl, the sequences \l, \L, \u, and \U are recognized by its string -handler and used to modify the case of following characters. PCRE -does not support these escape sequences.

- -

Absolute and relative back references

- -

The sequence \g followed by an unsigned or a negative number, -optionally enclosed in braces, is an absolute or relative back -reference. A named back reference can be coded as \g{name}. Back -references are discussed later, following the discussion of -parenthesized subpatterns.

- -

Absolute and relative subroutine calls

-

For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or -a number enclosed either in angle brackets or single quotes, is an alternative -syntax for referencing a subpattern as a "subroutine". Details are discussed -later. -Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not -synonymous. The former is a back reference; the latter is a -subroutine call.

- -

Generic character types

- -

Another use of backslash is for specifying generic character types:

- - - \d any decimal digit - \D any character that is not a decimal digit - \h any horizontal white space character - \H any character that is not a horizontal white space character - \s any white space character - \S any character that is not a white space character - \v any vertical white space character - \V any character that is not a vertical white space character - \w any "word" character - \W any "non-word" character - - -

There is also the single sequence \N, which matches a non-newline character. -This is the same as the "." metacharacter -when dotall is not set. Perl also uses \N to match characters by name; -PCRE does not support this.

- -

Each pair of lower and upper case escape sequences partitions the complete set -of characters into two disjoint sets. Any given character matches one, and only -one, of each pair. The sequences can appear both inside and outside character -classes. They each match one character of the appropriate type. If the current -matching point is at the end of the subject string, all of them fail, because -there is no character to match.

- -

For compatibility with Perl, \s does not match the VT character (code 11). -This makes it different from the POSIX "space" class. The \s characters -are HT (9), LF (10), FF (12), CR (13), and space (32). If "use locale;" is -included in a Perl script, \s may match the VT character. In PCRE, it never -does.

- -

A "word" character is an underscore or any character that is a letter or digit. -By default, the definition of letters and digits is controlled by PCRE's -low-valued character tables, in Erlang's case (and without the unicode option), -the ISO-Latin-1 character set.

- -

By default, in unicode mode, characters with values greater than 255, -i.e. all characters outside the ISO-Latin-1 character set, never match -\d, \s, or \w, and always match \D, \S, and \W. These sequences retain -their original meanings from before UTF support was available, mainly for -efficiency reasons. However, if the ucp option is set, the behaviour is changed so that Unicode -properties are used to determine character types, as follows:

- - \d any character that \p{Nd} matches (decimal digit) - \s any character that \p{Z} matches, plus HT, LF, FF, CR) - \w any character that \p{L} or \p{N} matches, plus underscore) - -

The upper case escapes match the inverse sets of characters. Note that \d -matches only decimal digits, whereas \w matches any Unicode digit, as well as -any Unicode letter, and underscore. Note also that ucp affects \b, and -\B because they are defined in terms of \w and \W. Matching these sequences -is noticeably slower when ucp is set.

- -

The sequences \h, \H, \v, and \V are features that were added to Perl at -release 5.10. In contrast to the other sequences, which match only ASCII -characters by default, these always match certain high-valued codepoints, -whether or not ucp is set. The horizontal space characters are:

- - - U+0009 Horizontal tab (HT) - U+0020 Space - U+00A0 Non-break space - U+1680 Ogham space mark - U+180E Mongolian vowel separator - U+2000 En quad - U+2001 Em quad - U+2002 En space - U+2003 Em space - U+2004 Three-per-em space - U+2005 Four-per-em space - U+2006 Six-per-em space - U+2007 Figure space - U+2008 Punctuation space - U+2009 Thin space - U+200A Hair space - U+202F Narrow no-break space - U+205F Medium mathematical space - U+3000 Ideographic space - - -

The vertical space characters are:

- - - U+000A Linefeed (LF) - U+000B Vertical tab (VT) - U+000C Form feed (FF) - U+000D Carriage return (CR) - U+0085 Next line (NEL) - U+2028 Line separator - U+2029 Paragraph separator - - -

In 8-bit, non-UTF-8 mode, only the characters with codepoints less than 256 are -relevant.

- -

Newline sequences

- -

Outside a character class, by default, the escape sequence \R matches any -Unicode newline sequence. In non-UTF-8 mode \R is -equivalent to the following:

- -

(?>\r\n|\n|\x0b|\f|\r|\x85)

 - -

This is an example of an "atomic group", details of which are given below.

- -

This particular group matches either the two-character sequence CR followed by -LF, or one of the single characters LF (linefeed, U+000A), VT (vertical tab, -U+000B), FF (form feed, U+000C), CR (carriage return, U+000D), or NEL (next -line, U+0085). The two-character sequence is treated as a single unit that -cannot be split.

- -

In Unicode mode, two additional characters whose codepoints are greater than 255 -are added: LS (line separator, U+2028) and PS (paragraph separator, U+2029). -Unicode character property support is not needed for these characters to be -recognized.

- - -

It is possible to restrict \R to match only CR, LF, or CRLF (instead of the -complete set of Unicode line endings) by setting the option bsr_anycrlf -either at compile time or when the pattern is matched. (BSR is an abbreviation -for "backslash R".) This can be made the default when PCRE is built; if this is -the case, the other behaviour can be requested via the bsr_unicode option. -It is also possible to specify these settings by starting a pattern string with -one of the following sequences:

- -

(*BSR_ANYCRLF) CR, LF, or CRLF only - (*BSR_UNICODE) any Unicode newline sequence

- -

These override the default and the options given to the compiling function, but -they can themselves be overridden by options given to a matching function. Note -that these special settings, which are not Perl-compatible, are recognized only -at the very start of a pattern, and that they must be in upper case. If more -than one of them is present, the last one is used. They can be combined with a -change of newline convention; for example, a pattern can start with:

- -

(*ANY)(*BSR_ANYCRLF)

- -

They can also be combined with the (*UTF8), (*UTF) or -(*UCP) special sequences. Inside a character class, \R is treated as an -unrecognized escape sequence, and so matches the letter "R" by default.

- -

Unicode character properties

- -

Three additional -escape sequences that match characters with specific properties are available. -When in 8-bit non-UTF-8 mode, these sequences are of course limited to testing -characters whose codepoints are less than 256, but they do work in this mode. -The extra escape sequences are:

- -\p{xx} a character with the xx property -\P{xx} a character without the xx property -\X a Unicode extended grapheme cluster - - -

The property names represented by xx above are limited to the Unicode -script names, the general category properties, "Any", which matches any -character (including newline), and some special PCRE properties (described -in the next section). -Other Perl properties such as "InMusicalSymbols" are not currently supported by -PCRE. Note that \P{Any} does not match any characters, so always causes a -match failure.

- -

Sets of Unicode characters are defined as belonging to certain scripts. A -character from one of these sets can be matched using a script name. For -example:

- -

\p{Greek} - \P{Han}

- -

Those that are not part of an identified script are lumped together as -"Common". The current list of scripts is:

- - -Arabic -Armenian -Avestan -Balinese -Bamum -Batak -Bengali -Bopomofo -Braille -Buginese -Buhid -Canadian_Aboriginal -Carian -Chakma -Cham -Cherokee -Common -Coptic -Cuneiform -Cypriot -Cyrillic -Deseret -Devanagari -Egyptian_Hieroglyphs -Ethiopic -Georgian -Glagolitic -Gothic -Greek -Gujarati -Gurmukhi -Han -Hangul -Hanunoo -Hebrew -Hiragana -Imperial_Aramaic -Inherited -Inscriptional_Pahlavi -Inscriptional_Parthian -Javanese -Kaithi -Kannada -Katakana -Kayah_Li -Kharoshthi -Khmer -Lao -Latin -Lepcha -Limbu -Linear_B -Lisu -Lycian -Lydian -Malayalam -Mandaic -Meetei_Mayek -Meroitic_Cursive -Meroitic_Hieroglyphs -Miao -Mongolian -Myanmar -New_Tai_Lue -Nko -Ogham -Old_Italic -Old_Persian -Oriya -Old_South_Arabian -Old_Turkic -Ol_Chiki -Osmanya -Phags_Pa -Phoenician -Rejang -Runic -Samaritan -Saurashtra -Sharada -Shavian -Sinhala -Sora_Sompeng -Sundanese -Syloti_Nagri -Syriac -Tagalog -Tagbanwa -Tai_Le -Tai_Tham -Tai_Viet -Takri -Tamil -Telugu -Thaana -Thai -Tibetan -Tifinagh -Ugaritic -Vai -Yi - - -

Each character has exactly one Unicode general category property, specified by -a two-letter abbreviation. For compatibility with Perl, negation can be -specified by including a circumflex between the opening brace and the property -name. For example, \p{^Lu} is the same as \P{Lu}.

- -

If only one letter is specified with \p or \P, it includes all the general -category properties that start with that letter. In this case, in the absence -of negation, the curly brackets in the escape sequence are optional; these two -examples have the same effect:

- -\p{L} - \pL - -

The following general category property codes are supported:

- - - C Other - Cc Control - Cf Format - Cn Unassigned - Co Private use - Cs Surrogate - - - - L Letter - Ll Lower case letter - Lm Modifier letter - Lo Other letter - Lt Title case letter - Lu Upper case letter - - - - - M Mark - Mc Spacing mark - Me Enclosing mark - Mn Non-spacing mark - +Pattern PCRE matches Perl matches + +\Qabc$xyz\E abc$xyz abc followed by the contents of $xyz +\Qabc\$xyz\E abc\$xyz abc\$xyz +\Qabc\E\$\Qxyz\E abc$xyz abc$xyz + + +

The \Q...\E sequence is recognized both inside and outside character + classes. An isolated \E that is not preceded by \Q is ignored. If \Q is + not followed by \E later in the pattern, the literal interpretation + continues to the end of the pattern (that is, \E is assumed at the end). + If the isolated \Q is inside a character class, this causes an error, as + the character class is not terminated.

+ +

Non-Printing Characters

+ + +

A second use of backslash provides a way of encoding non-printing + characters in patterns in a visible manner. There is no restriction on the + appearance of non-printing characters, apart from the binary zero that + terminates a pattern. When a pattern is prepared by text editing, it is + often easier to use one of the following escape sequences than the binary + character it represents:

+ + + \aAlarm, that is, the BEL character (hex 07) + \cx"Control-x", where x is any ASCII character + \eEscape (hex 1B) + \fForm feed (hex 0C) + \nLine feed (hex 0A) + \rCarriage return (hex 0D) + \tTab (hex 09) + \dddCharacter with octal code ddd, or back reference + + \xhhCharacter with hex code hh + \x{hhh..}Character with hex code hhh.. + + +

The precise effect of \cx on ASCII characters is as follows: if x is a + lowercase letter, it is converted to upper case. Then bit 6 of the + character (hex 40) is inverted. Thus \cA to \cZ become hex 01 to hex 1A + (A is 41, Z is 5A), but \c{ becomes hex 3B ({ is 7B), and \c; becomes + hex 7B (; is 3B). If the data item (byte or 16-bit value) following \c + has a value > 127, a compile-time error occurs. This locks out + non-ASCII characters in all modes.

+ +

The \c facility was designed for use with ASCII characters, but with the + extension to Unicode it is even less useful than it once was.

+ +

By default, after \x, from zero to two hexadecimal digits are read + (letters can be in upper or lower case). Any number of hexadecimal digits + can appear between \x{ and }, but the character code is constrained as + follows:

+ + + 8-bit non-Unicode mode + < 0x100 + 8-bit UTF-8 mode + < 0x10ffff and a valid code point + + +

Invalid Unicode code points are the range 0xd800 to 0xdfff (the so-called + "surrogate" code points), and 0xffef.

+ +

If characters other than hexadecimal digits appear between \x{ and }, + or if there is no terminating }, this form of escape is not recognized. + Instead, the initial \x is interpreted as a basic hexadecimal escape, + with no following digits, giving a character whose value is zero.

+ +

Characters whose value is < 256 can be defined by either of the two + syntaxes for \x. There is no difference in the way they are handled. For + example, \xdc is the same as \x{dc}.

+ +

After \0 up to two further octal digits are read. If there are fewer than + two digits, only those that are present are used. Thus the sequence + \0\x\07 specifies two binary zeros followed by a BEL character (code value + 7). Ensure to supply two digits after the initial zero if the pattern + character that follows is itself an octal digit.

+ +

The handling of a backslash followed by a digit other than 0 is + complicated. Outside a character class, PCRE reads it and any following + digits as a decimal number. If the number is < 10, or if there have + been at least that many previous capturing left parentheses in the + expression, the entire sequence is taken as a back reference. A + description of how this works is provided later, following the discussion + of parenthesized subpatterns.

+ +

Inside a character class, or if the decimal number is > 9 and there + have not been that many capturing subpatterns, PCRE re-reads up to three + octal digits following the backslash, and uses them to generate a data + character. Any subsequent digits stand for themselves. The value of the + character is constrained in the same way as characters specified in + hexadecimal. For example:

+ + + \040 + Another way of writing an ASCII space + \40 + The same, provided there are < 40 previous capturing + subpatterns + \7 + Always a back reference + \11 + Can be a back reference, or another way of writing a tab + \011 + Always a tab + \0113 + A tab followed by character "3" + \113 + Can be a back reference, otherwise the character with octal code + 113 + \377 + Can be a back reference, otherwise value 255 (decimal) + \81 + Either a back reference, or a binary zero followed by the two + characters "8" and "1" + + +

Notice that octal values >= 100 must not be introduced by a leading + zero, as no more than three octal digits are ever read.

+ +

All the sequences that define a single character value can be used both + inside and outside character classes. Also, inside a character class, \b + is interpreted as the backspace character (hex 08).

+ +

\N is not allowed in a character class. \B, \R, and \X are not special + inside a character class. Like other unrecognized escape sequences, they + are treated as the literal characters "B", "R", and "X". Outside a + character class, these sequences have different meanings.

+ +

Unsupported Escape Sequences

+ +

In Perl, the sequences \l, \L, \u, and \U are recognized by its string + handler and used to modify the case of following characters. PCRE does not + support these escape sequences.

+ +

Absolute and Relative Back References

+ +

The sequence \g followed by an unsigned or a negative number, optionally + enclosed in braces, is an absolute or relative back reference. A named + back reference can be coded as \g{name}. Back references are discussed + later, following the discussion of parenthesized subpatterns.

+ +

Absolute and Relative Subroutine Calls

+ +

For compatibility with Oniguruma, the non-Perl syntax \g followed by a + name or a number enclosed either in angle brackets or single quotes, is + alternative syntax for referencing a subpattern as a "subroutine". + Details are discussed later. Notice that \g{...} (Perl syntax) and + \g<...> (Oniguruma syntax) are not synonymous. The former + is a back reference and the latter is a subroutine call.

+ +

Generic Character Types

+ + +

Another use of backslash is for specifying generic character types:

+ + + \dAny decimal digit + \DAny character that is not a decimal digit + \hAny horizontal whitespace character + \HAny character that is not a horizontal whitespace + character + \sAny whitespace character + \SAny character that is not a whitespace character + + \vAny vertical whitespace character + \VAny character that is not a vertical whitespace + character + \wAny "word" character + \WAny "non-word" character + + +

There is also the single sequence \N, which matches a non-newline + character. This is the same as the "." metacharacter when dotall + is not set. Perl also uses \N to match characters by name, but PCRE does + not support this.

+ +

Each pair of lowercase and uppercase escape sequences partitions the + complete set of characters into two disjoint sets. Any given character + matches one, and only one, of each pair. The sequences can appear both + inside and outside character classes. They each match one character of the + appropriate type. If the current matching point is at the end of the + subject string, all fail, as there is no character to match.

+ +

For compatibility with Perl, \s does not match the VT character + (code 11). This makes it different from the Posix "space" class. The \s + characters are HT (9), LF (10), FF (12), CR (13), and space (32). If "use + locale;" is included in a Perl script, \s can match the VT character. In + PCRE, it never does.

+ +

A "word" character is an underscore or any character that is a letter or + a digit. By default, the definition of letters and digits is controlled by + the PCRE low-valued character tables, in Erlang's case (and without option + unicode), the ISO Latin-1 character set.

+ +

By default, in unicode mode, characters with values > 255, that + is, all characters outside the ISO Latin-1 character set, never match \d, + \s, or \w, and always match \D, \S, and \W. These sequences retain their + original meanings from before UTF support was available, mainly for + efficiency reasons. However, if option ucp is set, the behavior is + changed so that Unicode properties are used to determine character types, + as follows:

+ + + \dAny character that \p{Nd} matches (decimal digit) + + \sAny character that \p{Z} matches, plus HT, LF, FF, CR + + \wAny character that \p{L} or \p{N} matches, plus + underscore + + +

The uppercase escapes match the inverse sets of characters. Notice that + \d matches only decimal digits, while \w matches any Unicode digit, any + Unicode letter, and underscore. Notice also that ucp affects \b and + \B, as they are defined in terms of \w and \W. Matching these sequences is + noticeably slower when ucp is set.

+ +

The sequences \h, \H, \v, and \V are features that were added to Perl in + release 5.10. In contrast to the other sequences, which match only ASCII + characters by default, these always match certain high-valued code points, + regardless if ucp is set.

+ +

The following are the horizontal space characters:

+ + + U+0009Horizontal tab (HT) + U+0020Space + U+00A0Non-break space + U+1680Ogham space mark + U+180EMongolian vowel separator + U+2000En quad + U+2001Em quad + U+2002En space + U+2003Em space + U+2004Three-per-em space + U+2005Four-per-em space + U+2006Six-per-em space + U+2007Figure space + U+2008Punctuation space + U+2009Thin space + U+200AHair space + U+202FNarrow no-break space + U+205FMedium mathematical space + U+3000Ideographic space + + +

The following are the vertical space characters:

+ + + U+000ALine feed (LF) + U+000BVertical tab (VT) + U+000CForm feed (FF) + U+000DCarriage return (CR) + U+0085Next line (NEL) + U+2028Line separator + U+2029Paragraph separator + + +

In 8-bit, non-UTF-8 mode, only the characters with code points < 256 + are relevant.

+ +

Newline Sequences

+ + +

Outside a character class, by default, the escape sequence \R matches any + Unicode newline sequence. In non-UTF-8 mode, \R is equivalent to the + following:

+ + +(?>\r\n|\n|\x0b|\f|\r|\x85) + +

This is an example of an "atomic group", details are provided below.

+ +

This particular group matches either the two-character sequence CR + followed by LF, or one of the single characters LF (line feed, U+000A), + VT (vertical tab, U+000B), FF (form feed, U+000C), CR (carriage return, + U+000D), or NEL (next line, U+0085). The two-character sequence is + treated as a single unit that cannot be split.

+ +

In Unicode mode, two more characters whose code points are > 255 are + added: LS (line separator, U+2028) and PS (paragraph separator, U+2029). + Unicode character property support is not needed for these characters to + be recognized.

+ +

\R can be restricted to match only CR, LF, or CRLF (instead of the + complete set of Unicode line endings) by setting option bsr_anycrlf + either at compile time or when the pattern is matched. (BSR is an acronym + for "backslash R".) This can be made the default when PCRE is built; if + so, the other behavior can be requested through option + bsr_unicode. These settings can also be specified by starting a + pattern string with one of the following sequences:

+ + + (*BSR_ANYCRLF) + CR, LF, or CRLF only + (*BSR_UNICODE) + Any Unicode newline sequence + + +

These override the default and the options specified to the compiling + function, but they can themselves be overridden by options specified to a + matching function. Notice that these special settings, which are not + Perl-compatible, are recognized only at the very start of a pattern, and + that they must be in upper case. If more than one of them is present, the + last one is used. They can be combined with a change of newline + convention; for example, a pattern can start with:

+ + +(*ANY)(*BSR_ANYCRLF) + +

They can also be combined with the (*UTF8), (*UTF), or (*UCP) special + sequences. Inside a character class, \R is treated as an unrecognized + escape sequence, and so matches the letter "R" by default.

+ +

Unicode Character Properties

+ +

Three more escape sequences that match characters with specific + properties are available. When in 8-bit non-UTF-8 mode, these sequences + are limited to testing characters whose code points are < + 256, but they do work in this mode. The following are the extra escape + sequences:

+ + + \p{xx} + A character with property xx + \P{xx} + A character without property xx + \X + A Unicode extended grapheme cluster + + +

The property names represented by xx above are limited to the + Unicode script names, the general category properties, "Any", which + matches any character (including newline), and some special PCRE + properties (described in the next section). Other Perl properties, such as + "InMusicalSymbols", are currently not supported by PCRE. Notice that + \P{Any} does not match any characters and always causes a match + failure.

+ +

Sets of Unicode characters are defined as belonging to certain scripts. + A character from one of these sets can be matched using a script name, for + example:

+ + +\p{Greek} \P{Han} + +

Those that are not part of an identified script are lumped together as + "Common". The following is the current list of scripts:

+ + + Arabic + Armenian + Avestan + Balinese + Bamum + Batak + Bengali + Bopomofo + Braille + Buginese + Buhid + Canadian_Aboriginal + Carian + Chakma + Cham + Cherokee + Common + Coptic + Cuneiform + Cypriot + Cyrillic + Deseret + Devanagari + Egyptian_Hieroglyphs + Ethiopic + Georgian + Glagolitic + Gothic + Greek + Gujarati + Gurmukhi + Han + Hangul + Hanunoo + Hebrew + Hiragana + Imperial_Aramaic + Inherited + Inscriptional_Pahlavi + Inscriptional_Parthian + Javanese + Kaithi + Kannada + Katakana + Kayah_Li + Kharoshthi + Khmer + Lao + Latin + Lepcha + Limbu + Linear_B + Lisu + Lycian + Lydian + Malayalam + Mandaic + Meetei_Mayek + Meroitic_Cursive + Meroitic_Hieroglyphs + Miao + Mongolian + Myanmar + New_Tai_Lue + Nko + Ogham + Old_Italic + Old_Persian + Oriya + Old_South_Arabian + Old_Turkic + Ol_Chiki + Osmanya + Phags_Pa + Phoenician + Rejang + Runic + Samaritan + Saurashtra + Sharada + Shavian + Sinhala + Sora_Sompeng + Sundanese + Syloti_Nagri + Syriac + Tagalog + Tagbanwa + Tai_Le + Tai_Tham + Tai_Viet + Takri + Tamil + Telugu + Thaana + Thai + Tibetan + Tifinagh + Ugaritic + Vai + Yi + + +

Each character has exactly one Unicode general category property, + specified by a two-letter acronym. For compatibility with Perl, negation + can be specified by including a circumflex between the opening brace and + the property name. For example, \p{^Lu} is the same as \P{Lu}.

+ +

If only one letter is specified with \p or \P, it includes all the + general category properties that start with that letter. In this case, in + the absence of negation, the curly brackets in the escape sequence are + optional. The following two examples have the same effect:

+ + +\p{L} +\pL + +

The following general category property codes are supported:

+ + + COther + CcControl + CfFormat + CnUnassigned + CoPrivate use + CsSurrogate + LLetter + LlLowercase letter + LmModifier letter + LoOther letter + LtTitle case letter + LuUppercase letter + MMark + McSpacing mark + MeEnclosing mark + MnNon-spacing mark + NNumber + NdDecimal number + NlLetter number + NoOther number + PPunctuation + PcConnector punctuation + PdDash punctuation + PeClose punctuation + PfFinal punctuation + PiInitial punctuation + PoOther punctuation + PsOpen punctuation + SSymbol + ScCurrency symbol + SkModifier symbol + SmMathematical symbol + SoOther symbol + ZSeparator + ZlLine separator + ZpParagraph separator + ZsSpace separator + + +

The special property L& is also supported. It matches a character + that has the Lu, Ll, or Lt property, that is, a letter that is not + classified as a modifier or "other".

+ +

The Cs (Surrogate) property applies only to characters in the range + U+D800 to U+DFFF. Such characters are invalid in Unicode strings and so + cannot be tested by PCRE. Perl does not support the Cs property.

+ +

The long synonyms for property names supported by Perl (such as + \p{Letter}) are not supported by PCRE. It is not permitted to prefix any + of these properties with "Is".

+ +

No character in the Unicode table has the Cn (unassigned) property. + This property is instead assumed for any code point that is not in the + Unicode table.

+ +

Specifying caseless matching does not affect these escape sequences. For + example, \p{Lu} always matches only uppercase letters. This is different + from the behavior of current versions of Perl.

+ +

Matching characters by Unicode property is not fast, as PCRE must do a + multistage table lookup to find a character property. That is why the + traditional escape sequences such as \d and \w do not use Unicode + properties in PCRE by default. However, you can make them do so by setting + option ucp or by starting the pattern with (*UCP).

+ +

Extended Grapheme Clusters

+ +

The \X escape matches any number of Unicode characters that form an + "extended grapheme cluster", and treats the sequence as an atomic group + (see below). Up to and including release 8.31, PCRE matched an earlier, + simpler definition that was equivalent to (?>\PM\pM*). That is, + it matched a character without the "mark" property, followed by zero or + more characters with the "mark" property. Characters with the "mark" + property are typically non-spacing accents that affect the preceding + character.

+ +

This simple definition was extended in Unicode to include more + complicated kinds of composite character by giving each character a + grapheme breaking property, and creating rules that use these properties + to define the boundaries of extended grapheme clusters. In PCRE releases + later than 8.31, \X matches one of these clusters.

+ +

\X always matches at least one character. Then it decides whether to add + more characters according to the following rules for ending a cluster:

+ + + +

End at the end of the subject string.

+ + +

Do not end between CR and LF; otherwise end after any control + character.

+ + +

Do not break Hangul (a Korean script) syllable sequences. Hangul + characters are of five types: L, V, T, LV, and LVT. An L character can + be followed by an L, V, LV, or LVT character. An LV or V character can + be followed by a V or T character. An LVT or T character can be + followed only by a T character.

+ + +

Do not end before extending characters or spacing marks. Characters + with the "mark" property always have the "extend" grapheme breaking + property.

+ + +

Do not end after prepend characters.

+ + +

Otherwise, end the cluster.

+ + - - N Number - Nd Decimal number - Nl Letter number - No Other number - +

PCRE Additional Properties

- - P Punctuation - Pc Connector punctuation - Pd Dash punctuation - Pe Close punctuation - Pf Final punctuation - Pi Initial punctuation - Po Other punctuation - Ps Open punctuation - +

In addition to the standard Unicode properties described earlier, PCRE + supports four more that make it possible to convert traditional escape + sequences, such as \w and \s, and Posix character classes to use Unicode + properties. PCRE uses these non-standard, non-Perl properties internally + when PCRE_UCP is set. However, they can also be used explicitly. + The properties are as follows:

- - S Symbol - Sc Currency symbol - Sk Modifier symbol - Sm Mathematical symbol - So Other symbol - + + Xan + +

Any alphanumeric character. Matches characters that have either the + L (letter) or the N (number) property.

+ + Xps + +

Any Posix space character. Matches the characters tab, line feed, + vertical tab, form feed, carriage return, and any other character + that has the Z (separator) property.

+ + Xsp + +

Any Perl space character. Matches the same as Xps, except that + vertical tab is excluded.

+ + Xwd + +

Any Perl "word" character. Matches the same characters as Xan, plus + underscore.

+ + + +

There is another non-standard property, Xuc, which matches any character + that can be represented by a Universal Character Name in C++ and other + programming languages. These are the characters $, @, ` (grave accent), + and all characters with Unicode code points >= U+00A0, except for the + surrogates U+D800 to U+DFFF. Notice that most base (ASCII) characters are + excluded. (Universal Character Names are of the form \uHHHH or \UHHHHHHHH, + where H is a hexadecimal digit. Notice that the Xuc property does not + match these sequences but the characters that they represent.)

+ +

Resetting the Match Start

+ +

The escape sequence \K causes any previously matched characters not to + be included in the final matched sequence. For example, the following + pattern matches "foobar", but reports that it has matched "bar":

+ + +foo\Kbar + +

This feature is similar to a lookbehind assertion + + + (described below). However, in this case, the part of the subject before + the real match does not have to be of fixed length, as lookbehind + assertions do. The use of \K does not interfere with the setting of + captured substrings. For example, when the following pattern matches + "foobar", the first substring is still set to "foo":

- - Z Separator - Zl Line separator - Zp Paragraph separator - Zs Space separator - + +(foo)\Kbar + +

Perl documents that the use of \K within assertions is "not well + defined". In PCRE, \K is acted upon when it occurs inside positive + assertions, but is ignored in negative assertions.

+ +

Simple Assertions

+ +

The final use of backslash is for certain simple assertions. An + assertion specifies a condition that must be met at a particular point in + a match, without consuming any characters from the subject string. The + use of subpatterns for more complicated assertions is described below. The + following are the backslashed assertions:

+ + + \bMatches at a word boundary. + \BMatches when not at a word boundary. + \AMatches at the start of the subject. + \ZMatches at the end of the subject, and before a newline + at the end of the subject. + \zMatches only at the end of the subject. + \GMatches at the first matching position in the subject. + + + +

Inside a character class, \b has a different meaning; it matches the + backspace character. If any other of these assertions appears in a + character class, by default it matches the corresponding literal character + (for example, \B matches the letter B).

+ +

A word boundary is a position in the subject string where the current + character and the previous character do not both match \w or \W (that is, + one matches \w and the other matches \W), or the start or end of the + string if the first or last character matches \w, respectively. In UTF + mode, the meanings of \w and \W can be changed by setting option + ucp. When this is done, it also affects \b and \B. PCRE and Perl do + not have a separate "start of word" or "end of word" metasequence. + However, whatever follows \b normally determines which it is. For example, + the fragment \ba matches "a" at the start of a word.

+ +

The \A, \Z, and \z assertions differ from the traditional circumflex and + dollar (described in the next section) in that they only ever match at the + very start and end of the subject string, whatever options are set. Thus, + they are independent of multiline mode. These three assertions are not + affected by options notbol or noteol, which affect only the + behavior of the circumflex and dollar metacharacters. However, if argument + startoffset of run/3 is + non-zero, indicating that matching is to start at a point other than the + beginning of the subject, \A can never match. The difference between \Z + and \z is that \Z matches before a newline at the end of the string and + at the very end, while \z matches only at the end.

+ +

The \G assertion is true only when the current matching position is at + the start point of the match, as specified by argument startoffset + of run/3. It differs from \A when the value of startoffset + is non-zero. By calling run/3 multiple times with appropriate + arguments, you can mimic the Perl option /g, and it is in this + kind of implementation where \G can be useful.

+ +

Notice, however, that the PCRE interpretation of \G, as the start of the + current match, is subtly different from Perl, which defines it as the end + of the previous match. In Perl, these can be different when the previously + matched string was empty. As PCRE does only one match at a time, it cannot + reproduce this behavior.

+ +

If all the alternatives of a pattern begin with \G, the expression is + anchored to the starting match position, and the "anchored" flag is set in + the compiled regular expression.

+
-

The special property L& is also supported: it matches a character that has -the Lu, Ll, or Lt property, in other words, a letter that is not classified as -a modifier or "other".

- -

The Cs (Surrogate) property applies only to characters in the range U+D800 to -U+DFFF. Such characters are not valid in Unicode strings and so -cannot be tested by PCRE. Perl does not support the Cs property

- -

The long synonyms for property names that Perl supports (such as \p{Letter}) -are not supported by PCRE, nor is it permitted to prefix any of these -properties with "Is".

- -

No character that is in the Unicode table has the Cn (unassigned) property. -Instead, this property is assumed for any code point that is not in the -Unicode table.

- -

Specifying caseless matching does not affect these escape sequences. For -example, \p{Lu} always matches only upper case letters. This is different from -the behaviour of current versions of Perl.

-

Matching characters by Unicode property is not fast, because PCRE has to do a -multistage table lookup in order to find a character's property. That is why -the traditional escape sequences such as \d and \w do not use Unicode -properties in PCRE by default, though you can make them do so by setting the -ucp option or by starting the pattern with (*UCP).

- -

Extended grapheme clusters

-

The \X escape matches any number of Unicode characters that form an "extended -grapheme cluster", and treats the sequence as an atomic group (see below). -Up to and including release 8.31, PCRE matched an earlier, simpler definition -that was equivalent to

- -

(?>\PM\pM*)

 - -

That is, it matched a character without the "mark" property, followed by zero -or more characters with the "mark" property. Characters with the "mark" -property are typically non-spacing accents that affect the preceding character.

- -

This simple definition was extended in Unicode to include more complicated -kinds of composite character by giving each character a grapheme breaking -property, and creating rules that use these properties to define the boundaries -of extended grapheme clusters. In releases of PCRE later than 8.31, \X matches -one of these clusters.

- -

\X always matches at least one character. Then it decides whether to add -additional characters according to the following rules for ending a cluster:

- -1. End at the end of the subject string. -2. Do not end between CR and LF; otherwise end after any control character. -3. Do not break Hangul (a Korean script) syllable sequences. Hangul characters -are of five types: L, V, T, LV, and LVT. An L character may be followed by an -L, V, LV, or LVT character; an LV or V character may be followed by a V or T -character; an LVT or T character may be follwed only by a T character. -4. Do not end before extending characters or spacing marks. Characters with -the "mark" property always have the "extend" grapheme breaking property. -5. Do not end after prepend characters. -6. Otherwise, end the cluster. - +
+ + Circumflex and Dollar +

The circumflex and dollar metacharacters are zero-width assertions. That + is, they test for a particular condition to be true without consuming any + characters from the subject string.

+ +

Outside a character class, in the default matching mode, the circumflex + character is an assertion that is true only if the current matching point + is at the start of the subject string. If argument startoffset of + run/3 is non-zero, circumflex + can never match if option multiline is unset. Inside a character + class, circumflex has an entirely different meaning (see below).

+ +

Circumflex needs not to be the first character of the pattern if + some alternatives are involved, but it is to be the first thing in + each alternative in which it appears if the pattern is ever to match that + branch. If all possible alternatives start with a circumflex, that is, if + the pattern is constrained to match only at the start of the subject, it + is said to be an "anchored" pattern. (There are also other constructs that + can cause a pattern to be anchored.)

+ +

The dollar character is an assertion that is true only if the current + matching point is at the end of the subject string, or immediately before + a newline at the end of the string (by default). Notice however that it + does not match the newline. Dollar needs not to be the last character of + the pattern if some alternatives are involved, but it is to be the + last item in any branch in which it appears. Dollar has no special meaning + in a character class.

+ +

The meaning of dollar can be changed so that it matches only at the very + end of the string, by setting option dollar_endonly at compile + time. This does not affect the \Z assertion.

+ +

The meanings of the circumflex and dollar characters are changed if + option multiline is set. When this is the case, a circumflex + matches immediately after internal newlines and at the start of the + subject string. It does not match after a newline that ends the string. A + dollar matches before any newlines in the string, and at the very end, + when multiline is set. When newline is specified as the + two-character sequence CRLF, isolated CR and LF characters do not + indicate newlines.

+ +

For example, the pattern /^abc$/ matches the subject string "def\nabc" + (where \n represents a newline) in multiline mode, but not otherwise. + So, patterns that are anchored in single-line mode because all + branches start with ^ are not anchored in multiline mode, and a match for + circumflex is possible when argument startoffset of run/3 + is non-zero. Option dollar_endonly is ignored if multiline + is set.

+ +

Notice that the sequences \A, \Z, and \z can be used to match the start + and end of the subject in both modes. If all branches of a pattern start + with \A, it is always anchored, regardless if multiline is set.

+
-

PCRE's additional properties

- -

As well as the standard Unicode properties described above, PCRE supports four -more that make it possible to convert traditional escape sequences such as \w -and \s and POSIX character classes to use Unicode properties. PCRE uses these -non-standard, non-Perl properties internally when PCRE_UCP is set. However, -they may also be used explicitly. These properties are:

- - Xan Any alphanumeric character - Xps Any POSIX space character - Xsp Any Perl space character - Xwd Any Perl "word" character - -

Xan matches characters that have either the L (letter) or the N (number) -property. Xps matches the characters tab, linefeed, vertical tab, form feed, or -carriage return, and any other character that has the Z (separator) property. -Xsp is the same as Xps, except that vertical tab is excluded. Xwd matches the -same characters as Xan, plus underscore.

- -

There is another non-standard property, Xuc, which matches any character that -can be represented by a Universal Character Name in C++ and other programming -languages. These are the characters $, @, ` (grave accent), and all characters -with Unicode code points greater than or equal to U+00A0, except for the -surrogates U+D800 to U+DFFF. Note that most base (ASCII) characters are -excluded. (Universal Character Names are of the form \uHHHH or \UHHHHHHHH -where H is a hexadecimal digit. Note that the Xuc property does not match these -sequences but the characters that they represent.)

- -

Resetting the match start

- -

The escape sequence \K causes any previously matched characters not to be -included in the final matched sequence. For example, the pattern:

- -

foo\Kbar

 - -

matches "foobar", but reports that it has matched "bar". This feature is -similar to a lookbehind assertion - - -(described below). - -However, in this case, the part of the subject before the real match does not -have to be of fixed length, as lookbehind assertions do. The use of \K does -not interfere with the setting of -captured substrings. -For example, when the pattern

- -

(foo)\Kbar

 - -

matches "foobar", the first substring is still set to "foo".

- -

Perl documents that the use of \K within assertions is "not well defined". In -PCRE, \K is acted upon when it occurs inside positive assertions, but is -ignored in negative assertions.

- -

Simple assertions

- -

The final use of backslash is for certain simple assertions. An -assertion specifies a condition that has to be met at a particular -point in a match, without consuming any characters from the subject -string. The use of subpatterns for more complicated assertions is -described below. The backslashed assertions are:

- - - \b matches at a word boundary - \B matches when not at a word boundary - \A matches at the start of the subject - \Z matches at the end of the subject - also matches before a newline at the end of - the subject - \z matches only at the end of the subject - \G matches at the first matching position in the - subject - +
+ + Full Stop (Period, Dot) and \N +

Outside a character class, a dot in the pattern matches any character in + the subject string except (by default) a character that signifies the end + of a line.

+ +

When a line ending is defined as a single character, dot never matches + that character. When the two-character sequence CRLF is used, dot does not + match CR if it is immediately followed by LF, otherwise it matches all + characters (including isolated CRs and LFs). When any Unicode line endings + are recognized, dot does not match CR, LF, or any of the other + line-ending characters.

+ +

The behavior of dot regarding newlines can be changed. If option + dotall is set, a dot matches any character, without exception. If + the two-character sequence CRLF is present in the subject string, it takes + two dots to match it.

+ +

The handling of dot is entirely independent of the handling of circumflex + and dollar, the only relationship is that both involve newlines. Dot has + no special meaning in a character class.

+ +

The escape sequence \N behaves like a dot, except that it is not affected + by option PCRE_DOTALL. That is, it matches any character except one + that signifies the end of a line. Perl also uses \N to match characters by + name but PCRE does not support this.

+
-

Inside a character class, \b has a different meaning; it matches the backspace -character. If any other of these assertions appears in a character class, by -default it matches the corresponding literal character (for example, \B -matches the letter B).

- -

A word boundary is a position in the subject string where the current character -and the previous character do not both match \w or \W (i.e. one matches -\w and the other matches \W), or the start or end of the string if the -first or last character matches \w, respectively. In a UTF mode, the meanings -of \w and \W can be changed by setting the ucp option. When this is -done, it also affects \b and \B. Neither PCRE nor Perl has a separate "start -of word" or "end of word" metasequence. However, whatever follows \b normally -determines which it is. For example, the fragment \ba matches "a" at the start -of a word.

- -

The \A, \Z, and \z assertions differ from the traditional circumflex and -dollar (described in the next section) in that they only ever match at the very -start and end of the subject string, whatever options are set. Thus, they are -independent of multiline mode. These three assertions are not affected by the -notbol or noteol options, which affect only the behaviour of the -circumflex and dollar metacharacters. However, if the startoffset -argument of re:run/3 is non-zero, indicating that matching is to start -at a point other than the beginning of the subject, \A can never match. The -difference between \Z and \z is that \Z matches before a newline at the end -of the string as well as at the very end, whereas \z matches only at the end.

- -

The \G assertion is true only when the current matching position is at the -start point of the match, as specified by the startoffset argument of -re:run/3. It differs from \A when the value of startoffset is -non-zero. By calling re:run/3 multiple times with appropriate -arguments, you can mimic Perl's /g option, and it is in this kind of -implementation where \G can be useful.

- -

Note, however, that PCRE's interpretation of \G, as the start of the current -match, is subtly different from Perl's, which defines it as the end of the -previous match. In Perl, these can be different when the previously matched -string was empty. Because PCRE does just one match at a time, it cannot -reproduce this behaviour.

- -

If all the alternatives of a pattern begin with \G, the expression is anchored -to the starting match position, and the "anchored" flag is set in the compiled -regular expression.

- -
- -
Circumflex and dollar - -

The circumflex and dollar metacharacters are zero-width assertions. That is, -they test for a particular condition being true without consuming any -characters from the subject string.

- -

Outside a character class, in the default matching mode, the circumflex -character is an assertion that is true only if the current matching point is at -the start of the subject string. If the startoffset argument of -re:run/3 is non-zero, circumflex can never match if the multiline -option is unset. Inside a character class, circumflex has an entirely different -meaning (see below).

- -

Circumflex need not be the first character of the pattern if a number of -alternatives are involved, but it should be the first thing in each alternative -in which it appears if the pattern is ever to match that branch. If all -possible alternatives start with a circumflex, that is, if the pattern is -constrained to match only at the start of the subject, it is said to be an -"anchored" pattern. (There are also other constructs that can cause a pattern -to be anchored.)

- -

The dollar character is an assertion that is true only if the current matching -point is at the end of the subject string, or immediately before a newline at -the end of the string (by default). Note, however, that it does not actually -match the newline. Dollar need not be the last character of the pattern if a -number of alternatives are involved, but it should be the last item in any -branch in which it appears. Dollar has no special meaning in a character class.

- -

The meaning of dollar can be changed so that it matches only at the -very end of the string, by setting the dollar_endonly option at -compile time. This does not affect the \Z assertion.

- -

The meanings of the circumflex and dollar characters are changed if the -multiline option is set. When this is the case, a circumflex matches -immediately after internal newlines as well as at the start of the subject -string. It does not match after a newline that ends the string. A dollar -matches before any newlines in the string, as well as at the very end, when -multiline is set. When newline is specified as the two-character -sequence CRLF, isolated CR and LF characters do not indicate newlines.

- -

For example, the pattern /^abc$/ matches the subject string -"def\nabc" (where \n represents a newline) in multiline mode, but -not otherwise. Consequently, patterns that are anchored in single line -mode because all branches start with ^ are not anchored in multiline -mode, and a match for circumflex is possible when the -startoffset argument of re:run/3 is non-zero. The -dollar_endonly option is ignored if multiline is set.

- -

Note that the sequences \A, \Z, and \z can be used to match the start and -end of the subject in both modes, and if all branches of a pattern start with -\A it is always anchored, whether or not multiline is set.

- - -
- -
Full stop (period, dot) and \N - -

Outside a character class, a dot in the pattern matches any one character in -the subject string except (by default) a character that signifies the end of a -line. -

- -

When a line ending is defined as a single character, dot never matches that -character; when the two-character sequence CRLF is used, dot does not match CR -if it is immediately followed by LF, but otherwise it matches all characters -(including isolated CRs and LFs). -When any Unicode line endings are being -recognized, dot does not match CR or LF or any of the other line ending -characters. -

- -

The behaviour of dot with regard to newlines can be changed. If -the dotall option is set, a dot matches any one character, -without exception. If the two-character sequence CRLF is present in -the subject string, it takes two dots to match it.

- -

The handling of dot is entirely independent of the handling of -circumflex and dollar, the only relationship being that they both -involve newlines. Dot has no special meaning in a character class.

- -

The escape sequence \N behaves like a dot, except that it is not affected by -the PCRE_DOTALL option. In other words, it matches any character except one -that signifies the end of a line. Perl also uses \N to match characters by -name; PCRE does not support this.

- -
- -
Matching a single data unit - -

Outside a character class, the escape sequence \C matches any one data unit, -whether or not a UTF mode is set. One data unit is one -byte. Unlike a dot, \C always -matches line-ending characters. The feature is provided in Perl in order to -match individual bytes in UTF-8 mode, but it is unclear how it can usefully be -used. Because \C breaks up characters into individual data units, matching one -unit with \C in a UTF mode means that the rest of the string may start with a -malformed UTF character. This has undefined results, because PCRE assumes that -it is dealing with valid UTF strings.

- -

PCRE does not allow \C to appear in lookbehind assertions (described below) -in a UTF mode, because this would make it impossible to calculate the length of -the lookbehind.

- -

In general, the \C escape sequence is best avoided. However, one -way of using it that avoids the problem of malformed UTF characters is to use a -lookahead to check the length of the next character, as in this pattern, which -could be used with a UTF-8 string (ignore white space and line breaks):

+
+ + Matching a Single Data Unit +

Outside a character class, the escape sequence \C matches any data unit, + regardless if a UTF mode is set. One data unit is one byte. Unlike a dot, + \C always matches line-ending characters. The feature is provided in Perl + to match individual bytes in UTF-8 mode, but it is unclear how it can + usefully be used. As \C breaks up characters into individual data units, + matching one unit with \C in a UTF mode means that the remaining string + can start with a malformed UTF character. This has undefined results, as + PCRE assumes that it deals with valid UTF strings.

+ +

PCRE does not allow \C to appear in lookbehind assertions (described + below) in a UTF mode, as this would make it impossible to calculate the + length of the lookbehind.

+ +

The \C escape sequence is best avoided. However, one way of using it that + avoids the problem of malformed UTF characters is to use a lookahead to + check the length of the next character, as in the following pattern, which + can be used with a UTF-8 string (ignore whitespace and line breaks):

- (?| (?=[\x00-\x7f])(\C) | - (?=[\x80-\x{7ff}])(\C)(\C) | - (?=[\x{800}-\x{ffff}])(\C)(\C)(\C) | - (?=[\x{10000}-\x{1fffff}])(\C)(\C)(\C)(\C)) - -

A group that starts with (?| resets the capturing parentheses numbers in each -alternative (see "Duplicate Subpattern Numbers" -below). The assertions at the start of each branch check the next UTF-8 -character for values whose encoding uses 1, 2, 3, or 4 bytes, respectively. The -character's individual bytes are then captured by the appropriate number of -groups.

- -
- -
Square brackets and character classes - -

An opening square bracket introduces a character class, terminated by a closing -square bracket. A closing square bracket on its own is not special by default. -However, if the PCRE_JAVASCRIPT_COMPAT option is set, a lone closing square -bracket causes a compile-time error. If a closing square bracket is required as -a member of the class, it should be the first data character in the class -(after an initial circumflex, if present) or escaped with a backslash.

- -

A character class matches a single character in the subject. In a UTF mode, the -character may be more than one data unit long. A matched character must be in -the set of characters defined by the class, unless the first character in the -class definition is a circumflex, in which case the subject character must not -be in the set defined by the class. If a circumflex is actually required as a -member of the class, ensure it is not the first character, or escape it with a -backslash.

- -

For example, the character class [aeiou] matches any lower case vowel, while -[^aeiou] matches any character that is not a lower case vowel. Note that a -circumflex is just a convenient notation for specifying the characters that -are in the class by enumerating those that are not. A class that starts with a -circumflex is not an assertion; it still consumes a character from the subject -string, and therefore it fails if the current pointer is at the end of the -string.

- -

In UTF-8 mode, characters with values greater than 255 (0xffff) -can be included in a class as a literal string of data units, or by using the -\x{ escaping mechanism.

- -

When caseless matching is set, any letters in a class represent both their -upper case and lower case versions, so for example, a caseless [aeiou] matches -"A" as well as "a", and a caseless [^aeiou] does not match "A", whereas a -caseful version would. In a UTF mode, PCRE always understands the concept of -case for characters whose values are less than 256, so caseless matching is -always possible. For characters with higher values, the concept of case is -supported if PCRE is compiled with Unicode property support, but not otherwise. -If you want to use caseless matching in a UTF mode for characters 256 and -above, you must ensure that PCRE is compiled with Unicode property support as -well as with UTF support.

- -

Characters that might indicate line breaks are never treated in any special way -when matching character classes, whatever line-ending sequence is in use, and -whatever setting of the PCRE_DOTALL and PCRE_MULTILINE options is used. A class -such as [^a] always matches one of these characters.

- -

The minus (hyphen) character can be used to specify a range of characters in a -character class. For example, [d-m] matches any letter between d and m, -inclusive. If a minus character is required in a class, it must be escaped with -a backslash or appear in a position where it cannot be interpreted as -indicating a range, typically as the first or last character in the class.

- -

It is not possible to have the literal character "]" as the end character of a -range. A pattern such as [W-]46] is interpreted as a class of two characters -("W" and "-") followed by a literal string "46]", so it would match "W46]" or -"-46]". However, if the "]" is escaped with a backslash it is interpreted as -the end of range, so [W-\]46] is interpreted as a class containing a range -followed by two other characters. The octal or hexadecimal representation of -"]" can also be used to end a range.

- -

Ranges operate in the collating sequence of character values. They can also be -used for characters specified numerically, for example [\000-\037]. Ranges -can include any characters that are valid for the current mode.

- -

If a range that includes letters is used when caseless matching is set, it -matches the letters in either case. For example, [W-c] is equivalent to -[][\\^_`wxyzabc], matched caselessly, and in a non-UTF mode, if character -tables for a French locale are in use, [\xc8-\xcb] matches accented E -characters in both cases. In UTF modes, PCRE supports the concept of case for -characters with values greater than 255 only when it is compiled with Unicode -property support.

- -

The character escape sequences \d, \D, \h, \H, \p, \P, \s, \S, \v, -\V, \w, and \W may appear in a character class, and add the characters that -they match to the class. For example, [\dABCDEF] matches any hexadecimal -digit. In UTF modes, the ucp option affects the meanings of \d, \s, \w -and their upper case partners, just as it does when they appear outside a -character class, as described in the section entitled -"Generic character types" -above. The escape sequence \b has a different meaning inside a character -class; it matches the backspace character. The sequences \B, \N, \R, and \X -are not special inside a character class. Like any other unrecognized escape -sequences, they are treated as the literal characters "B", "N", "R", and "X".

- -

A circumflex can conveniently be used with the upper case character types to -specify a more restricted set of characters than the matching lower case type. -For example, the class [^\W_] matches any letter or digit, but not underscore, -whereas [\w] includes underscore. A positive character class should be read as -"something OR something OR ..." and a negative class as "NOT something AND NOT -something AND NOT ...".

- -

The only metacharacters that are recognized in character classes -are backslash, hyphen (only where it can be interpreted as specifying -a range), circumflex (only at the start), opening square bracket (only -when it can be interpreted as introducing a POSIX class name - see the -next section), and the terminating closing square bracket. However, -escaping other non-alphanumeric characters does no harm.

-
- -
POSIX character classes - -

Perl supports the POSIX notation for character classes. This uses names -enclosed by [: and :] within the enclosing square brackets. PCRE also supports -this notation. For example,

- -

[01[:alpha:]%]

 - -

matches "0", "1", any alphabetic character, or "%". The supported class names -are:

- - - alnum letters and digits - alpha letters - ascii character codes 0 - 127 - blank space or tab only - cntrl control characters - digit decimal digits (same as \d) - graph printing characters, excluding space - lower lower case letters - print printing characters, including space - punct printing characters, excluding letters and digits and space - space whitespace (not quite the same as \s) - upper upper case letters - word "word" characters (same as \w) - xdigit hexadecimal digits - - -

The "space" characters are HT (9), LF (10), VT (11), FF (12), CR (13), and -space (32). Notice that this list includes the VT character (code 11). This -makes "space" different to \s, which does not include VT (for Perl -compatibility).

- -

The name "word" is a Perl extension, and "blank" is a GNU extension -from Perl 5.8. Another Perl extension is negation, which is indicated -by a ^ character after the colon. For example,

- -

[12[:^digit:]]

 - -

matches "1", "2", or any non-digit. PCRE (and Perl) also recognize the POSIX -syntax [.ch.] and [=ch=] where "ch" is a "collating element", but these are not -supported, and an error is given if they are encountered.

- -

By default, in UTF modes, characters with values greater than 255 do not match -any of the POSIX character classes. However, if the PCRE_UCP option is passed -to pcre_compile(), some of the classes are changed so that Unicode -character properties are used. This is achieved by replacing the POSIX classes -by other sequences, as follows:

- - - [:alnum:] becomes \p{Xan} - [:alpha:] becomes \p{L} - [:blank:] becomes \h - [:digit:] becomes \p{Nd} - [:lower:] becomes \p{Ll} - [:space:] becomes \p{Xps} - [:upper:] becomes \p{Lu} - [:word:] becomes \p{Xwd} - - -

Negated versions, such as [:^alpha:] use \P instead of \p. The other POSIX -classes are unchanged, and match only characters with code points less than -256.

- -
- - -
Vertical bar - -

Vertical bar characters are used to separate alternative -patterns. For example, the pattern

- -

gilbert|sullivan

 - -

matches either "gilbert" or "sullivan". Any number of alternatives -may appear, and an empty alternative is permitted (matching the empty -string). The matching process tries each alternative in turn, from -left to right, and the first one that succeeds is used. If the -alternatives are within a subpattern (defined below), "succeeds" means -matching the rest of the main pattern as well as the alternative in -the subpattern.

- -
- -
Internal option setting - -

The settings of the caseless, multiline, dotall, and -extended options (which are Perl-compatible) can be changed from within -the pattern by a sequence of Perl option letters enclosed between "(?" and ")". -The option letters are

- - - i for caseless - m for multiline - s for dotall - x for extended - - -

For example, (?im) sets caseless, multiline matching. It is also possible to -unset these options by preceding the letter with a hyphen, and a combined -setting and unsetting such as (?im-sx), which sets caseless and -multiline while unsetting dotall and extended, is also -permitted. If a letter appears both before and after the hyphen, the option is -unset.

- -

The PCRE-specific options dupnames, ungreedy, and -extra can be changed in the same way as the Perl-compatible -options by using the characters J, U and X respectively.

- -

When one of these option changes occurs at top level (that is, not inside -subpattern parentheses), the change applies to the remainder of the pattern -that follows. If the change is placed right at the start of a pattern, PCRE -extracts it into the global options.

- -

An option change within a subpattern (see below for a description of -subpatterns) affects only that part of the subpattern that follows it, so

- -

(a(?i)b)c

 - -

matches abc and aBc and no other strings (assuming caseless -is not used). By this means, options can be made to have different -settings in different parts of the pattern. Any changes made in one -alternative do carry on into subsequent branches within the same -subpattern. For example,

- -

(a(?i)b|c)

 - -

matches "ab", "aB", "c", and "C", even though when matching "C" the first -branch is abandoned before the option setting. This is because the effects of -option settings happen at compile time. There would be some very weird -behaviour otherwise.

- -

Note: There are other PCRE-specific options that can be set by the -application when the compiling or matching functions are called. In some cases -the pattern can contain special leading sequences such as (*CRLF) to override -what the application has set or what has been defaulted. Details are given in -the section entitled "Newline sequences" -above. There are also the (*UTF8) and (*UCP) leading -sequences that can be used to set UTF and Unicode property modes; they are -equivalent to setting the unicode and the ucp -options, respectively. The (*UTF) sequence is a generic version that can be -used with any of the libraries. However, the application can set the -never_utf option, which locks out the use of the (*UTF) sequences.

- -
- -
Subpatterns - -

Subpatterns are delimited by parentheses (round brackets), which -can be nested. Turning part of a pattern into a subpattern does two -things:

- -

1. It localizes a set of alternatives. For example, the pattern

- -

cat(aract|erpillar|)

 - -

matches "cataract", "caterpillar", or "cat". Without the parentheses, it would -match "cataract", "erpillar" or an empty string.

- -

2. It sets up the subpattern as a capturing subpattern. This means that, when -the complete pattern matches, that portion of the subject string that matched the -subpattern is passed back to the caller via the return value of -re:run/3.

- -

Opening parentheses are counted from left to right (starting -from 1) to obtain numbers for the capturing subpatterns.For example, if the string -"the red king" is matched against the pattern

- -

the ((red|white) (king|queen))

 - -

the captured substrings are "red king", "red", and "king", and are numbered 1, -2, and 3, respectively.

- -

The fact that plain parentheses fulfil two functions is not always helpful. -There are often times when a grouping subpattern is required without a -capturing requirement. If an opening parenthesis is followed by a question mark -and a colon, the subpattern does not do any capturing, and is not counted when -computing the number of any subsequent capturing subpatterns. For example, if -the string "the white queen" is matched against the pattern

- -

the ((?:red|white) (king|queen))

 - -

the captured substrings are "white queen" and "queen", and are numbered 1 and -2. The maximum number of capturing subpatterns is 65535.

- -

As a convenient shorthand, if any option settings are required at the start of -a non-capturing subpattern, the option letters may appear between the "?" and -the ":". Thus the two patterns

+(?| (?=[\x00-\x7f])(\C) | + (?=[\x80-\x{7ff}])(\C)(\C) | + (?=[\x{800}-\x{ffff}])(\C)(\C)(\C) | + (?=[\x{10000}-\x{1fffff}])(\C)(\C)(\C)(\C)) + +

A group that starts with (?| resets the capturing parentheses numbers in + each alternative (see section Duplicate + Subpattern Numbers). The assertions at the start of each branch + check the next UTF-8 character for values whose encoding uses 1, 2, 3, or + 4 bytes, respectively. The individual bytes of the character are then + captured by the appropriate number of groups.

+
- -(?i:saturday|sunday) -(?:(?i)saturday|sunday) - +
+ + Square Brackets and Character Classes +

An opening square bracket introduces a character class, terminated by a + closing square bracket. A closing square bracket on its own is not special + by default. However, if option PCRE_JAVASCRIPT_COMPAT is set, a + lone closing square bracket causes a compile-time error. If a closing + square bracket is required as a member of the class, it is to be the first + data character in the class (after an initial circumflex, if present) or + escaped with a backslash.

+ +

A character class matches a single character in the subject. In a UTF + mode, the character can be more than one data unit long. A matched + character must be in the set of characters defined by the class, unless + the first character in the class definition is a circumflex, in which case + the subject character must not be in the set defined by the class. If a + circumflex is required as a member of the class, ensure that it is not the + first character, or escape it with a backslash.

+ +

For example, the character class [aeiou] matches any lowercase + vowel, while [^aeiou] matches any character that is not a lowercase + vowel. Notice that a circumflex is just a convenient notation for + specifying the characters that are in the class by enumerating those that + are not. A class that starts with a circumflex is not an assertion; it + still consumes a character from the subject string, and therefore it fails + if the current pointer is at the end of the string.

+ +

In UTF-8 mode, characters with values > 255 (0xffff) can be included + in a class as a literal string of data units, or by using the \x{ escaping + mechanism.

+ +

When caseless matching is set, any letters in a class represent both + their uppercase and lowercase versions. For example, a caseless + [aeiou] matches "A" and "a", and a caseless [^aeiou] does + not match "A", but a caseful version would. In a UTF mode, PCRE always + understands the concept of case for characters whose values are < 256, + so caseless matching is always possible. For characters with higher + values, the concept of case is supported only if PCRE is compiled with + Unicode property support. If you want to use caseless matching in a UTF + mode for characters >=, ensure that PCRE is compiled with Unicode + property support and with UTF support.

+ +

Characters that can indicate line breaks are never treated in any special + way when matching character classes, whatever line-ending sequence is in + use, and whatever setting of options PCRE_DOTALL and + PCRE_MULTILINE is used. A class such as [^a] always matches one of + these characters.

+ +

The minus (hyphen) character can be used to specify a range of characters + in a character class. For example, [d-m] matches any letter between d and + m, inclusive. If a minus character is required in a class, it must be + escaped with a backslash or appear in a position where it cannot be + interpreted as indicating a range, typically as the first or last + character in the class.

+ +

The literal character "]" cannot be the end character of a range. A + pattern such as [W-]46] is interpreted as a class of two characters ("W" + and "-") followed by a literal string "46]", so it would match "W46]" or + "-46]". However, if "]" is escaped with a backslash, it is interpreted as + the end of range, so [W-\]46] is interpreted as a class containing a range + followed by two other characters. The octal or hexadecimal representation + of "]" can also be used to end a range.

+ +

Ranges operate in the collating sequence of character values. They can + also be used for characters specified numerically, for example, + [\000-\037]. Ranges can include any characters that are valid for the + current mode.

+ +

If a range that includes letters is used when caseless matching is set, + it matches the letters in either case. For example, [W-c] is equivalent to + [][\\^_`wxyzabc], matched caselessly. In a non-UTF mode, if character + tables for a French locale are in use, [\xc8-\xcb] matches accented E + characters in both cases. In UTF modes, PCRE supports the concept of case + for characters with values > 255 only when it is compiled with Unicode + property support.

+ +

The character escape sequences \d, \D, \h, \H, \p, \P, \s, \S, \v, \V, + \w, and \W can appear in a character class, and add the characters that + they match to the class. For example, [\dABCDEF] matches any hexadecimal + digit. In UTF modes, option ucp affects the meanings of \d, \s, \w + and their uppercase partners, just as it does when they appear outside a + character class, as described in section + Generic Character + Types earlier. The escape sequence \b has a different meaning + inside a character class; it matches the backspace character. The + sequences \B, \N, \R, and \X are not special inside a character class. + Like any other unrecognized escape sequences, they are treated as the + literal characters "B", "N", "R", and "X".

+ +

A circumflex can conveniently be used with the uppercase character types + to specify a more restricted set of characters than the matching lowercase + type. For example, class [^\W_] matches any letter or digit, but not + underscore, while [\w] includes underscore. A positive character class + is to be read as "something OR something OR ..." and a negative class as + "NOT something AND NOT something AND NOT ...".

+ +

Only the following metacharacters are recognized in character + classes:

+ + + Backslash + Hyphen (only where it can be interpreted as specifying a + range) + Circumflex (only at the start) + Opening square bracket (only when it can be interpreted as + introducing a Posix class name; see the next section) + Terminating closing square bracket + + +

However, escaping other non-alphanumeric characters does no harm.

+
-

match exactly the same set of strings. Because alternative branches are tried -from left to right, and options are not reset until the end of the subpattern -is reached, an option setting in one branch does affect subsequent branches, so -the above patterns match "SUNDAY" as well as "Saturday".

+
+ + Posix Character Classes +

Perl supports the Posix notation for character classes. This uses names + enclosed by [: and :] within the enclosing square brackets. PCRE also + supports this notation. For example, the following matches "0", "1", any + alphabetic character, or "%":

+ + +[01[:alpha:]%] + +

The following are the supported class names:

+ + + alnumLetters and digits + alphaLetters + asciiCharacter codes 0-127 + blankSpace or tab only + cntrlControl characters + digitDecimal digits (same as \d) + graphPrinting characters, excluding space + lowerLowercase letters + printPrinting characters, including space + punctPrinting characters, excluding letters, digits, and + space + spaceWhitespace (not quite the same as \s) + upperUppercase letters + word"Word" characters (same as \w) + xdigitHexadecimal digits + + +

The "space" characters are HT (9), LF (10), VT (11), FF (12), CR (13), + and space (32). Notice that this list includes the VT character (code 11). + This makes "space" different to \s, which does not include VT (for Perl + compatibility).

+ +

The name "word" is a Perl extension, and "blank" is a GNU extension from + Perl 5.8. Another Perl extension is negation, which is indicated by a ^ + character after the colon. For example, the following matches "1", "2", + or any non-digit:

+ + +[12[:^digit:]] + +

PCRE (and Perl) also recognize the Posix syntax [.ch.] and [=ch=] where + "ch" is a "collating element", but these are not supported, and an error + is given if they are encountered.

+ +

By default, in UTF modes, characters with values > 255 do not match + any of the Posix character classes. However, if option PCRE_UCP is + passed to pcre_compile(), some of the classes are changed so that + Unicode character properties are used. This is achieved by replacing the + Posix classes by other sequences, as follows:

+ + + [:alnum:]Becomes \p{Xan} + [:alpha:]Becomes \p{L} + [:blank:]Becomes \h + [:digit:]Becomes \p{Nd} + [:lower:]Becomes \p{Ll} + [:space:]Becomes \p{Xps} + [:upper:]Becomes \p{Lu} + [:word:]Becomes \p{Xwd} + + +

Negated versions, such as [:^alpha:], use \P instead of \p. The other + Posix classes are unchanged, and match only characters with code points + < 256.

+
-
+
+ + Vertical Bar +

Vertical bar characters are used to separate alternative patterns. For + example, the following pattern matches either "gilbert" or "sullivan":

+ + +gilbert|sullivan + +

Any number of alternatives can appear, and an empty alternative is + permitted (matching the empty string). The matching process tries each + alternative in turn, from left to right, and the first that succeeds is + used. If the alternatives are within a subpattern (defined in section + Subpatterns), "succeeds" means + matching the remaining main pattern and the alternative in the + subpattern.

+
-
Duplicate subpattern numbers +
+ + Internal Option Setting +

The settings of the Perl-compatible options caseless, + multiline, dotall, and extended can be changed from + within the pattern by a sequence of Perl option letters enclosed between + "(?" and ")". The option letters are as follows:

+ + + iFor caseless + mFor multiline + sFor dotall + xFor extended + + +

For example, (?im) sets caseless, multiline matching. These + options can also be unset by preceding the letter with a hyphen. A + combined setting and unsetting such as (?im-sx), which sets + caseless and multiline, while unsetting dotall and + extended, is also permitted. If a letter appears both before and + after the hyphen, the option is unset.

+ +

The PCRE-specific options dupnames, ungreedy, and + extra can be changed in the same way as the Perl-compatible + options by using the characters J, U, and X respectively.

+ +

When one of these option changes occurs at top-level (that is, not inside + subpattern parentheses), the change applies to the remainder of the + pattern that follows. If the change is placed right at the start of a + pattern, PCRE extracts it into the global options.

+

An option change within a subpattern (see section + Subpatterns) affects only that part of + the subpattern that follows it. So, the following matches abc and aBc and + no other strings (assuming caseless is not used):

+ + +(a(?i)b)c + +

By this means, options can be made to have different settings in + different parts of the pattern. Any changes made in one alternative do + carry on into subsequent branches within the same subpattern. For + example:

+ + +(a(?i)b|c) + +

matches "ab", "aB", "c", and "C", although when matching "C" the first + branch is abandoned before the option setting. This is because the effects + of option settings occur at compile time. There would be some weird + behavior otherwise.

-

Perl 5.10 introduced a feature whereby each alternative in a subpattern uses -the same numbers for its capturing parentheses. Such a subpattern starts with -(?| and is itself a non-capturing subpattern. For example, consider this -pattern:

+ +

Other PCRE-specific options can be set by the application when the + compiling or matching functions are called. Sometimes the pattern can + contain special leading sequences, such as (*CRLF), to override what + the application has set or what has been defaulted. Details are provided + in section + Newline Sequences earlier.

+

The (*UTF8) and (*UCP) leading sequences can be used to set UTF and + Unicode property modes. They are equivalent to setting options + unicode and ucp, respectively. The (*UTF) sequence is a + generic version that can be used with any of the libraries. However, + the application can set option never_utf, which locks out the + use of the (*UTF) sequences.

+ +
-

(?|(Sat)ur|(Sun))day

 +
+ + Subpatterns +

Subpatterns are delimited by parentheses (round brackets), which can be + nested. Turning part of a pattern into a subpattern does two things:

-

Because the two alternatives are inside a (?| group, both sets of capturing -parentheses are numbered one. Thus, when the pattern matches, you can look -at captured substring number one, whichever alternative matched. This construct -is useful when you want to capture part, but not all, of one of a number of -alternatives. Inside a (?| group, parentheses are numbered as usual, but the -number is reset at the start of each branch. The numbers of any capturing -parentheses that follow the subpattern start after the highest number used in -any branch. The following example is taken from the Perl documentation. The -numbers underneath show in which buffer the captured content will be stored.

+ + 1. + +

It localizes a set of alternatives. For example, the following + pattern matches "cataract", "caterpillar", or "cat":

+ +cat(aract|erpillar|) +

Without the parentheses, it would match "cataract", "erpillar", or an + empty string.

+ + 2. + +

It sets up the subpattern as a capturing subpattern. That is, when + the complete pattern matches, that portion of the subject string that + matched the subpattern is passed back to the caller through the + return value of run/3.

+ + + +

Opening parentheses are counted from left to right (starting from 1) to + obtain numbers for the capturing subpatterns. For example, if the string + "the red king" is matched against the following pattern, the captured + substrings are "red king", "red", and "king", and are numbered 1, 2, and + 3, respectively:

+ + +the ((red|white) (king|queen)) + +

It is not always helpful that plain parentheses fulfill two functions. + Often a grouping subpattern is required without a capturing requirement. + If an opening parenthesis is followed by a question mark and a colon, the + subpattern does not do any capturing, and is not counted when computing + the number of any subsequent capturing subpatterns. For example, if the + string "the white queen" is matched against the following pattern, the + captured substrings are "white queen" and "queen", and are numbered 1 and + 2:

+ + +the ((?:red|white) (king|queen)) + +

The maximum number of capturing subpatterns is 65535.

+ +

As a convenient shorthand, if any option settings are required at the + start of a non-capturing subpattern, the option letters can appear between + "?" and ":". Thus, the following two patterns match the same set of + strings:

+ + +(?i:saturday|sunday) +(?:(?i)saturday|sunday) + +

As alternative branches are tried from left to right, and options are not + reset until the end of the subpattern is reached, an option setting in one + branch does affect subsequent branches, so the above patterns match both + "SUNDAY" and "Saturday".

+
- - # before ---------------branch-reset----------- after - / ( a ) (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x - # 1 2 2 3 2 3 4 - -

A back reference to a numbered subpattern uses the most recent value that is -set for that number by any subpattern. The following pattern matches "abcabc" -or "defdef":

- -

/(?|(abc)|(def))\1/

 - -

In contrast, a subroutine call to a numbered subpattern always refers to the -first one in the pattern with the given number. The following pattern matches -"abcabc" or "defabc":

- -

/(?|(abc)|(def))(?1)/

 - -

If a condition test -for a subpattern's having matched refers to a non-unique number, the test is -true if any of the subpatterns of that number have matched.

- -

An alternative approach to using this "branch reset" feature is to use -duplicate named subpatterns, as described in the next section.

- -
- -
Named subpatterns - -

Identifying capturing parentheses by number is simple, but it can be very hard -to keep track of the numbers in complicated regular expressions. Furthermore, -if an expression is modified, the numbers may change. To help with this -difficulty, PCRE supports the naming of subpatterns. This feature was not -added to Perl until release 5.10. Python had the feature earlier, and PCRE -introduced it at release 4.0, using the Python syntax. PCRE now supports both -the Perl and the Python syntax. Perl allows identically numbered subpatterns to -have different names, but PCRE does not.

- -

In PCRE, a subpattern can be named in one of three ways: -(?<name>...) or (?'name'...) as in Perl, or (?P<name>...) -as in Python. References to capturing parentheses from other parts of -the pattern, such as back references, recursion, and conditions, can be -made by name as well as by number.

- -

Names consist of up to 32 alphanumeric characters and underscores. Named -capturing parentheses are still allocated numbers as well as names, exactly as -if the names were not present. - -The capture specification to re:run/3 can use named values if they are present in the regular expression. -

- -

By default, a name must be unique within a pattern, but it is possible to relax -this constraint by setting the dupnames option at compile time. (Duplicate -names are also always permitted for subpatterns with the same number, set up as -described in the previous section.) Duplicate names can be useful for patterns -where only one instance of the named parentheses can match. Suppose you want to -match the name of a weekday, either as a 3-letter abbreviation or as the full -name, and in both cases you want to extract the abbreviation. This pattern -(ignoring the line breaks) does the job:

+
+ + Duplicate Subpattern Numbers +

Perl 5.10 introduced a feature where each alternative in a subpattern + uses the same numbers for its capturing parentheses. Such a subpattern + starts with (?| and is itself a non-capturing subpattern. For + example, consider the following pattern:

+ + +(?|(Sat)ur|(Sun))day + +

As the two alternatives are inside a (?| group, both sets of + capturing parentheses are numbered one. Thus, when the pattern matches, + you can look at captured substring number one, whichever alternative + matched. This construct is useful when you want to capture a part, but + not all, of one of many alternatives. Inside a (?| group, + parentheses are numbered as usual, but the number is reset at the start + of each branch. The numbers of any capturing parentheses that follow the + subpattern start after the highest number used in any branch. + The following example is from the Perl documentation; the numbers + underneath show in which buffer the captured content is stored:

- (?<DN>Mon|Fri|Sun)(?:day)?| - (?<DN>Tue)(?:sday)?| - (?<DN>Wed)(?:nesday)?| - (?<DN>Thu)(?:rsday)?| - (?<DN>Sat)(?:urday)? - -

There are five capturing substrings, but only one is ever set after a match. -(An alternative way of solving this problem is to use a "branch reset" -subpattern, as described in the previous section.)

- - - -

In case of capturing named subpatterns which names are not unique, the first matching occurrence (counted from left to right in the subject) is returned from re:exec/3, if the name is specified in the values part of the capture statement. The all_names capturing value will match all of the names in the same way.

- -

Warning: You cannot use different names to distinguish between two -subpatterns with the same number because PCRE uses only the numbers when -matching. For this reason, an error is given at compile time if different names -are given to subpatterns with the same number. However, you can give the same -name to subpatterns with the same number, even when dupnames is not set.

- -
- -
Repetition - -

Repetition is specified by quantifiers, which can follow any of the -following items:

- - - a literal data character - the dot metacharacter - the \C escape sequence - the \X escape sequence - the \R escape sequence - an escape such as \d or \pL that matches a single character - a character class - a back reference (see next section) - a parenthesized subpattern (including assertions) - a subroutine call to a subpattern (recursive or otherwise) - - -

The general repetition quantifier specifies a minimum and maximum number of -permitted matches, by giving the two numbers in curly brackets (braces), -separated by a comma. The numbers must be less than 65536, and the first must -be less than or equal to the second. For example:

- -

z{2,4}

 - -

matches "zz", "zzz", or "zzzz". A closing brace on its own is not a special -character. If the second number is omitted, but the comma is present, there is -no upper limit; if the second number and the comma are both omitted, the -quantifier specifies an exact number of required matches. Thus

- -

[aeiou]{3,}

 - -

matches at least 3 successive vowels, but may match many more, while

- -

\d{8}

 - -

matches exactly 8 digits. An opening curly bracket that appears in a position -where a quantifier is not allowed, or one that does not match the syntax of a -quantifier, is taken as a literal character. For example, {,6} is not a -quantifier, but a literal string of four characters.

- -

In Unicode mode, quantifiers apply to characters rather than to individual data -units. Thus, for example, \x{100}{2} matches two characters, each of -which is represented by a two-byte sequence in a UTF-8 string. Similarly, -\X{3} matches three Unicode extended grapheme clusters, each of which may be -several data units long (and they may be of different lengths).

-

The quantifier {0} is permitted, causing the expression to behave as if the -previous item and the quantifier were not present. This may be useful for -subpatterns that are referenced as subroutines -from elsewhere in the pattern (but see also the section entitled -"Defining subpatterns for use by reference only" -below). Items other than subpatterns that have a {0} quantifier are omitted -from the compiled pattern.

- -

For convenience, the three most common quantifiers have single-character -abbreviations:

- - - * is equivalent to {0,} - + is equivalent to {1,} - ? is equivalent to {0,1} - - -

It is possible to construct infinite loops by following a -subpattern that can match no characters with a quantifier that has no -upper limit, for example:

- -

(a?)*

 - -

Earlier versions of Perl and PCRE used to give an error at compile time for -such patterns. However, because there are cases where this can be useful, such -patterns are now accepted, but if any repetition of the subpattern does in fact -match no characters, the loop is forcibly broken.

- -

By default, the quantifiers are "greedy", that is, they match as much as -possible (up to the maximum number of permitted times), without causing the -rest of the pattern to fail. The classic example of where this gives problems -is in trying to match comments in C programs. These appear between /* and */ -and within the comment, individual * and / characters may appear. An attempt to -match C comments by applying the pattern

- -

/\*.*\*/

 - -

to the string

- -

/* first comment */ not comment /* second comment */

 - -

fails, because it matches the entire string owing to the greediness of the .* -item.

- -

However, if a quantifier is followed by a question mark, it ceases to be -greedy, and instead matches the minimum number of times possible, so the -pattern

- -

/\*.*?\*/

 - -

does the right thing with the C comments. The meaning of the various -quantifiers is not otherwise changed, just the preferred number of matches. -Do not confuse this use of question mark with its use as a quantifier in its -own right. Because it has two uses, it can sometimes appear doubled, as in

- -

\d??\d

 - -

which matches one digit by preference, but can match two if that is the only -way the rest of the pattern matches.

- -

If the ungreedy option is set (an option that is not available in Perl), -the quantifiers are not greedy by default, but individual ones can be made -greedy by following them with a question mark. In other words, it inverts the -default behaviour.

- -

When a parenthesized subpattern is quantified with a minimum repeat count that -is greater than 1 or with a limited maximum, more memory is required for the -compiled pattern, in proportion to the size of the minimum or maximum.

- -

If a pattern starts with .* or .{0,} and the dotall option (equivalent -to Perl's /s) is set, thus allowing the dot to match newlines, the pattern is -implicitly anchored, because whatever follows will be tried against every -character position in the subject string, so there is no point in retrying the -overall match at any position after the first. PCRE normally treats such a -pattern as though it were preceded by \A.

- -

In cases where it is known that the subject string contains no newlines, it is -worth setting dotall in order to obtain this optimization, or -alternatively using ^ to indicate anchoring explicitly.

- -

However, there are some cases where the optimization cannot be used. When .* -is inside capturing parentheses that are the subject of a back reference -elsewhere in the pattern, a match at the start may fail where a later one -succeeds. Consider, for example:

- -

(.*)abc\1

 - -

If the subject is "xyz123abc123" the match point is the fourth character. For -this reason, such a pattern is not implicitly anchored.

- -

Another case where implicit anchoring is not applied is when the leading .* is -inside an atomic group. Once again, a match at the start may fail where a later -one succeeds. Consider this pattern:

- -

(?>.*?a)b

 - -

It matches "ab" in the subject "aab". The use of the backtracking control verbs -(*PRUNE) and (*SKIP) also disable this optimization.

- -

When a capturing subpattern is repeated, the value captured is the substring -that matched the final iteration. For example, after

- -

(tweedle[dume]{3}\s*)+

 - -

has matched "tweedledum tweedledee" the value of the captured substring is -"tweedledee". However, if there are nested capturing subpatterns, the -corresponding captured values may have been set in previous iterations. For -example, after

- -

/(a|(b))+/

 - -

matches "aba" the value of the second captured substring is "b".

- - -
- -
Atomic grouping and possessive quantifiers +# before ---------------branch-reset----------- after +/ ( a ) (?| x ( y ) z | (p (q) r) | (t) u (v) ) ( z ) /x +# 1 2 2 3 2 3 4 -

With both maximizing ("greedy") and minimizing ("ungreedy" or "lazy") -repetition, failure of what follows normally causes the repeated item to be -re-evaluated to see if a different number of repeats allows the rest of the -pattern to match. Sometimes it is useful to prevent this, either to change the -nature of the match, or to cause it fail earlier than it otherwise might, when -the author of the pattern knows there is no point in carrying on.

+

A back reference to a numbered subpattern uses the most recent value that + is set for that number by any subpattern. The following pattern matches + "abcabc" or "defdef":

-

Consider, for example, the pattern \d+foo when applied to the subject line

+ +/(?|(abc)|(def))\1/ -

123456bar

 +

In contrast, a subroutine call to a numbered subpattern always refers to + the first one in the pattern with the given number. The following pattern + matches "abcabc" or "defabc":

-

After matching all 6 digits and then failing to match "foo", the normal -action of the matcher is to try again with only 5 digits matching the \d+ -item, and then with 4, and so on, before ultimately failing. "Atomic grouping" -(a term taken from Jeffrey Friedl's book) provides the means for specifying -that once a subpattern has matched, it is not to be re-evaluated in this way.

+ +/(?|(abc)|(def))(?1)/ -

If we use atomic grouping for the previous example, the matcher gives up -immediately on failing to match "foo" the first time. The notation is a kind of -special parenthesis, starting with (?> as in this example:

+

If a condition test for a subpattern having matched refers to a + non-unique number, the test is true if any of the subpatterns of that + number have matched.

-

(?>\d+)foo

 - -

This kind of parenthesis "locks up" the part of the pattern it contains once -it has matched, and a failure further into the pattern is prevented from -backtracking into it. Backtracking past it to previous items, however, works as -normal.

- -

An alternative description is that a subpattern of this type matches the string -of characters that an identical standalone pattern would match, if anchored at -the current point in the subject string.

- -

Atomic grouping subpatterns are not capturing subpatterns. Simple cases such as -the above example can be thought of as a maximizing repeat that must swallow -everything it can. So, while both \d+ and \d+? are prepared to adjust the -number of digits they match in order to make the rest of the pattern match, -(?>\d+) can only match an entire sequence of digits.

- -

Atomic groups in general can of course contain arbitrarily complicated -subpatterns, and can be nested. However, when the subpattern for an atomic -group is just a single repeated item, as in the example above, a simpler -notation, called a "possessive quantifier" can be used. This consists of an -additional + character following a quantifier. Using this notation, the -previous example can be rewritten as

- -

\d++foo

 - -

Note that a possessive quantifier can be used with an entire group, for -example:

- -

(abc|xyz){2,3}+

 - -

Possessive quantifiers are always greedy; the setting of the ungreedy -option is ignored. They are a convenient notation for the simpler forms of -atomic group. However, there is no difference in the meaning of a possessive -quantifier and the equivalent atomic group, though there may be a performance -difference; possessive quantifiers should be slightly faster.

- -

The possessive quantifier syntax is an extension to the Perl 5.8 syntax. -Jeffrey Friedl originated the idea (and the name) in the first edition of his -book. Mike McCloskey liked it, so implemented it when he built Sun's Java -package, and PCRE copied it from there. It ultimately found its way into Perl -at release 5.10.

- -

PCRE has an optimization that automatically "possessifies" certain simple -pattern constructs. For example, the sequence A+B is treated as A++B because -there is no point in backtracking into a sequence of A's when B must follow.

+

An alternative approach using this "branch reset" feature is to use + duplicate named subpatterns, as described in the next section.

+
-

When a pattern contains an unlimited repeat inside a subpattern that can itself -be repeated an unlimited number of times, the use of an atomic group is the -only way to avoid some failing matches taking a very long time indeed. The -pattern

+
+ + Named Subpatterns +

Identifying capturing parentheses by number is simple, but it can be + hard to keep track of the numbers in complicated regular expressions. + Also, if an expression is modified, the numbers can change. To help with + this difficulty, PCRE supports the naming of subpatterns. This feature was + not added to Perl until release 5.10. Python had the feature earlier, and + PCRE introduced it at release 4.0, using the Python syntax. PCRE now + supports both the Perl and the Python syntax. Perl allows identically + numbered subpatterns to have different names, but PCRE does not.

+ +

In PCRE, a subpattern can be named in one of three ways: + (?<name>...) or (?'name'...) as in Perl, or + (?P<name>...) as in Python. References to capturing + parentheses from other parts of the pattern, such as back references, + recursion, and conditions, can be made by name and by number.

+ +

Names consist of up to 32 alphanumeric characters and underscores. Named + capturing parentheses are still allocated numbers as well as names, + exactly as if the names were not present. + The capture specification to + run/3 can use named values if they are present in the + regular expression.

-

(\D+|<\d+>)*[!?]

 +

By default, a name must be unique within a pattern, but this constraint + can be relaxed by setting option dupnames at compile time. + (Duplicate names are also always permitted for subpatterns with the same + number, set up as described in the previous section.) Duplicate names can + be useful for patterns where only one instance of the named parentheses + can match. Suppose that you want to match the name of a weekday, either as + a 3-letter abbreviation or as the full name, and in both cases you want to + extract the abbreviation. The following pattern (ignoring the line + breaks) does the job:

+ + +(?<DN>Mon|Fri|Sun)(?:day)?| +(?<DN>Tue)(?:sday)?| +(?<DN>Wed)(?:nesday)?| +(?<DN>Thu)(?:rsday)?| +(?<DN>Sat)(?:urday)? + +

There are five capturing substrings, but only one is ever set after a + match. (An alternative way of solving this problem is to use a "branch + reset" subpattern, as described in the previous section.)

+ +

For capturing named subpatterns which names are not unique, the first + matching occurrence (counted from left to right in the subject) is + returned from run/3, if the name + is specified in the values part of the capture statement. + The all_names capturing value matches all the names in the same + way.

-

matches an unlimited number of substrings that either consist of non-digits, or -digits enclosed in <>, followed by either ! or ?. When it matches, it runs -quickly. However, if it is applied to

+ +

You cannot use different names to distinguish between two subpatterns + with the same number, as PCRE uses only the numbers when matching. For + this reason, an error is given at compile time if different names are + specified to subpatterns with the same number. However, you can specify + the same name to subpatterns with the same number, even when + dupnames is not set.

+ +
-

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

 +
+ + Repetition +

Repetition is specified by quantifiers, which can follow any of the + following items:

+ + + A literal data character + The dot metacharacter + The \C escape sequence + The \X escape sequence + The \R escape sequence + An escape such as \d or \pL that matches a single character + A character class + A back reference (see the next section) + A parenthesized subpattern (including assertions) + A subroutine call to a subpattern (recursive or otherwise) + + +

The general repetition quantifier specifies a minimum and maximum number + of permitted matches, by giving the two numbers in curly brackets + (braces), separated by a comma. The numbers must be < 65536, and the + first must be less than or equal to the second. For example, the following + matches "zz", "zzz", or "zzzz":

+ + +z{2,4} + +

A closing brace on its own is not a special character. If the second + number is omitted, but the comma is present, there is no upper limit. If + the second number and the comma are both omitted, the quantifier specifies + an exact number of required matches. Thus, the following matches at least + three successive vowels, but can match many more:

+ + +[aeiou]{3,} + +

The following matches exactly eight digits:

+ + +\d{8} + +

An opening curly bracket that appears in a position where a quantifier is + not allowed, or one that does not match the syntax of a quantifier, is + taken as a literal character. For example, {,6} is not a quantifier, but a + literal string of four characters.

+ +

In Unicode mode, quantifiers apply to characters rather than to + individual data units. Thus, for example, \x{100}{2} matches two + characters, each of which is represented by a 2-byte sequence in a + UTF-8 string. Similarly, \X{3} matches three Unicode extended grapheme + clusters, each of which can be many data units long (and they can be of + different lengths).

+ +

The quantifier {0} is permitted, causing the expression to behave as if + the previous item and the quantifier were not present. This can be useful + for subpatterns that are referenced as subroutines from elsewhere in the + pattern (but see also section + Defining Subpatterns for Use by Reference Only). Items other + than subpatterns that have a {0} quantifier are omitted from the compiled + pattern.

+ +

For convenience, the three most common quantifiers have single-character + abbreviations:

+ + + *Equivalent to {0,} + +Equivalent to {1,} + ?Equivalent to {0,1} + + +

Infinite loops can be constructed by following a subpattern that can + match no characters with a quantifier that has no upper limit, for + example:

+ + +(a?)* + +

Earlier versions of Perl and PCRE used to give an error at compile time + for such patterns. However, as there are cases where this can be useful, + such patterns are now accepted. However, if any repetition of the + subpattern matches no characters, the loop is forcibly broken.

+ +

By default, the quantifiers are "greedy", that is, they match as much as + possible (up to the maximum number of permitted times), without causing + the remaining pattern to fail. The classic example of where this gives + problems is in trying to match comments in C programs. These appear + between /* and */. Within the comment, individual * and / characters can + appear. An attempt to match C comments by applying the pattern

+ + +/\*.*\*/ + +

to the string

+ + +/* first comment */ not comment /* second comment */ + +

fails, as it matches the entire string owing to the greediness of the .* + item.

+ +

However, if a quantifier is followed by a question mark, it ceases to be + greedy, and instead matches the minimum number of times possible, so the + following pattern does the right thing with the C comments:

+ + +/\*.*?\*/ + +

The meaning of the various quantifiers is not otherwise changed, only + the preferred number of matches. Do not confuse this use of question mark + with its use as a quantifier in its own right. As it has two uses, it can + sometimes appear doubled, as in

+ + +\d??\d + +

which matches one digit by preference, but can match two if that is the + only way the remaining pattern matches.

-

it takes a long time before reporting failure. This is because the string can -be divided between the internal \D+ repeat and the external * repeat in a -large number of ways, and all have to be tried. (The example uses [!?] rather -than a single character at the end, because both PCRE and Perl have an -optimization that allows for fast failure when a single character is used. They -remember the last single character that is required for a match, and fail early -if it is not present in the string.) If the pattern is changed so that it uses -an atomic group, like this:

+

If option ungreedy is set (an option that is not available in + Perl), the quantifiers are not greedy by default, but individual ones can + be made greedy by following them with a question mark. That is, it inverts + the default behavior.

-

((?>\D+)|<\d+>)*[!?]

 +

When a parenthesized subpattern is quantified with a minimum repeat count + that is > 1 or with a limited maximum, more memory is required for the + compiled pattern, in proportion to the size of the minimum or maximum.

-

sequences of non-digits cannot be broken, and failure happens quickly.

- -
- -
Back references - -

Outside a character class, a backslash followed by a digit greater than 0 (and -possibly further digits) is a back reference to a capturing subpattern earlier -(that is, to its left) in the pattern, provided there have been that many -previous capturing left parentheses.

- -

However, if the decimal number following the backslash is less than 10, it is -always taken as a back reference, and causes an error only if there are not -that many capturing left parentheses in the entire pattern. In other words, the -parentheses that are referenced need not be to the left of the reference for -numbers less than 10. A "forward back reference" of this type can make sense -when a repetition is involved and the subpattern to the right has participated -in an earlier iteration.

- -

It is not possible to have a numerical "forward back reference" to -a subpattern whose number is 10 or more using this syntax because a -sequence such as \50 is interpreted as a character defined in -octal. See the subsection entitled "Non-printing characters" above for -further details of the handling of digits following a backslash. There -is no such problem when named parentheses are used. A back reference -to any subpattern is possible using named parentheses (see below).

- -

Another way of avoiding the ambiguity inherent in the use of digits following a -backslash is to use the \g escape sequence. This escape must be followed by an -unsigned number or a negative number, optionally enclosed in braces. These -examples are all identical:

- - - (ring), \1 - (ring), \g1 - (ring), \g{1} - - -

An unsigned number specifies an absolute reference without the -ambiguity that is present in the older syntax. It is also useful when -literal digits follow the reference. A negative number is a relative -reference. Consider this example:

- -

(abc(def)ghi)\g{-1}

 - -

The sequence \g{-1} is a reference to the most recently started capturing -subpattern before \g, that is, is it equivalent to \2 in this example. -Similarly, \g{-2} would be equivalent to \1. The use of relative references -can be helpful in long patterns, and also in patterns that are created by -joining together fragments that contain references within themselves.

- -

A back reference matches whatever actually matched the capturing -subpattern in the current subject string, rather than anything -matching the subpattern itself (see "Subpatterns as subroutines" below -for a way of doing that). So the pattern

- -

(sens|respons)e and \1ibility

 - -

matches "sense and sensibility" and "response and responsibility", but not -"sense and responsibility". If caseful matching is in force at the time of the -back reference, the case of letters is relevant. For example,

- -

((?i)rah)\s+\1

 - -

matches "rah rah" and "RAH RAH", but not "RAH rah", even though the original -capturing subpattern is matched caselessly.

- -

There are several different ways of writing back references to named -subpatterns. The .NET syntax \k{name} and the Perl syntax \k<name> or -\k'name' are supported, as is the Python syntax (?P=name). Perl 5.10's unified -back reference syntax, in which \g can be used for both numeric and named -references, is also supported. We could rewrite the above example in any of -the following ways:

- - - (?<p1>(?i)rah)\s+\k<p1> - (?'p1'(?i)rah)\s+\k{p1} - (?P<p1>(?i)rah)\s+(?P=p1) - (?<p1>(?i)rah)\s+\g{p1} - - -

A subpattern that is referenced by name may appear in the pattern before or -after the reference.

- -

There may be more than one back reference to the same subpattern. If a -subpattern has not actually been used in a particular match, any back -references to it always fail. For example, the pattern

- -

(a|(bc))\2

 - -

always fails if it starts to match "a" rather than "bc". Because -there may be many capturing parentheses in a pattern, all digits -following the backslash are taken as part of a potential back -reference number. If the pattern continues with a digit character, -some delimiter must be used to terminate the back reference. If the -extended option is set, this can be whitespace. Otherwise an -empty comment (see "Comments" below) can be used.

- -

Recursive back references

- -

A back reference that occurs inside the parentheses to which it refers fails -when the subpattern is first used, so, for example, (a\1) never matches. -However, such references can be useful inside repeated subpatterns. For -example, the pattern

- -

(a|b\1)+

 - -

matches any number of "a"s and also "aba", "ababbaa" etc. At each iteration of -the subpattern, the back reference matches the character string corresponding -to the previous iteration. In order for this to work, the pattern must be such -that the first iteration does not need to match the back reference. This can be -done using alternation, as in the example above, or by a quantifier with a -minimum of zero.

- -

Back references of this type cause the group that they reference to be treated -as an atomic group. -Once the whole group has been matched, a subsequent matching failure cannot -cause backtracking into the middle of the group.

- -
- -
Assertions - -

An assertion is a test on the characters following or preceding the current -matching point that does not actually consume any characters. The simple -assertions coded as \b, \B, \A, \G, \Z, \z, ^ and $ are described -above.

- - -

More complicated assertions are coded as subpatterns. There are two kinds: -those that look ahead of the current position in the subject string, and those -that look behind it. An assertion subpattern is matched in the normal way, -except that it does not cause the current matching position to be changed.

- -

Assertion subpatterns are not capturing subpatterns. If such an assertion -contains capturing subpatterns within it, these are counted for the purposes of -numbering the capturing subpatterns in the whole pattern. However, substring -capturing is carried out only for positive assertions. (Perl sometimes, but not -always, does do capturing in negative assertions.)

- -

For compatibility with Perl, assertion subpatterns may be repeated; though -it makes no sense to assert the same thing several times, the side effect of -capturing parentheses may occasionally be useful. In practice, there only three -cases:

- - -(1) If the quantifier is {0}, the assertion is never obeyed during matching. -However, it may contain internal capturing parenthesized groups that are called -from elsewhere via the subroutine mechanism. -(2) If quantifier is {0,n} where n is greater than zero, it is treated as if it -were {0,1}. At run time, the rest of the pattern match is tried with and -without the assertion, the order depending on the greediness of the quantifier. -(3) If the minimum repetition is greater than zero, the quantifier is ignored. -The assertion is obeyed just once when encountered during matching. - +

If a pattern starts with .* or .{0,} and option dotall (equivalent + to Perl option /s) is set, thus allowing the dot to match newlines, + the pattern is implicitly anchored, because whatever follows is tried + against every character position in the subject string. So, there is no + point in retrying the overall match at any position after the first. PCRE + normally treats such a pattern as if it was preceded by \A.

-

Lookahead assertions

+

In cases where it is known that the subject string contains no newlines, + it is worth setting dotall to obtain this optimization, or + alternatively using ^ to indicate anchoring explicitly.

-

Lookahead assertions start with (?= for positive assertions and (?! for -negative assertions. For example,

+

However, there are some cases where the optimization cannot be used. When + .* is inside capturing parentheses that are the subject of a back + reference elsewhere in the pattern, a match at the start can fail where a + later one succeeds. Consider, for example:

+ + +(.*)abc\1 -

\w+(?=;)

 +

If the subject is "xyz123abc123", the match point is the fourth + character. Therefore, such a pattern is not implicitly anchored.

-

matches a word followed by a semicolon, but does not include the semicolon in -the match, and

+

Another case where implicit anchoring is not applied is when the leading + .* is inside an atomic group. Once again, a match at the start can fail + where a later one succeeds. Consider the following pattern:

-

foo(?!bar)

 + +(?>.*?a)b -

matches any occurrence of "foo" that is not followed by "bar". Note that the -apparently similar pattern

+

It matches "ab" in the subject "aab". The use of the backtracking control + verbs (*PRUNE) and (*SKIP) also disable this optimization.

-

(?!foo)bar

 +

When a capturing subpattern is repeated, the value captured is the + substring that matched the final iteration. For example, after

-

does not find an occurrence of "bar" that is preceded by something other than -"foo"; it finds any occurrence of "bar" whatsoever, because the assertion -(?!foo) is always true when the next three characters are "bar". A -lookbehind assertion is needed to achieve the other effect.

+ +(tweedle[dume]{3}\s*)+ -

If you want to force a matching failure at some point in a pattern, the most -convenient way to do it is with (?!) because an empty string always matches, so -an assertion that requires there not to be an empty string must always fail. -The backtracking control verb (*FAIL) or (*F) is a synonym for (?!).

+

has matched "tweedledum tweedledee", the value of the captured substring + is "tweedledee". However, if there are nested capturing subpatterns, the + corresponding captured values can have been set in previous iterations. + For example, after

+ +/(a|(b))+/ -

Lookbehind assertions

+

matches "aba", the value of the second captured substring is "b".

+
-

Lookbehind assertions start with (?<= for positive assertions and (?<! for -negative assertions. For example,

+
+ + Atomic Grouping and Possessive Quantifiers +

With both maximizing ("greedy") and minimizing ("ungreedy" or "lazy") + repetition, failure of what follows normally causes the repeated item to + be re-evaluated to see if a different number of repeats allows the + remaining pattern to match. Sometimes it is useful to prevent this, either + to change the nature of the match, or to cause it to fail earlier than it + otherwise might, when the author of the pattern knows that there is no + point in carrying on.

+ +

Consider, for example, the pattern \d+foo when applied to the following + subject line:

+ + +123456bar + +

After matching all six digits and then failing to match "foo", the normal + action of the matcher is to try again with only five digits matching item + \d+, and then with four, and so on, before ultimately failing. "Atomic + grouping" (a term taken from Jeffrey Friedl's book) provides the means for + specifying that once a subpattern has matched, it is not to be + re-evaluated in this way.

+ +

If atomic grouping is used for the previous example, the matcher gives up + immediately on failing to match "foo" the first time. The notation is a + kind of special parenthesis, starting with (?> as in the + following example:

+ + +(?>\d+)foo + +

This kind of parenthesis "locks up" the part of the pattern it contains + once it has matched, and a failure further into the pattern is prevented + from backtracking into it. Backtracking past it to previous items, + however, works as normal.

+ +

An alternative description is that a subpattern of this type matches the + string of characters that an identical standalone pattern would match, if + anchored at the current point in the subject string.

+ +

Atomic grouping subpatterns are not capturing subpatterns. Simple cases + such as the above example can be thought of as a maximizing repeat that + must swallow everything it can. So, while both \d+ and \d+? are prepared + to adjust the number of digits they match to make the remaining pattern + match, (?>\d+) can only match an entire sequence of digits.

+ +

Atomic groups in general can contain any complicated + subpatterns, and can be nested. However, when the subpattern for an atomic + group is just a single repeated item, as in the example above, a simpler + notation, called a "possessive quantifier" can be used. This consists of + an extra + character following a quantifier. Using this notation, the + previous example can be rewritten as

+ + +\d++foo + +

Notice that a possessive quantifier can be used with an entire group, + for example:

+ + +(abc|xyz){2,3}+ + +

Possessive quantifiers are always greedy; the setting of option + ungreedy is ignored. They are a convenient notation for the simpler + forms of an atomic group. However, there is no difference in the meaning + of a possessive quantifier and the equivalent atomic group, but there can + be a performance difference; possessive quantifiers are probably slightly + faster.

+ +

The possessive quantifier syntax is an extension to the Perl 5.8 syntax. + Jeffrey Friedl originated the idea (and the name) in the first edition of + his book. Mike McCloskey liked it, so implemented it when he built the + Sun Java package, and PCRE copied it from there. It ultimately found its + way into Perl at release 5.10.

+ +

PCRE has an optimization that automatically "possessifies" certain simple + pattern constructs. For example, the sequence A+B is treated as A++B, as + there is no point in backtracking into a sequence of A:s when B must + follow.

+ +

When a pattern contains an unlimited repeat inside a subpattern that can + itself be repeated an unlimited number of times, the use of an atomic + group is the only way to avoid some failing matches taking a long time. + The pattern

+ + +(\D+|<\d+>)*[!?] + +

matches an unlimited number of substrings that either consist of + non-digits, or digits enclosed in <>, followed by ! or ?. When it + matches, it runs quickly. However, if it is applied to

+ + +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + +

it takes a long time before reporting failure. This is because the string + can be divided between the internal \D+ repeat and the external * repeat + in many ways, and all must be tried. (The example uses [!?] rather than a + single character at the end, as both PCRE and Perl have an optimization + that allows for fast failure when a single character is used. They + remember the last single character that is required for a match, and fail + early if it is not present in the string.) If the pattern is changed so + that it uses an atomic group, like the following, sequences of non-digits + cannot be broken, and failure happens quickly:

+ + +((?>\D+)|<\d+>)*[!?] +
-

(?<!foo)bar

 +
+ + Back References +

Outside a character class, a backslash followed by a digit > 0 (and + possibly further digits) is a back reference to a capturing subpattern + earlier (that is, to its left) in the pattern, provided there have been + that many previous capturing left parentheses.

+ +

However, if the decimal number following the backslash is < 10, it is + always taken as a back reference, and causes an error only if there are + not that many capturing left parentheses in the entire pattern. That is, + the parentheses that are referenced do need not be to the left of the + reference for numbers < 10. A "forward back reference" of this type can + make sense when a repetition is involved and the subpattern to the right + has participated in an earlier iteration.

+ +

It is not possible to have a numerical "forward back reference" to a + subpattern whose number is 10 or more using this syntax, as a sequence + such as \50 is interpreted as a character defined in octal. For more + details of the handling of digits following a backslash, see section + Non-Printing + Characters earlier. There is no such problem when named + parentheses are used. A back reference to any subpattern is possible + using named parentheses (see below).

+ +

Another way to avoid the ambiguity inherent in the use of digits + following a backslash is to use the \g escape sequence. This escape must + be followed by an unsigned number or a negative number, optionally + enclosed in braces. The following examples are identical:

+ + +(ring), \1 +(ring), \g1 +(ring), \g{1} + +

An unsigned number specifies an absolute reference without the ambiguity + that is present in the older syntax. It is also useful when literal digits + follow the reference. A negative number is a relative reference. Consider + the following example:

+ + +(abc(def)ghi)\g{-1} + +

The sequence \g{-1} is a reference to the most recently started capturing + subpattern before \g, that is, it is equivalent to \2 in this example. + Similarly, \g{-2} would be equivalent to \1. The use of relative + references can be helpful in long patterns, and also in patterns that are + created by joining fragments containing references within themselves.

+ +

A back reference matches whatever matched the capturing subpattern in the + current subject string, rather than anything matching the subpattern + itself (section Subpattern as + Subroutines describes a way of doing that). So, the + following pattern matches "sense and sensibility" and "response and + responsibility", but not "sense and responsibility":

+ + +(sens|respons)e and \1ibility + +

If caseful matching is in force at the time of the back reference, the + case of letters is relevant. For example, the following matches "rah rah" + and "RAH RAH", but not "RAH rah", although the original capturing + subpattern is matched caselessly:

+ + +((?i)rah)\s+\1 + +

There are many different ways of writing back references to named + subpatterns. The .NET syntax \k{name} and the Perl syntax + \k<name> or \k'name' are supported, as is the Python + syntax (?P=name). The unified back reference syntax in Perl 5.10, + in which \g can be used for both numeric and named references, is also + supported. The previous example can be rewritten in the following + ways:

+ + +(?<p1>(?i)rah)\s+\k<p1> +(?'p1'(?i)rah)\s+\k{p1} +(?P<p1>(?i)rah)\s+(?P=p1) +(?<p1>(?i)rah)\s+\g{p1} + +

A subpattern that is referenced by name can appear in the pattern before + or after the reference.

+ +

There can be more than one back reference to the same subpattern. If a + subpattern has not been used in a particular match, any back references to + it always fails. For example, the following pattern always fails if it + starts to match "a" rather than "bc":

+ + +(a|(bc))\2 + +

As there can be many capturing parentheses in a pattern, all digits + following the backslash are taken as part of a potential back reference + number. If the pattern continues with a digit character, some delimiter + must be used to terminate the back reference. If option extended is + set, this can be whitespace. Otherwise an empty comment (see section + Comments) can be used.

+ +

Recursive Back References

+ +

A back reference that occurs inside the parentheses to which it refers + fails when the subpattern is first used, so, for example, (a\1) never + matches. However, such references can be useful inside repeated + subpatterns. For example, the following pattern matches any number of + "a"s and also "aba", "ababbaa", and so on:

+ + +(a|b\1)+ + +

At each iteration of the subpattern, the back reference matches the + character string corresponding to the previous iteration. In order for + this to work, the pattern must be such that the first iteration does not + need to match the back reference. This can be done using alternation, as + in the example above, or by a quantifier with a minimum of zero.

+ +

Back references of this type cause the group that they reference to be + treated as an atomic group. Once the whole group has been matched, a + subsequent matching failure cannot cause backtracking into the middle of + the group.

+
-

does find an occurrence of "bar" that is not preceded by "foo". The contents of -a lookbehind assertion are restricted such that all the strings it matches must -have a fixed length. However, if there are several top-level alternatives, they -do not all have to have the same fixed length. Thus

+
+ + Assertions +

An assertion is a test on the characters following or preceding the + current matching point that does not consume any characters. The simple + assertions coded as \b, \B, \A, \G, \Z, \z, ^, and $ are described in + the previous sections.

+ +

More complicated assertions are coded as subpatterns. There are two + kinds: those that look ahead of the current position in the subject + string, and those that look behind it. An assertion subpattern is matched + in the normal way, except that it does not cause the current matching + position to be changed.

+ +

Assertion subpatterns are not capturing subpatterns. If such an assertion + contains capturing subpatterns within it, these are counted for the + purposes of numbering the capturing subpatterns in the whole pattern. + However, substring capturing is done only for positive assertions. (Perl + sometimes, but not always, performs capturing in negative assertions.)

+ +

For compatibility with Perl, assertion subpatterns can be repeated. + However, it makes no sense to assert the same thing many times, the side + effect of capturing parentheses can occasionally be useful. In practice, + there are only three cases:

+ + + +

If the quantifier is {0}, the assertion is never obeyed during + matching. However, it can contain internal capturing parenthesized + groups that are called from elsewhere through the subroutine + mechanism.

+ + +

If quantifier is {0,n}, where n > 0, it is treated as if it was + {0,1}. At runtime, the remaining pattern match is tried with and + without the assertion, the order depends on the greediness of the + quantifier.

+ + +

If the minimum repetition is > 0, the quantifier is ignored. The + assertion is obeyed only once when encountered during matching.

+ + -

(?<=bullock|donkey)

 +

Lookahead Assertions

-

is permitted, but

+

Lookahead assertions start with (?= for positive assertions and (?! for + negative assertions. For example, the following matches a word followed by + a semicolon, but does not include the semicolon in the match:

-

(?<!dogs?|cats?)

 + +\w+(?=;) -

causes an error at compile time. Branches that match different length strings -are permitted only at the top level of a lookbehind assertion. This is an -extension compared with Perl, which requires all branches to -match the same length of string. An assertion such as

+

The following matches any occurrence of "foo" that is not followed by + "bar":

-

(?<=ab(c|de))

 + +foo(?!bar) -

is not permitted, because its single top-level branch can match two different -lengths, but it is acceptable to PCRE if rewritten to use two top-level -branches:

+

Notice that the apparently similar pattern

-

(?<=abc|abde)

 + +(?!foo)bar -

In some cases, the escape sequence \K (see above) can be -used instead of a lookbehind assertion to get round the fixed-length -restriction.

+

does not find an occurrence of "bar" that is preceded by something other + than "foo". It finds any occurrence of "bar" whatsoever, as the assertion + (?!foo) is always true when the next three characters are "bar". A + lookbehind assertion is needed to achieve the other effect.

-

The implementation of lookbehind assertions is, for each alternative, to -temporarily move the current position back by the fixed length and then try to -match. If there are insufficient characters before the current position, the -assertion fails.

+

If you want to force a matching failure at some point in a pattern, the + most convenient way to do it is with (?!), as an empty string always + matches. So, an assertion that requires there is not to be an empty + string must always fail. The backtracking control verb (*FAIL) or (*F) is + a synonym for (?!).

-

In a UTF mode, PCRE does not allow the \C escape (which matches a single data -unit even in a UTF mode) to appear in lookbehind assertions, because it makes -it impossible to calculate the length of the lookbehind. The \X and \R -escapes, which can match different numbers of data units, are also not -permitted.

-

"Subroutine" calls (see below) such as (?2) or (?&X) are permitted in lookbehinds, as long -as the subpattern matches a fixed-length string. Recursion, -however, is not supported.

+

Lookbehind Assertions

-

Possessive quantifiers can be used in conjunction with lookbehind assertions to -specify efficient matching of fixed-length strings at the end of subject -strings. Consider a simple pattern such as

+

Lookbehind assertions start with (?<= for positive assertions and + (?<! for negative assertions. For example, the following finds an + occurrence of "bar" that is not preceded by "foo":

-

abcd$

 + +(?<!foo)bar -

when applied to a long string that does not match. Because matching proceeds -from left to right, PCRE will look for each "a" in the subject and then see if -what follows matches the rest of the pattern. If the pattern is specified as

+

The contents of a lookbehind assertion are restricted such that all the + strings it matches must have a fixed length. However, if there are many + top-level alternatives, they do not all have to have the same fixed + length. Thus, the following is permitted:

-

^.*abcd$

 + +(?<=bullock|donkey) -

the initial .* matches the entire string at first, but when this fails (because -there is no following "a"), it backtracks to match all but the last character, -then all but the last two characters, and so on. Once again the search for "a" -covers the entire string, from right to left, so we are no better off. However, -if the pattern is written as

+

The following causes an error at compile time:

-

^.*+(?<=abcd)

 + +(?<!dogs?|cats?) -

there can be no backtracking for the .*+ item; it can match only the entire -string. The subsequent lookbehind assertion does a single test on the last four -characters. If it fails, the match fails immediately. For long strings, this -approach makes a significant difference to the processing time.

+

Branches that match different length strings are permitted only at the + top-level of a lookbehind assertion. This is an extension compared with + Perl, which requires all branches to match the same length of string. An + assertion such as the following is not permitted, as its single top-level + branch can match two different lengths:

-

Using multiple assertions

+ +(?<=ab(c|de)) -

Several assertions (of any sort) may occur in succession. For example,

+

However, it is acceptable to PCRE if rewritten to use two top-level + branches:

-

(?<=\d{3})(?<!999)foo

 + +(?<=abc|abde) -

matches "foo" preceded by three digits that are not "999". Notice -that each of the assertions is applied independently at the same point -in the subject string. First there is a check that the previous three -characters are all digits, and then there is a check that the same -three characters are not "999". This pattern does not match -"foo" preceded by six characters, the first of which are digits and -the last three of which are not "999". For example, it doesn't match -"123abcfoo". A pattern to do that is

+

Sometimes the escape sequence \K (see above) can be used instead of + a lookbehind assertion to get round the fixed-length restriction.

-

(?<=\d{3}...)(?<!999)foo

 +

The implementation of lookbehind assertions is, for each alternative, to + move the current position back temporarily by the fixed length and then + try to match. If there are insufficient characters before the current + position, the assertion fails.

-

This time the first assertion looks at the preceding six -characters, checking that the first three are digits, and then the -second assertion checks that the preceding three characters are not -"999".

+

In a UTF mode, PCRE does not allow the \C escape (which matches a single + data unit even in a UTF mode) to appear in lookbehind assertions, as it + makes it impossible to calculate the length of the lookbehind. The \X and + \R escapes, which can match different numbers of data units, are not + permitted either.

-

Assertions can be nested in any combination. For example,

+

"Subroutine" calls (see below), such as (?2) or (?&X), are permitted + in lookbehinds, as long as the subpattern matches a fixed-length string. + Recursion, however, is not supported.

-

(?<=(?<!foo)bar)baz

 +

Possessive quantifiers can be used with lookbehind + assertions to specify efficient matching of fixed-length strings at the + end of subject strings. Consider the following simple pattern when applied + to a long string that does not match:

-

matches an occurrence of "baz" that is preceded by "bar" which in -turn is not preceded by "foo", while

+ +abcd$ -

(?<=\d{3}(?!999)...)foo

 +

As matching proceeds from left to right, PCRE looks for each "a" in the + subject and then sees if what follows matches the remaining pattern. If + the pattern is specified as

-

is another pattern that matches "foo" preceded by three digits and any three -characters that are not "999".

+ +^.*abcd$ -
+

the initial .* matches the entire string at first. However, when this + fails (as there is no following "a"), it backtracks to match all but the + last character, then all but the last two characters, and so on. Once + again the search for "a" covers the entire string, from right to left, so + we are no better off. However, if the pattern is written as

-
Conditional subpatterns + +^.*+(?<=abcd) -

It is possible to cause the matching process to obey a subpattern -conditionally or to choose between two alternative subpatterns, depending on -the result of an assertion, or whether a specific capturing subpattern has -already been matched. The two possible forms of conditional subpattern are:

+

there can be no backtracking for the .*+ item; it can match only the + entire string. The subsequent lookbehind assertion does a single test on + the last four characters. If it fails, the match fails immediately. For + long strings, this approach makes a significant difference to the + processing time.

- -(?(condition)yes-pattern) -(?(condition)yes-pattern|no-pattern) - +

Using Multiple Assertions

-

If the condition is satisfied, the yes-pattern is used; otherwise the -no-pattern (if present) is used. If there are more than two alternatives in the -subpattern, a compile-time error occurs. Each of the two alternatives may -itself contain nested subpatterns of any form, including conditional -subpatterns; the restriction to two alternatives applies only at the level of -the condition. This pattern fragment is an example where the alternatives are -complex:

+

Many assertions (of any sort) can occur in succession. For example, the + following matches "foo" preceded by three digits that are not "999":

-

(?(1) (A|B|C) | (D | (?(2)E|F) | E) )

 + +(?<=\d{3})(?<!999)foo -

There are four kinds of condition: references to subpatterns, references to -recursion, a pseudo-condition called DEFINE, and assertions.

+

Notice that each of the assertions is applied independently at the same + point in the subject string. First there is a check that the previous + three characters are all digits, and then there is a check that the same + three characters are not "999". This pattern does not match + "foo" preceded by six characters, the first of which are digits and the + last three of which are not "999". For example, it does not match + "123abcfoo". A pattern to do that is the following:

+ +(?<=\d{3}...)(?<!999)foo -

Checking for a used subpattern by number

+

This time the first assertion looks at the preceding six characters, + checks that the first three are digits, and then the second assertion + checks that the preceding three characters are not "999".

-

If the text between the parentheses consists of a sequence of -digits, the condition is true if a capturing subpattern of that number has previously -matched. If there is more than one capturing subpattern with the same number -(see the earlier section about duplicate subpattern numbers), -the condition is true if any of them have matched. An alternative notation is -to precede the digits with a plus or minus sign. In this case, the subpattern -number is relative rather than absolute. The most recently opened parentheses -can be referenced by (?(-1), the next most recent by (?(-2), and so on. Inside -loops it can also make sense to refer to subsequent groups. The next -parentheses to be opened can be referenced as (?(+1), and so on. (The value -zero in any of these forms is not used; it provokes a compile-time error.)

+

Assertions can be nested in any combination. For example, the following + matches an occurrence of "baz" that is preceded by "bar", which in turn is + not preceded by "foo":

-

Consider the following pattern, which contains non-significant -whitespace to make it more readable (assume the extended -option) and to divide it into three parts for ease of discussion:

+ +(?<=(?<!foo)bar)baz -

( \( )? [^()]+ (?(1) \) )

 +

The following pattern matches "foo" preceded by three digits and any + three characters that are not "999":

-

The first part matches an optional opening parenthesis, and if that -character is present, sets it as the first captured substring. The second part -matches one or more characters that are not parentheses. The third part is a -conditional subpattern that tests whether or not the first set of parentheses matched -or not. If they did, that is, if subject started with an opening parenthesis, -the condition is true, and so the yes-pattern is executed and a closing -parenthesis is required. Otherwise, since no-pattern is not present, the -subpattern matches nothing. In other words, this pattern matches a sequence of -non-parentheses, optionally enclosed in parentheses.

+ +(?<=\d{3}(?!999)...)foo +
-

If you were embedding this pattern in a larger one, you could use a relative -reference:

+
+ + Conditional Subpatterns +

It is possible to cause the matching process to obey a subpattern + conditionally or to choose between two alternative subpatterns, depending + on the result of an assertion, or whether a specific capturing subpattern + has already been matched. The following are the two possible forms of + conditional subpattern:

+ + +(?(condition)yes-pattern) +(?(condition)yes-pattern|no-pattern) + +

If the condition is satisfied, the yes-pattern is used, otherwise the + no-pattern (if present). If more than two alternatives exist in the + subpattern, a compile-time error occurs. Each of the two alternatives can + itself contain nested subpatterns of any form, including conditional + subpatterns; the restriction to two alternatives applies only at the level + of the condition. The following pattern fragment is an example where the + alternatives are complex:

+ + +(?(1) (A|B|C) | (D | (?(2)E|F) | E) ) + +

There are four kinds of condition: references to subpatterns, references + to recursion, a pseudo-condition called DEFINE, and assertions.

+ +

Checking for a Used Subpattern By Number

+ +

If the text between the parentheses consists of a sequence of digits, + the condition is true if a capturing subpattern of that number has + previously matched. If more than one capturing subpattern with the same + number exists (see section + Duplicate Subpattern Numbers earlier), the condition is true if + any of them have matched. An alternative notation is to precede the + digits with a plus or minus sign. In this case, the subpattern number is + relative rather than absolute. The most recently opened parentheses can be + referenced by (?(-1), the next most recent by (?(-2), and so on. Inside + loops, it can also make sense to refer to subsequent groups. The next + parentheses to be opened can be referenced as (?(+1), and so on. (The + value zero in any of these forms is not used; it provokes a compile-time + error.)

+ +

Consider the following pattern, which contains non-significant whitespace + to make it more readable (assume option extended) and to divide it + into three parts for ease of discussion:

+ + +( \( )? [^()]+ (?(1) \) ) + +

The first part matches an optional opening parenthesis, and if that + character is present, sets it as the first captured substring. The second + part matches one or more characters that are not parentheses. The third + part is a conditional subpattern that tests whether the first set of + parentheses matched or not. If they did, that is, if subject started with + an opening parenthesis, the condition is true, and so the yes-pattern is + executed and a closing parenthesis is required. Otherwise, as no-pattern + is not present, the subpattern matches nothing. That is, this pattern + matches a sequence of non-parentheses, optionally enclosed in + parentheses.

+ +

If this pattern is embedded in a larger one, a relative reference can be + used:

+ + +...other stuff... ( \( )? [^()]+ (?(-1) \) ) ... + +

This makes the fragment independent of the parentheses in the larger + pattern.

+ +

Checking for a Used Subpattern By Name

+ +

Perl uses the syntax (?(<name>)...) or (?('name')...) to test for a + used subpattern by name. For compatibility with earlier versions of PCRE, + which had this facility before Perl, the syntax (?(name)...) is also + recognized. However, there is a possible ambiguity with this syntax, as + subpattern names can consist entirely of digits. PCRE looks first for a + named subpattern; if it cannot find one and the name consists entirely of + digits, PCRE looks for a subpattern of that number, which must be > 0. + Using subpattern names that consist entirely of digits is not + recommended.

+ +

Rewriting the previous example to use a named subpattern gives:

+ + +(?<OPEN> \( )? [^()]+ (?(<OPEN>) \) ) + +

If the name used in a condition of this kind is a duplicate, the test is + applied to all subpatterns of the same name, and is true if any one of + them has matched.

+ +

Checking for Pattern Recursion

+ +

If the condition is the string (R), and there is no subpattern with the + name R, the condition is true if a recursive call to the whole pattern or + any subpattern has been made. If digits or a name preceded by ampersand + follow the letter R, for example:

+ + +(?(R3)...) or (?(R&name)...) + +

the condition is true if the most recent recursion is into a subpattern + whose number or name is given. This condition does not check the entire + recursion stack. If the name used in a condition of this kind is a + duplicate, the test is applied to all subpatterns of the same name, and is + true if any one of them is the most recent recursion.

+ +

At "top-level", all these recursion test conditions are false. The syntax + for recursive patterns is described below.

+ +

Defining Subpatterns for Use By Reference Only

+ + +

If the condition is the string (DEFINE), and there is no subpattern with + the name DEFINE, the condition is always false. In this case, there can be + only one alternative in the subpattern. It is always skipped if control + reaches this point in the pattern. The idea of DEFINE is that it can be + used to define "subroutines" that can be referenced from elsewhere. (The + use of subroutines is described below.) For example, a pattern to match + an IPv4 address, such as "192.168.23.245", can be written like this + (ignore whitespace and line breaks):

+ + +(?(DEFINE) (?<byte> 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) ) \b (?&byte) (\.(?&byte)){3} \b + +

The first part of the pattern is a DEFINE group inside which is a another + group named "byte" is defined. This matches an individual component of an + IPv4 address (a number < 256). When matching takes place, this part of + the pattern is skipped, as DEFINE acts like a false condition. The + remaining pattern uses references to the named group to match the four + dot-separated components of an IPv4 address, insisting on a word boundary + at each end.

+ +

Assertion Conditions

+ +

If the condition is not in any of the above formats, it must be an + assertion. This can be a positive or negative lookahead or lookbehind + assertion. Consider the following pattern, containing non-significant + whitespace, and with the two alternatives on the second line:

+ + +(?(?=[^a-z]*[a-z]) +\d{2}-[a-z]{3}-\d{2} | \d{2}-\d{2}-\d{2} ) + +

The condition is a positive lookahead assertion that matches an optional + sequence of non-letters followed by a letter. That is, it tests for the + presence of at least one letter in the subject. If a letter is found, the + subject is matched against the first alternative, otherwise it is matched + against the second. This pattern matches strings in one of the two forms + dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits.

+
-

...other stuff... ( \( )? [^()]+ (?(-1) \) ) ...

 +
+ + Comments +

There are two ways to include comments in patterns that are processed by + PCRE. In both cases, the start of the comment must not be in a character + class, or in the middle of any other sequence of related characters such + as (?: or a subpattern name or number. The characters that make up a + comment play no part in the pattern matching.

+ +

The sequence (?# marks the start of a comment that continues up to the + next closing parenthesis. Nested parentheses are not permitted. If option + PCRE_EXTENDED is set, an unescaped # character also introduces a comment, + which in this case continues to immediately after the next newline + character or character sequence in the pattern. Which characters are + interpreted as newlines is controlled by the options passed to a + compiling function or by a special sequence at the start of the pattern, + as described in section + Newline Conventions earlier.

+ +

Notice that the end of this type of comment is a literal newline sequence + in the pattern; escape sequences that happen to represent a newline do not + count. For example, consider the following pattern when extended is + set, and the default newline convention is in force:

+ + +abc #comment \n still comment + +

On encountering character #, pcre_compile() skips along, looking + for a newline in the pattern. The sequence \n is still literal at this + stage, so it does not terminate the comment. Only a character with code + value 0x0a (the default newline) does so.

+
-

This makes the fragment independent of the parentheses in the larger pattern.

+
+ + Recursive Patterns +

Consider the problem of matching a string in parentheses, allowing for + unlimited nested parentheses. Without the use of recursion, the best that + can be done is to use a pattern that matches up to some fixed depth of + nesting. It is not possible to handle an arbitrary nesting depth.

+ +

For some time, Perl has provided a facility that allows regular + expressions to recurse (among other things). It does this by + interpolating Perl code in the expression at runtime, and the code can + refer to the expression itself. A Perl pattern using code interpolation to + solve the parentheses problem can be created like this:

+ + +$re = qr{\( (?: (?>[^()]+) | (?p{$re}) )* \)}x; + +

Item (?p{...}) interpolates Perl code at runtime, and in this case refers + recursively to the pattern in which it appears.

+ +

Obviously, PCRE cannot support the interpolation of Perl code. Instead, + it supports special syntax for recursion of the entire pattern, and for + individual subpattern recursion. After its introduction in PCRE and + Python, this kind of recursion was later introduced into Perl at + release 5.10.

+ +

A special item that consists of (? followed by a number > 0 and a + closing parenthesis is a recursive subroutine call of the subpattern of + the given number, if it occurs inside that subpattern. (If not, + it is a non-recursive subroutine call, which is described in the next + section.) The special item (?R) or (?0) is a recursive call of the entire + regular expression.

-

Checking for a used subpattern by name

+

This PCRE pattern solves the nested parentheses problem (assume that + option extended is set so that whitespace is ignored):

+ + +\( ( [^()]++ | (?R) )* \) + +

First it matches an opening parenthesis. Then it matches any number of + substrings, which can either be a sequence of non-parentheses or a + recursive match of the pattern itself (that is, a correctly parenthesized + substring). Finally there is a closing parenthesis. Notice the use of a + possessive quantifier to avoid backtracking into sequences of + non-parentheses.

+ +

If this was part of a larger pattern, you would not want to recurse the + entire pattern, so instead you can use:

+ + +( \( ( [^()]++ | (?1) )* \) ) + +

The pattern is here within parentheses so that the recursion refers to + them instead of the whole pattern.

+ +

In a larger pattern, keeping track of parenthesis numbers can be tricky. + This is made easier by the use of relative references. Instead of (?1) in + the pattern above, you can write (?-2) to refer to the second most + recently opened parentheses preceding the recursion. That is, a negative + number counts capturing parentheses leftwards from the point at which it + is encountered.

+ +

It is also possible to refer to later opened parentheses, by + writing references such as (?+2). However, these cannot be recursive, as + the reference is not inside the parentheses that are referenced. They are + always non-recursive subroutine calls, as described in the next + section.

+ +

An alternative approach is to use named parentheses instead. The Perl + syntax for this is (?&name). The earlier PCRE syntax (?P>name) is + also supported. We can rewrite the above example as follows:

+ + +(?<pn> \( ( [^()]++ | (?&pn) )* \) ) + +

If there is more than one subpattern with the same name, the earliest + one is used.

+ +

This particular example pattern that we have studied contains nested + unlimited repeats, and so the use of a possessive quantifier for matching + strings of non-parentheses is important when applying the pattern to + strings that do not match. For example, when this pattern is applied + to

+ + +(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa() + +

it gives "no match" quickly. However, if a possessive quantifier is not + used, the match runs for a long time, as there are so many different + ways the + and * repeats can carve up the subject, and all must be tested + before failure can be reported.

+ +

At the end of a match, the values of capturing parentheses are those from + the outermost level. If the pattern above is matched against

+ + +(ab(cd)ef) + +

the value for the inner capturing parentheses (numbered 2) is "ef", + which is the last value taken on at the top-level. If a capturing + subpattern is not matched at the top level, its final captured value is + unset, even if it was (temporarily) set at a deeper level during the + matching process.

+ +

Do not confuse item (?R) with condition (R), which tests for recursion. + Consider the following pattern, which matches text in angle brackets, + allowing for arbitrary nesting. Only digits are allowed in nested brackets + (that is, when recursing), while any characters are permitted at the + outer level.

+ + +< (?: (?(R) \d++ | [^<>]*+) | (?R)) * > + +

Here (?(R) is the start of a conditional subpattern, with two different + alternatives for the recursive and non-recursive cases. Item (?R) is the + actual recursive call.

+ +

Differences in Recursion Processing between PCRE and Perl

+ +

Recursion processing in PCRE differs from Perl in two important ways. In + PCRE (like Python, but unlike Perl), a recursive subpattern call is always + treated as an atomic group. That is, once it has matched some of the + subject string, it is never re-entered, even if it contains untried + alternatives and there is a subsequent matching failure. This can be + illustrated by the following pattern, which means to match a palindromic + string containing an odd number of characters (for example, "a", "aba", + "abcba", "abcdcba"):

+ + +^(.|(.)(?1)\2)$ + +

The idea is that it either matches a single character, or two identical + characters surrounding a subpalindrome. In Perl, this pattern works; in + PCRE it does not work if the pattern is longer than three characters. + Consider the subject string "abcba".

+ +

At the top level, the first character is matched, but as it is not at + the end of the string, the first alternative fails, the second + alternative is taken, and the recursion kicks in. The recursive call to + subpattern 1 successfully matches the next character ("b"). (Notice that + the beginning and end of line tests are not part of the recursion.)

+ +

Back at the top level, the next character ("c") is compared with what + subpattern 2 matched, which was "a". This fails. As the recursion is + treated as an atomic group, there are now no backtracking points, and so + the entire match fails. (Perl can now re-enter the recursion + and try the second alternative.) However, if the pattern is written with + the alternatives in the other order, things are different:

+ + +^((.)(?1)\2|.)$ + +

This time, the recursing alternative is tried first, and continues to + recurse until it runs out of characters, at which point the recursion + fails. But this time we have another alternative to try at the higher + level. That is the significant difference: in the previous case the + remaining alternative is at a deeper recursion level, which PCRE cannot + use.

+ +

To change the pattern so that it matches all palindromic strings, not + only those with an odd number of characters, it is tempting to change the + pattern to this:

+ + +^((.)(?1)\2|.?)$ + +

Again, this works in Perl, but not in PCRE, and for the same reason. When + a deeper recursion has matched a single character, it cannot be entered + again to match an empty string. The solution is to separate the two cases, + and write out the odd and even cases as alternatives at the higher + level:

+ + +^(?:((.)(?1)\2|)|((.)(?3)\4|.)) + +

If you want to match typical palindromic phrases, the pattern must ignore + all non-word characters, which can be done as follows:

+ + +^\W*+(?:((.)\W*+(?1)\W*+\2|)|((.)\W*+(?3)\W*+\4|\W*+.\W*+))\W*+$ + +

If run with option caseless, this pattern matches phrases such as + "A man, a plan, a canal: Panama!" and it works well in both PCRE and Perl. + Notice the use of the possessive quantifier *+ to avoid backtracking into + sequences of non-word characters. Without this, PCRE takes much longer + (10 times or more) to match typical phrases, and Perl takes so long that + you think it has gone into a loop.

-

Perl uses the syntax (?(<name>)...) or (?('name')...) to test -for a used subpattern by name. For compatibility with earlier versions -of PCRE, which had this facility before Perl, the syntax (?(name)...) -is also recognized. However, there is a possible ambiguity with this -syntax, because subpattern names may consist entirely of digits. PCRE -looks first for a named subpattern; if it cannot find one and the name -consists entirely of digits, PCRE looks for a subpattern of that -number, which must be greater than zero. Using subpattern names that -consist entirely of digits is not recommended.

+ +

The palindrome-matching patterns above work only if the subject string + does not start with a palindrome that is shorter than the entire string. + For example, although "abcba" is correctly matched, if the subject is + "ababa", PCRE finds palindrome "aba" at the start, and then fails at top + level, as the end of the string does not follow. Once again, it cannot + jump back into the recursion to try other alternatives, so the entire + match fails.

+ -

Rewriting the above example to use a named subpattern gives this:

+

The second way in which PCRE and Perl differ in their recursion + processing is in the handling of captured values. In Perl, when a + subpattern is called recursively or as a subpattern (see the next + section), it has no access to any values that were captured outside the + recursion. In PCRE these values can be referenced. Consider the following + pattern:

+ + +^(.)(\1|a(?2)) + +

In PCRE, it matches "bab". The first capturing parentheses match "b", + then in the second group, when the back reference \1 fails to match "b", + the second alternative matches "a", and then recurses. In the recursion, + \1 does now match "b" and so the whole match succeeds. In Perl, the + pattern fails to match because inside the recursive call \1 cannot access + the externally set value.

+
-

(?<OPEN> \( )? [^()]+ (?(<OPEN>) \) )

 +
+ + Subpatterns as Subroutines +

If the syntax for a recursive subpattern call (either by number or by + name) is used outside the parentheses to which it refers, it operates + like a subroutine in a programming language. The called subpattern can be + defined before or after the reference. A numbered reference can be + absolute or relative, as in the following examples:

+ + +(...(absolute)...)...(?2)... +(...(relative)...)...(?-1)... +(...(?+1)...(relative)... + +

An earlier example pointed out that the following pattern matches "sense + and sensibility" and "response and responsibility", but not "sense and + responsibility":

+ + +(sens|respons)e and \1ibility + +

If instead the following pattern is used, it matches "sense and + responsibility" and the other two strings:

+ + +(sens|respons)e and (?1)ibility + +

Another example is provided in the discussion of DEFINE earlier.

+ +

All subroutine calls, recursive or not, are always treated as atomic + groups. That is, once a subroutine has matched some of the subject string, + it is never re-entered, even if it contains untried alternatives and there + is a subsequent matching failure. Any capturing parentheses that are set + during the subroutine call revert to their previous values afterwards.

+ +

Processing options such as case-independence are fixed when a subpattern + is defined, so if it is used as a subroutine, such options cannot be + changed for different calls. For example, the following pattern matches + "abcabc" but not "abcABC", as the change of processing option does not + affect the called subpattern:

+ + +(abc)(?i:(?-1)) +
-

If the name used in a condition of this kind is a duplicate, the test is -applied to all subpatterns of the same name, and is true if any one of them has -matched.

+
+ + Oniguruma Subroutine Syntax +

For compatibility with Oniguruma, the non-Perl syntax \g followed by a + name or a number enclosed either in angle brackets or single quotes, is + alternative syntax for referencing a subpattern as a subroutine, possibly + recursively. Here follows two of the examples used above, rewritten using + this syntax:

+ + +(?<pn> \( ( (?>[^()]+) | \g<pn> )* \) ) +(sens|respons)e and \g'1'ibility + +

PCRE supports an extension to Oniguruma: if a number is preceded by a + plus or minus sign, it is taken as a relative reference, for example:

+ + +(abc)(?i:\g<-1>) + +

Notice that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) + are not synonymous. The former is a back reference; the latter + is a subroutine call.

+
-

Checking for pattern recursion

+
+ + Backtracking Control +

Perl 5.10 introduced some "Special Backtracking Control Verbs", + which are still described in the Perl documentation as "experimental and + subject to change or removal in a future version of Perl". It goes on to + say: "Their usage in production code should be noted to avoid problems + during upgrades." The same remarks apply to the PCRE features described + in this section.

+ +

The new verbs make use of what was previously invalid syntax: an opening + parenthesis followed by an asterisk. They are generally of the form + (*VERB) or (*VERB:NAME). Some can take either form, possibly behaving + differently depending on whether a name is present. A name is any sequence + of characters that does not include a closing parenthesis. The maximum + name length is 255 in the 8-bit library and 65535 in the 16-bit and 32-bit + libraries. If the name is empty, that is, if the closing parenthesis + immediately follows the colon, the effect is as if the colon was not + there. Any number of these verbs can occur in a pattern.

+ +

The behavior of these verbs in repeated groups, assertions, and in + subpatterns called as subroutines (whether or not recursively) is + described below.

+ +

Optimizations That Affect Backtracking Verbs

+ +

PCRE contains some optimizations that are used to speed up matching by + running some checks at the start of each match attempt. For example, it + can know the minimum length of matching subject, or that a particular + character must be present. When one of these optimizations bypasses the + running of a match, any included backtracking verbs are not processed. + processed. You can suppress the start-of-match optimizations by setting + option no_start_optimize when calling + compile/2 or + run/3, or by starting the + pattern with (*NO_START_OPT).

+ +

Experiments with Perl suggest that it too has similar optimizations, + sometimes leading to anomalous results.

+ +

Verbs That Act Immediately

+ +

The following verbs act as soon as they are encountered. They must not + be followed by a name.

+ + +(*ACCEPT) + +

This verb causes the match to end successfully, skipping the remainder of + the pattern. However, when it is inside a subpattern that is called as a + subroutine, only that subpattern is ended successfully. Matching then + continues at the outer level. If (*ACCEPT) is triggered in a positive + assertion, the assertion succeeds; in a negative assertion, the assertion + fails.

+ +

If (*ACCEPT) is inside capturing parentheses, the data so far is + captured. For example, the following matches "AB", "AAD", or "ACD". When + it matches "AB", "B" is captured by the outer parentheses.

+ + +A((?:A|B(*ACCEPT)|C)D) + +

The following verb causes a matching failure, forcing backtracking to + occur. It is equivalent to (?!) but easier to read.

+ + +(*FAIL) or (*F) + +

The Perl documentation states that it is probably useful only when + combined with (?{}) or (??{}). Those are Perl features that + are not present in PCRE.

+ +

A match with the string "aaaa" always fails, but the callout is taken + before each backtrack occurs (in this example, 10 times).

+ +

Recording Which Path Was Taken

+ +

The main purpose of this verb is to track how a match was arrived at, + although it also has a secondary use in with advancing the match + starting point (see (*SKIP) below).

-

If the condition is the string (R), and there is no subpattern with -the name R, the condition is true if a recursive call to the whole -pattern or any subpattern has been made. If digits or a name preceded -by ampersand follow the letter R, for example:

+ +

In Erlang, there is no interface to retrieve a mark with + run/2,3, so only the secondary + purpose is relevant to the Erlang programmer.

-

(?(R3)...) or (?(R&name)...)

 +

The rest of this section is therefore deliberately not adapted for + reading by the Erlang programmer, but the examples can help in + understanding NAMES as they can be used by (*SKIP).

+ -

the condition is true if the most recent recursion is into a -subpattern whose number or name is given. This condition does not -check the entire recursion stack. If the name used in a condition of this kind is a duplicate, the test is -applied to all subpatterns of the same name, and is true if any one of them is -the most recent recursion.

+ +(*MARK:NAME) or (*:NAME) -

At "top level", all these recursion test conditions are false. The syntax for recursive -patterns is described below.

- -

Defining subpatterns for use by reference only

- -

If the condition is the string (DEFINE), and there is no subpattern with the -name DEFINE, the condition is always false. In this case, there may be only one -alternative in the subpattern. It is always skipped if control reaches this -point in the pattern; the idea of DEFINE is that it can be used to define -"subroutines" that can be referenced from elsewhere. (The use of subroutines -is described below.) For example, a pattern to match an IPv4 address such as -"192.168.23.245" could be -written like this (ignore whitespace and line breaks):

+

A name is always required with this verb. There can be as many instances + of (*MARK) as you like in a pattern, and their names do not have to be + unique.

-

(?(DEFINE) (?<byte> 2[0-4]\d | 25[0-5] | 1\d\d | [1-9]?\d) ) - \b (?&byte) (\.(?&byte)){3} \b

 - -

The first part of the pattern is a DEFINE group inside which a -another group named "byte" is defined. This matches an individual -component of an IPv4 address (a number less than 256). When matching -takes place, this part of the pattern is skipped because DEFINE acts -like a false condition. The rest of the pattern uses references to the -named group to match the four dot-separated components of an IPv4 -address, insisting on a word boundary at each end.

- -

Assertion conditions

+

When a match succeeds, the name of the last encountered (*MARK:NAME), + (*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the + caller as described in section "Extra data for pcre_exec()" in the + pcreapi documentation. In the following example of pcretest + output, the /K modifier requests the retrieval and outputting of (*MARK) + data:

-

If the condition is not in any of the above formats, it must be an -assertion. This may be a positive or negative lookahead or lookbehind -assertion. Consider this pattern, again containing non-significant -whitespace, and with the two alternatives on the second line:

+ + re> /X(*MARK:A)Y|X(*MARK:B)Z/K +data> XY + 0: XY +MK: A +XZ + 0: XZ +MK: B + +

The (*MARK) name is tagged with "MK:" in this output, and in this example + it indicates which of the two alternatives matched. This is a more + efficient way of obtaining this information than putting each alternative + in its own capturing parentheses.

+ +

If a verb with a name is encountered in a positive assertion that is + true, the name is recorded and passed back if it is the last encountered. + This does not occur for negative assertions or failing positive + assertions.

+ +

After a partial match or a failed match, the last encountered name in the + entire match process is returned, for example:

+ + + re> /X(*MARK:A)Y|X(*MARK:B)Z/K +data> XP +No match, mark = B + +

Notice that in this unanchored example, the mark is retained from the + match attempt that started at letter "X" in the subject. Subsequent match + attempts starting at "P" and then with an empty string do not get as far + as the (*MARK) item, nevertheless do not reset it.

+ +

Verbs That Act after Backtracking

+ +

The following verbs do nothing when they are encountered. Matching + continues with what follows, but if there is no subsequent match, causing + a backtrack to the verb, a failure is forced. That is, backtracking cannot + pass to the left of the verb. However, when one of these verbs appears + inside an atomic group or an assertion that is true, its effect is + confined to that group, as once the group has been matched, there is never + any backtracking into it. In this situation, backtracking can "jump back" + to the left of the entire atomic group or assertion. (Remember also, as + stated above, that this localization also applies in subroutine + calls.)

+ +

These verbs differ in exactly what kind of failure occurs when + backtracking reaches them. The behavior described below is what occurs + when the verb is not in a subroutine or an assertion. Subsequent sections + cover these special cases.

+ +

The following verb, which must not be followed by a name, causes the + whole match to fail outright if there is a later matching failure that + causes backtracking to reach it. Even if the pattern is unanchored, no + further attempts to find a match by advancing the starting point take + place.

+ + +(*COMMIT) + +

If (*COMMIT) is the only backtracking verb that is encountered, once it + has been passed, run/2,3 is + committed to find a match at the current starting point, or not at all, + for example:

+ + +a+(*COMMIT)b + +

This matches "xxaab" but not "aacaab". It can be thought of as a kind of + dynamic anchor, or "I've started, so I must finish". The name of the most + recently passed (*MARK) in the path is passed back when (*COMMIT) forces + a match failure.

+ +

If more than one backtracking verb exists in a pattern, a different one + that follows (*COMMIT) can be triggered first, so merely passing (*COMMIT) + during a match does not always guarantee that a match must be at this + starting point.

+ +

Notice that (*COMMIT) at the start of a pattern is not the same as an + anchor, unless the PCRE start-of-match optimizations are turned off, as + shown in the following example:

- (?(?=[^a-z]*[a-z]) - \d{2}-[a-z]{3}-\d{2} | \d{2}-\d{2}-\d{2} ) - -

The condition is a positive lookahead assertion that matches an optional -sequence of non-letters followed by a letter. In other words, it tests for the -presence of at least one letter in the subject. If a letter is found, the -subject is matched against the first alternative; otherwise it is matched -against the second. This pattern matches strings in one of the two forms -dd-aaa-dd or dd-dd-dd, where aaa are letters and dd are digits.

- - -
- -
Comments - -

There are two ways of including comments in patterns that are processed by -PCRE. In both cases, the start of the comment must not be in a character class, -nor in the middle of any other sequence of related characters such as (?: or a -subpattern name or number. The characters that make up a comment play no part -in the pattern matching.

- -

The sequence (?# marks the start of a comment that continues up to the next -closing parenthesis. Nested parentheses are not permitted. If the PCRE_EXTENDED -option is set, an unescaped # character also introduces a comment, which in -this case continues to immediately after the next newline character or -character sequence in the pattern. Which characters are interpreted as newlines -is controlled by the options passed to a compiling function or by a special -sequence at the start of the pattern, as described in the section entitled -"Newline conventions" -above. Note that the end of this type of comment is a literal newline sequence -in the pattern; escape sequences that happen to represent a newline do not -count. For example, consider this pattern when extended is set, and the -default newline convention is in force:

- -

abc #comment \n still comment

 - -

On encountering the # character, pcre_compile() skips along, looking for -a newline in the pattern. The sequence \n is still literal at this stage, so -it does not terminate the comment. Only an actual character with the code value -0x0a (the default newline) does so.

- -
- -
Recursive patterns +1> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list}]). +{match,["abc"]} +2> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list},no_start_optimize]). +nomatch + +

PCRE knows that any match must start with "a", so the optimization skips + along the subject to "a" before running the first match attempt, which + succeeds. When the optimization is disabled by option + no_start_optimize, the match starts at "x" and so the (*COMMIT) + causes it to fail without trying any other starting points.

+ +

The following verb causes the match to fail at the current starting + position in the subject if there is a later matching failure that causes + backtracking to reach it:

+ + +(*PRUNE) or (*PRUNE:NAME) + +

If the pattern is unanchored, the normal "bumpalong" advance to the next + starting character then occurs. Backtracking can occur as usual to the + left of (*PRUNE), before it is reached, or when matching to the right of + (*PRUNE), but if there is no match to the right, backtracking cannot + cross (*PRUNE). In simple cases, the use of (*PRUNE) is just an + alternative to an atomic group or possessive quantifier, but there are + some uses of (*PRUNE) that cannot be expressed in any other way. In an + anchored pattern, (*PRUNE) has the same effect as (*COMMIT).

+ +

The behavior of (*PRUNE:NAME) is the not the same as + (*MARK:NAME)(*PRUNE). It is like (*MARK:NAME) in that the name is + remembered for passing back to the caller. However, (*SKIP:NAME) searches + only for names set with (*MARK).

-

Consider the problem of matching a string in parentheses, allowing for -unlimited nested parentheses. Without the use of recursion, the best that can -be done is to use a pattern that matches up to some fixed depth of nesting. It -is not possible to handle an arbitrary nesting depth.

- -

For some time, Perl has provided a facility that allows regular -expressions to recurse (amongst other things). It does this by -interpolating Perl code in the expression at run time, and the code -can refer to the expression itself. A Perl pattern using code -interpolation to solve the parentheses problem can be created like -this:

- -

$re = qr{\( (?: (?>[^()]+) | (?p{$re}) )* \)}x;

 - -

The (?p{...}) item interpolates Perl code at run time, and in this -case refers recursively to the pattern in which it appears.

- -

Obviously, PCRE cannot support the interpolation of Perl code. Instead, it -supports special syntax for recursion of the entire pattern, and also for -individual subpattern recursion. After its introduction in PCRE and Python, -this kind of recursion was subsequently introduced into Perl at release 5.10.

- -

A special item that consists of (? followed by a number greater -than zero and a closing parenthesis is a recursive subroutine call of the -subpattern of the given number, provided that it occurs inside that -subpattern. (If not, it is a non-recursive subroutine call, which is described in -the next section.) The special item (?R) or (?0) is a recursive call -of the entire regular expression.

- -

This PCRE pattern solves the nested parentheses problem (assume the -extended option is set so that whitespace is ignored):

- -

\( ( [^()]++ | (?R) )* \)

 - -

First it matches an opening parenthesis. Then it matches any number -of substrings which can either be a sequence of non-parentheses, or a -recursive match of the pattern itself (that is, a correctly -parenthesized substring). Finally there is a closing -parenthesis. Note the use of a possessive quantifier to avoid -backtracking into sequences of non-parentheses.

- -

If this were part of a larger pattern, you would not want to -recurse the entire pattern, so instead you could use this:

- -

( \( ( [^()]++ | (?1) )* \) )

 - -

We have put the pattern into parentheses, and caused the recursion -to refer to them instead of the whole pattern.

- -

In a larger pattern, keeping track of parenthesis numbers can be tricky. This -is made easier by the use of relative references. Instead of (?1) in the -pattern above you can write (?-2) to refer to the second most recently opened -parentheses preceding the recursion. In other words, a negative number counts -capturing parentheses leftwards from the point at which it is encountered.

- -

It is also possible to refer to subsequently opened parentheses, by -writing references such as (?+2). However, these cannot be recursive -because the reference is not inside the parentheses that are -referenced. They are always non-recursive subroutine calls, as described in the -next section.

- -

An alternative approach is to use named parentheses instead. The -Perl syntax for this is (?&name); PCRE's earlier syntax -(?P>name) is also supported. We could rewrite the above example as -follows:

- -

(?<pn> \( ( [^()]++ | (?&pn) )* \) )

 - -

If there is more than one subpattern with the same name, the earliest one is -used.

- -

This particular example pattern that we have been looking at contains nested -unlimited repeats, and so the use of a possessive quantifier for matching -strings of non-parentheses is important when applying the pattern to strings -that do not match. For example, when this pattern is applied to

- -

(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa()

 - -

it yields "no match" quickly. However, if a possessive quantifier is not used, -the match runs for a very long time indeed because there are so many different -ways the + and * repeats can carve up the subject, and all have to be tested -before failure can be reported.

- -

At the end of a match, the values of capturing parentheses are those from -the outermost level. If the pattern above is matched against

- -

(ab(cd)ef)

 - -

the value for the inner capturing parentheses (numbered 2) is "ef", which is -the last value taken on at the top level. If a capturing subpattern is not -matched at the top level, its final captured value is unset, even if it was -(temporarily) set at a deeper level during the matching process.

- -

Do not confuse the (?R) item with the condition (R), which tests for recursion. -Consider this pattern, which matches text in angle brackets, allowing for -arbitrary nesting. Only digits are allowed in nested brackets (that is, when -recursing), whereas any characters are permitted at the outer level.

- -

< (?: (?(R) \d++ | [^<>]*+) | (?R)) * >

 - -

In this pattern, (?(R) is the start of a conditional subpattern, with two -different alternatives for the recursive and non-recursive cases. The (?R) item -is the actual recursive call.

- -

Differences in recursion processing between PCRE and Perl

- -

Recursion processing in PCRE differs from Perl in two important ways. In PCRE -(like Python, but unlike Perl), a recursive subpattern call is always treated -as an atomic group. That is, once it has matched some of the subject string, it -is never re-entered, even if it contains untried alternatives and there is a -subsequent matching failure. This can be illustrated by the following pattern, -which purports to match a palindromic string that contains an odd number of -characters (for example, "a", "aba", "abcba", "abcdcba"):

- -

^(.|(.)(?1)\2)$

 - -

The idea is that it either matches a single character, or two identical -characters surrounding a sub-palindrome. In Perl, this pattern works; in PCRE -it does not if the pattern is longer than three characters. Consider the -subject string "abcba":

- -

At the top level, the first character is matched, but as it is not at the end -of the string, the first alternative fails; the second alternative is taken -and the recursion kicks in. The recursive call to subpattern 1 successfully -matches the next character ("b"). (Note that the beginning and end of line -tests are not part of the recursion).

- -

Back at the top level, the next character ("c") is compared with what -subpattern 2 matched, which was "a". This fails. Because the recursion is -treated as an atomic group, there are now no backtracking points, and so the -entire match fails. (Perl is able, at this point, to re-enter the recursion and -try the second alternative.) However, if the pattern is written with the -alternatives in the other order, things are different:

- -

^((.)(?1)\2|.)$

 - -

This time, the recursing alternative is tried first, and continues to recurse -until it runs out of characters, at which point the recursion fails. But this -time we do have another alternative to try at the higher level. That is the big -difference: in the previous case the remaining alternative is at a deeper -recursion level, which PCRE cannot use.

- -

To change the pattern so that it matches all palindromic strings, not just -those with an odd number of characters, it is tempting to change the pattern to -this:

- -

^((.)(?1)\2|.?)$

 - -

Again, this works in Perl, but not in PCRE, and for the same reason. When a -deeper recursion has matched a single character, it cannot be entered again in -order to match an empty string. The solution is to separate the two cases, and -write out the odd and even cases as alternatives at the higher level:

- -

^(?:((.)(?1)\2|)|((.)(?3)\4|.))

 - -

If you want to match typical palindromic phrases, the pattern has to ignore all -non-word characters, which can be done like this:

- -

^\W*+(?:((.)\W*+(?1)\W*+\2|)|((.)\W*+(?3)\W*+\4|\W*+.\W*+))\W*+$

 - -

If run with the caseless option, this pattern matches phrases such as "A -man, a plan, a canal: Panama!" and it works well in both PCRE and Perl. Note -the use of the possessive quantifier *+ to avoid backtracking into sequences of -non-word characters. Without this, PCRE takes a great deal longer (ten times or -more) to match typical phrases, and Perl takes so long that you think it has -gone into a loop.

- -

WARNING: The palindrome-matching patterns above work only if the subject -string does not start with a palindrome that is shorter than the entire string. -For example, although "abcba" is correctly matched, if the subject is "ababa", -PCRE finds the palindrome "aba" at the start, then fails at top level because -the end of the string does not follow. Once again, it cannot jump back into the -recursion to try other alternatives, so the entire match fails.

- -

The second way in which PCRE and Perl differ in their recursion processing is -in the handling of captured values. In Perl, when a subpattern is called -recursively or as a subpattern (see the next section), it has no access to any -values that were captured outside the recursion, whereas in PCRE these values -can be referenced. Consider this pattern:

- -

^(.)(\1|a(?2))

 - -

In PCRE, this pattern matches "bab". The first capturing parentheses match "b", -then in the second group, when the back reference \1 fails to match "b", the -second alternative matches "a" and then recurses. In the recursion, \1 does -now match "b" and so the whole match succeeds. In Perl, the pattern fails to -match because inside the recursive call \1 cannot access the externally set -value.

- -
- -
Subpatterns as subroutines - -

If the syntax for a recursive subpattern call (either by number or by -name) is used outside the parentheses to which it refers, it operates like a -subroutine in a programming language. The called subpattern may be defined -before or after the reference. A numbered reference can be absolute or -relative, as in these examples:

- - - (...(absolute)...)...(?2)... - (...(relative)...)...(?-1)... - (...(?+1)...(relative)... - - -

An earlier example pointed out that the pattern

- -

(sens|respons)e and \1ibility

 - -

matches "sense and sensibility" and "response and responsibility", but not -"sense and responsibility". If instead the pattern

- -

(sens|respons)e and (?1)ibility

 - -

is used, it does match "sense and responsibility" as well as the other two -strings. Another example is given in the discussion of DEFINE above.

- -

All subroutine calls, whether recursive or not, are always treated as atomic -groups. That is, once a subroutine has matched some of the subject string, it -is never re-entered, even if it contains untried alternatives and there is a -subsequent matching failure. Any capturing parentheses that are set during the -subroutine call revert to their previous values afterwards.

- -

Processing options such as case-independence are fixed when a subpattern is -defined, so if it is used as a subroutine, such options cannot be changed for -different calls. For example, consider this pattern:

-

(abc)(?i:(?-1))

 - -

It matches "abcabc". It does not match "abcABC" because the change of -processing option does not affect the called subpattern.

- -
- -
Oniguruma subroutine syntax -

For compatibility with Oniguruma, the non-Perl syntax \g followed by a name or -a number enclosed either in angle brackets or single quotes, is an alternative -syntax for referencing a subpattern as a subroutine, possibly recursively. Here -are two of the examples used above, rewritten using this syntax:

- -

(?<pn> \( ( (?>[^()]+) | \g<pn> )* \) )

-

(sens|respons)e and \g'1'ibility

- -

PCRE supports an extension to Oniguruma: if a number is preceded by a -plus or a minus sign it is taken as a relative reference. For example:

- -

(abc)(?i:\g<-1>)

 - -

Note that \g{...} (Perl syntax) and \g<...> (Oniguruma syntax) are not -synonymous. The former is a back reference; the latter is a subroutine call.

- -
- +

(*SKIP) signifies that whatever text was matched leading up to it cannot + be part of a successful match. Consider:

-
Backtracking control - -

Perl 5.10 introduced a number of "Special Backtracking Control Verbs", which -are still described in the Perl documentation as "experimental and subject to -change or removal in a future version of Perl". It goes on to say: "Their usage -in production code should be noted to avoid problems during upgrades." The same -remarks apply to the PCRE features described in this section.

- -

The new verbs make use of what was previously invalid syntax: an opening -parenthesis followed by an asterisk. They are generally of the form -(*VERB) or (*VERB:NAME). Some may take either form, possibly behaving -differently depending on whether or not a name is present. A name is any -sequence of characters that does not include a closing parenthesis. The maximum -length of name is 255 in the 8-bit library and 65535 in the 16-bit and 32-bit -libraries. If the name is empty, that is, if the closing parenthesis -immediately follows the colon, the effect is as if the colon were not there. -Any number of these verbs may occur in a pattern.

- - -

The behaviour of these verbs in -repeated groups, assertions, -and in subpatterns called as subroutines -(whether or not recursively) is documented below.

- -

Optimizations that affect backtracking verbs

- -

PCRE contains some optimizations that are used to speed up matching by running -some checks at the start of each match attempt. For example, it may know the -minimum length of matching subject, or that a particular character must be -present. When one of these optimizations bypasses the running of a match, any -included backtracking verbs will not, of course, be processed. You can suppress -the start-of-match optimizations by setting the no_start_optimize option -when calling re:compile/2 or re:run/3, or by starting the -pattern with (*NO_START_OPT).

- -

Experiments with Perl suggest that it too has similar optimizations, sometimes -leading to anomalous results.

- -

Verbs that act immediately

- -

The following verbs act as soon as they are encountered. They may not be -followed by a name.

- -

(*ACCEPT)

 - -

This verb causes the match to end successfully, skipping the remainder of the -pattern. However, when it is inside a subpattern that is called as a -subroutine, only that subpattern is ended successfully. Matching then continues -at the outer level. If (*ACCEPT) in triggered in a positive assertion, the -assertion succeeds; in a negative assertion, the assertion fails.

- -

If (*ACCEPT) is inside capturing parentheses, the data so far is captured. For -example:

- -

A((?:A|B(*ACCEPT)|C)D)

 - -

This matches "AB", "AAD", or "ACD"; when it matches "AB", "B" is captured by -the outer parentheses.

- -

(*FAIL) or (*F)

 - -

This verb causes a matching failure, forcing backtracking to occur. It is -equivalent to (?!) but easier to read. The Perl documentation notes that it is -probably useful only when combined with (?{}) or (??{}). Those are, of course, -Perl features that are not present in PCRE. The nearest equivalent is the -callout feature, as for example in this pattern:

- -

a+(?C)(*FAIL)

 - -

A match with the string "aaaa" always fails, but the callout is taken before -each backtrack happens (in this example, 10 times).

- -

Recording which path was taken

- -

There is one verb whose main purpose is to track how a match was arrived at, -though it also has a secondary use in conjunction with advancing the match -starting point (see (*SKIP) below).

- - -

In Erlang, there is no interface to retrieve a mark with re:run/{2,3], -so only the secondary purpose is relevant to the Erlang programmer!

-

The rest of this section is therefore deliberately not adapted for reading -by the Erlang programmer, however the examples might help in understanding NAMES as -they can be used by (*SKIP).

- - -

(*MARK:NAME) or (*:NAME)

 - -

A name is always required with this verb. There may be as many instances of -(*MARK) as you like in a pattern, and their names do not have to be unique.

- -

When a match succeeds, the name of the last-encountered (*MARK:NAME), -(*PRUNE:NAME), or (*THEN:NAME) on the matching path is passed back to the -caller as described in the section entitled "Extra data for pcre_exec()" -in the pcreapi -documentation. Here is an example of pcretest output, where the /K -modifier requests the retrieval and outputting of (*MARK) data:

- - re> /X(*MARK:A)Y|X(*MARK:B)Z/K - data> XY - 0: XY - MK: A - XZ - 0: XZ - MK: B - -

The (*MARK) name is tagged with "MK:" in this output, and in this example it -indicates which of the two alternatives matched. This is a more efficient way -of obtaining this information than putting each alternative in its own -capturing parentheses.

- -

If a verb with a name is encountered in a positive assertion that is true, the -name is recorded and passed back if it is the last-encountered. This does not -happen for negative assertions or failing positive assertions.

- -

After a partial match or a failed match, the last encountered name in the -entire match process is returned. For example:

- - re> /X(*MARK:A)Y|X(*MARK:B)Z/K - data> XP - No match, mark = B - -

Note that in this unanchored example the mark is retained from the match -attempt that started at the letter "X" in the subject. Subsequent match -attempts starting at "P" and then with an empty string do not get as far as the -(*MARK) item, but nevertheless do not reset it.

- - - -

Verbs that act after backtracking

- -

The following verbs do nothing when they are encountered. Matching continues -with what follows, but if there is no subsequent match, causing a backtrack to -the verb, a failure is forced. That is, backtracking cannot pass to the left of -the verb. However, when one of these verbs appears inside an atomic group or an -assertion that is true, its effect is confined to that group, because once the -group has been matched, there is never any backtracking into it. In this -situation, backtracking can "jump back" to the left of the entire atomic group -or assertion. (Remember also, as stated above, that this localization also -applies in subroutine calls.)

- -

These verbs differ in exactly what kind of failure occurs when backtracking -reaches them. The behaviour described below is what happens when the verb is -not in a subroutine or an assertion. Subsequent sections cover these special -cases.

- -

(*COMMIT)

 - -

This verb, which may not be followed by a name, causes the whole match to fail -outright if there is a later matching failure that causes backtracking to reach -it. Even if the pattern is unanchored, no further attempts to find a match by -advancing the starting point take place. If (*COMMIT) is the only backtracking -verb that is encountered, once it has been passed re:run/{2,3} is -committed to finding a match at the current starting point, or not at all. For -example:

- -

a+(*COMMIT)b

 - -

This matches "xxaab" but not "aacaab". It can be thought of as a kind of -dynamic anchor, or "I've started, so I must finish." The name of the most -recently passed (*MARK) in the path is passed back when (*COMMIT) forces a -match failure.

- -

If there is more than one backtracking verb in a pattern, a different one that -follows (*COMMIT) may be triggered first, so merely passing (*COMMIT) during a -match does not always guarantee that a match must be at this starting point.

- -

Note that (*COMMIT) at the start of a pattern is not the same as an anchor, -unless PCRE's start-of-match optimizations are turned off, as shown in this - example:

- - 1> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list}]). - {match,["abc"]} - 2> re:run("xyzabc","(*COMMIT)abc",[{capture,all,list},no_start_optimize]). - nomatch - -

PCRE knows that any match must start with "a", so the optimization skips along -the subject to "a" before running the first match attempt, which succeeds. When -the optimization is disabled by the no_start_optimize option, the match -starts at "x" and so the (*COMMIT) causes it to fail without trying any other -starting points.

- -

(*PRUNE) or (*PRUNE:NAME)

 - -

This verb causes the match to fail at the current starting position in the -subject if there is a later matching failure that causes backtracking to reach -it. If the pattern is unanchored, the normal "bumpalong" advance to the next -starting character then happens. Backtracking can occur as usual to the left of -(*PRUNE), before it is reached, or when matching to the right of (*PRUNE), but -if there is no match to the right, backtracking cannot cross (*PRUNE). In -simple cases, the use of (*PRUNE) is just an alternative to an atomic group or -possessive quantifier, but there are some uses of (*PRUNE) that cannot be -expressed in any other way. In an anchored pattern (*PRUNE) has the same effect -as (*COMMIT).

- -

The behaviour of (*PRUNE:NAME) is the not the same as (*MARK:NAME)(*PRUNE). -It is like (*MARK:NAME) in that the name is remembered for passing back to the -caller. However, (*SKIP:NAME) searches only for names set with (*MARK).

- - -

The fact that (*PRUNE:NAME) remembers the name is useless to the Erlang programmer, -as names can not be retrieved.

- - -

(*SKIP)

 - -

This verb, when given without a name, is like (*PRUNE), except that if the -pattern is unanchored, the "bumpalong" advance is not to the next character, -but to the position in the subject where (*SKIP) was encountered. (*SKIP) -signifies that whatever text was matched leading up to it cannot be part of a -successful match. Consider:

- -

a+(*SKIP)b

 - -

If the subject is "aaaac...", after the first match attempt fails (starting at -the first character in the string), the starting point skips on to start the -next attempt at "c". Note that a possessive quantifer does not have the same -effect as this example; although it would suppress backtracking during the -first match attempt, the second attempt would start at the second character -instead of skipping on to "c".

- -

(*SKIP:NAME)

 - -

When (*SKIP) has an associated name, its behaviour is modified. When it is -triggered, the previous path through the pattern is searched for the most -recent (*MARK) that has the same name. If one is found, the "bumpalong" advance -is to the subject position that corresponds to that (*MARK) instead of to where -(*SKIP) was encountered. If no (*MARK) with a matching name is found, the -(*SKIP) is ignored.

- -

Note that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It ignores -names that are set by (*PRUNE:NAME) or (*THEN:NAME).

- -

(*THEN) or (*THEN:NAME)

 - -

This verb causes a skip to the next innermost alternative when backtracking -reaches it. That is, it cancels any further backtracking within the current -alternative. Its name comes from the observation that it can be used for a -pattern-based if-then-else block:

- -

( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ...

 + +a+(*SKIP)b -

If the COND1 pattern matches, FOO is tried (and possibly further items after -the end of the group if FOO succeeds); on failure, the matcher skips to the -second alternative and tries COND2, without backtracking into COND1. If that -succeeds and BAR fails, COND3 is tried. If subsequently BAZ fails, there are no -more alternatives, so there is a backtrack to whatever came before the entire -group. If (*THEN) is not inside an alternation, it acts like (*PRUNE).

- -

The behaviour of (*THEN:NAME) is the not the same as (*MARK:NAME)(*THEN). -It is like (*MARK:NAME) in that the name is remembered for passing back to the -caller. However, (*SKIP:NAME) searches only for names set with (*MARK).

- - -

The fact that (*THEN:NAME) remembers the name is useless to the Erlang programmer, -as names can not be retrieved.

- - -

A subpattern that does not contain a | character is just a part of the -enclosing alternative; it is not a nested alternation with only one -alternative. The effect of (*THEN) extends beyond such a subpattern to the -enclosing alternative. Consider this pattern, where A, B, etc. are complex -pattern fragments that do not contain any | characters at this level:

- -

A (B(*THEN)C) | D

 +

If the subject is "aaaac...", after the first match attempt fails + (starting at the first character in the string), the starting point skips + on to start the next attempt at "c". Notice that a possessive quantifier + does not have the same effect as this example; although it would suppress + backtracking during the first match attempt, the second attempt would + start at the second character instead of skipping on to "c".

-

If A and B are matched, but there is a failure in C, matching does not -backtrack into A; instead it moves to the next alternative, that is, D. -However, if the subpattern containing (*THEN) is given an alternative, it -behaves differently:

- -

A (B(*THEN)C | (*FAIL)) | D

 +

When (*SKIP) has an associated name, its behavior is modified:

-

The effect of (*THEN) is now confined to the inner subpattern. After a failure -in C, matching moves to (*FAIL), which causes the whole subpattern to fail -because there are no more alternatives to try. In this case, matching does now -backtrack into A.

+ +(*SKIP:NAME) -

Note that a conditional subpattern is not considered as having two -alternatives, because only one is ever used. In other words, the | character in -a conditional subpattern has a different meaning. Ignoring white space, -consider:

+

When this is triggered, the previous path through the pattern is searched + for the most recent (*MARK) that has the same name. If one is found, the + "bumpalong" advance is to the subject position that corresponds to that + (*MARK) instead of to where (*SKIP) was encountered. If no (*MARK) with a + matching name is found, (*SKIP) is ignored.

-

^.*? (?(?=a) a | b(*THEN)c )

 +

Notice that (*SKIP:NAME) searches only for names set by (*MARK:NAME). It + ignores names that are set by (*PRUNE:NAME) or (*THEN:NAME).

-

If the subject is "ba", this pattern does not match. Because .*? is ungreedy, -it initially matches zero characters. The condition (?=a) then fails, the -character "b" is matched, but "c" is not. At this point, matching does not -backtrack to .*? as might perhaps be expected from the presence of the | -character. The conditional subpattern is part of the single alternative that -comprises the whole pattern, and so the match fails. (If there was a backtrack -into .*?, allowing it to match "b", the match would succeed.)

+

The following verb causes a skip to the next innermost alternative when + backtracking reaches it. That is, it cancels any further backtracking + within the current alternative.

-

The verbs just described provide four different "strengths" of control when -subsequent matching fails. (*THEN) is the weakest, carrying on the match at the -next alternative. (*PRUNE) comes next, failing the match at the current -starting position, but allowing an advance to the next character (for an -unanchored pattern). (*SKIP) is similar, except that the advance may be more -than one character. (*COMMIT) is the strongest, causing the entire match to -fail.

+ +(*THEN) or (*THEN:NAME) +

The verb name comes from the observation that it can be used for a + pattern-based if-then-else block:

-

More than one backtracking verb

+ +( COND1 (*THEN) FOO | COND2 (*THEN) BAR | COND3 (*THEN) BAZ ) ... -

If more than one backtracking verb is present in a pattern, the one that is -backtracked onto first acts. For example, consider this pattern, where A, B, -etc. are complex pattern fragments:

+

If the COND1 pattern matches, FOO is tried (and possibly further items + after the end of the group if FOO succeeds). On failure, the matcher skips + to the second alternative and tries COND2, without backtracking into + COND1. If that succeeds and BAR fails, COND3 is tried. If BAZ then fails, + there are no more alternatives, so there is a backtrack to whatever + came before the entire group. If (*THEN) is not inside an alternation, it + acts like (*PRUNE).

-

(A(*COMMIT)B(*THEN)C|ABD)

 +

The behavior of (*THEN:NAME) is the not the same as (*MARK:NAME)(*THEN). + It is like (*MARK:NAME) in that the name is remembered for passing back to + the caller. However, (*SKIP:NAME) searches only for names set with + (*MARK).

-

If A matches but B fails, the backtrack to (*COMMIT) causes the entire match to -fail. However, if A and B match, but C fails, the backtrack to (*THEN) causes -the next alternative (ABD) to be tried. This behaviour is consistent, but is -not always the same as Perl's. It means that if two or more backtracking verbs -appear in succession, all the the last of them has no effect. Consider this -example:

+ +

The fact that (*THEN:NAME) remembers the name is useless to the Erlang + programmer, as names cannot be retrieved.

+ -

...(*COMMIT)(*PRUNE)...

 +

A subpattern that does not contain a | character is just a part of the + enclosing alternative; it is not a nested alternation with only one + alternative. The effect of (*THEN) extends beyond such a subpattern to the + enclosing alternative. Consider the following pattern, where A, B, and so + on, are complex pattern fragments that do not contain any | characters at + this level:

+ + +A (B(*THEN)C) | D + +

If A and B are matched, but there is a failure in C, matching does not + backtrack into A; instead it moves to the next alternative, that is, D. + However, if the subpattern containing (*THEN) is given an alternative, it + behaves differently:

+ + +A (B(*THEN)C | (*FAIL)) | D + +

The effect of (*THEN) is now confined to the inner subpattern. After a + failure in C, matching moves to (*FAIL), which causes the whole subpattern + to fail, as there are no more alternatives to try. In this case, matching + does now backtrack into A.

+ +

Notice that a conditional subpattern is not considered as having two + alternatives, as only one is ever used. That is, the | character in a + conditional subpattern has a different meaning. Ignoring whitespace, + consider:

+ + +^.*? (?(?=a) a | b(*THEN)c ) + +

If the subject is "ba", this pattern does not match. As .*? is ungreedy, + it initially matches zero characters. The condition (?=a) then fails, the + character "b" is matched, but "c" is not. At this point, matching does not + backtrack to .*? as can perhaps be expected from the presence of the | + character. The conditional subpattern is part of the single alternative + that comprises the whole pattern, and so the match fails. (If there was a + backtrack into .*?, allowing it to match "b", the match would + succeed.)

+ +

The verbs described above provide four different "strengths" of control + when subsequent matching fails:

+ + + +

(*THEN) is the weakest, carrying on the match at the next + alternative.

+ + +

(*PRUNE) comes next, fails the match at the current starting + position, but allows an advance to the next character (for an + unanchored pattern).

+ + +

(*SKIP) is similar, except that the advance can be more than one + character.

+ + +

(*COMMIT) is the strongest, causing the entire match to fail.

+ + -

If there is a matching failure to the right, backtracking onto (*PRUNE) cases -it to be triggered, and its action is taken. There can never be a backtrack -onto (*COMMIT).

+

More than One Backtracking Verb

-

Backtracking verbs in repeated groups

+

If more than one backtracking verb is present in a pattern, the one that + is backtracked onto first acts. For example, consider the following + pattern, where A, B, and so on, are complex pattern fragments:

-

PCRE differs from Perl in its handling of backtracking verbs in repeated -groups. For example, consider:

+ +(A(*COMMIT)B(*THEN)C|ABD) -

/(a(*COMMIT)b)+ac/

 +

If A matches but B fails, the backtrack to (*COMMIT) causes the entire + match to fail. However, if A and B match, but C fails, the backtrack to + (*THEN) causes the next alternative (ABD) to be tried. This behavior is + consistent, but is not always the same as in Perl. It means that if two or + more backtracking verbs appear in succession, the last of them has no + effect. Consider the following example:

-

If the subject is "abac", Perl matches, but PCRE fails because the (*COMMIT) in -the second repeat of the group acts.

+ +...(*COMMIT)(*PRUNE)... -

Backtracking verbs in assertions

+

If there is a matching failure to the right, backtracking onto (*PRUNE) + cases it to be triggered, and its action is taken. There can never be a + backtrack onto (*COMMIT).

-

(*FAIL) in an assertion has its normal effect: it forces an immediate backtrack.

+

Backtracking Verbs in Repeated Groups

-

(*ACCEPT) in a positive assertion causes the assertion to succeed without any -further processing. In a negative assertion, (*ACCEPT) causes the assertion to -fail without any further processing.

+

PCRE differs from Perl in its handling of backtracking verbs in repeated + groups. For example, consider:

-

The other backtracking verbs are not treated specially if they appear in a -positive assertion. In particular, (*THEN) skips to the next alternative in the -innermost enclosing group that has alternations, whether or not this is within -the assertion.

+ +/(a(*COMMIT)b)+ac/ -

Negative assertions are, however, different, in order to ensure that changing a -positive assertion into a negative assertion changes its result. Backtracking -into (*COMMIT), (*SKIP), or (*PRUNE) causes a negative assertion to be true, -without considering any further alternative branches in the assertion. -Backtracking into (*THEN) causes it to skip to the next enclosing alternative -within the assertion (the normal behaviour), but if the assertion does not have -such an alternative, (*THEN) behaves like (*PRUNE).

+

If the subject is "abac", Perl matches, but PCRE fails because the + (*COMMIT) in the second repeat of the group acts.

-

Backtracking verbs in subroutines

+

Backtracking Verbs in Assertions

-

These behaviours occur whether or not the subpattern is called recursively. -Perl's treatment of subroutines is different in some cases.

+

(*FAIL) in an assertion has its normal effect: it forces an immediate + backtrack.

-

(*FAIL) in a subpattern called as a subroutine has its normal effect: it forces -an immediate backtrack.

+

(*ACCEPT) in a positive assertion causes the assertion to succeed without + any further processing. In a negative assertion, (*ACCEPT) causes the + assertion to fail without any further processing.

-

(*ACCEPT) in a subpattern called as a subroutine causes the subroutine match to -succeed without any further processing. Matching then continues after the -subroutine call.

+

The other backtracking verbs are not treated specially if they appear in + a positive assertion. In particular, (*THEN) skips to the next alternative + in the innermost enclosing group that has alternations, regardless if this + is within the assertion.

-

(*COMMIT), (*SKIP), and (*PRUNE) in a subpattern called as a subroutine cause -the subroutine match to fail.

+

Negative assertions are, however, different, to ensure that changing a + positive assertion into a negative assertion changes its result. + Backtracking into (*COMMIT), (*SKIP), or (*PRUNE) causes a negative + assertion to be true, without considering any further alternative branches + in the assertion. Backtracking into (*THEN) causes it to skip to the next + enclosing alternative within the assertion (the normal behavior), but if + the assertion does not have such an alternative, (*THEN) behaves like + (*PRUNE).

-

(*THEN) skips to the next alternative in the innermost enclosing group within -the subpattern that has alternatives. If there is no such group within the -subpattern, (*THEN) causes the subroutine match to fail.

+

Backtracking Verbs in Subroutines

-
+

These behaviors occur regardless if the subpattern is called recursively. + The treatment of subroutines in Perl is different in some cases.

+ + +

(*FAIL) in a subpattern called as a subroutine has its normal effect: + it forces an immediate backtrack.

+ + +

(*ACCEPT) in a subpattern called as a subroutine causes the + subroutine match to succeed without any further processing. Matching + then continues after the subroutine call.

+ + +

(*COMMIT), (*SKIP), and (*PRUNE) in a subpattern called as a + subroutine cause the subroutine match to fail.

+ + +

(*THEN) skips to the next alternative in the innermost enclosing + group within the subpattern that has alternatives. If there is no such + group within the subpattern, (*THEN) causes the subroutine match to + fail.

+ + +
diff --git a/lib/stdlib/doc/src/ref_man.xml b/lib/stdlib/doc/src/ref_man.xml index 404873ea32..878a3babc5 100644 --- a/lib/stdlib/doc/src/ref_man.xml +++ b/lib/stdlib/doc/src/ref_man.xml @@ -30,9 +30,6 @@ application.xml
-

The Standard Erlang Libraries application, STDLIB, - contains modules for manipulating lists, strings and files etc.

-

diff --git a/lib/stdlib/doc/src/sets.xml b/lib/stdlib/doc/src/sets.xml index 531d18fbef..f7668af1ed 100644 --- a/lib/stdlib/doc/src/sets.xml +++ b/lib/stdlib/doc/src/sets.xml @@ -24,21 +24,23 @@ sets Robert Virding - Bjarne Dacker + Bjarne Däcker 1 Bjarne Däcker - 99-07-27 + 1999-07-27 A - sets.sgml + sets.xml
sets - Functions for Set Manipulation + Functions for set manipulation.

Sets are collections of elements with no duplicate elements. - The representation of a set is not defined.

-

This module provides exactly the same interface as the module - ordsets but with a defined representation. One difference is + The representation of a set is undefined.

+ +

This module provides the same interface as the + ordsets(3) module + but with a defined representation. One difference is that while this module considers two elements as different if they do not match (=:=), ordsets considers two elements as different if and only if they do not compare equal (==).

@@ -47,151 +49,170 @@ -

As returned by new/0.

 +

As returned by + new/0.

 + - - Return an empty set + + Add an element to a Set. -

Returns a new empty set.

+

Returns a new set formed from Set1 with + Element inserted.

 + - - Test for a Set + + Remove an element from a Set. -

Returns true if Set is a set of - elements, otherwise false.

+

Returns Set1, but with + Element removed.

 + - - Return the number of elements in a set + + Filter set elements. -

Returns the number of elements in Set.

+

Filters elements in Set1 with boolean function + Pred.

 + - - Convert a Setinto a list + + Fold over set elements. -

Returns the elements of Set as a list. - The order of the returned elements is undefined.

+

Folds Function over every element in + Set and returns the final value of the + accumulator. The evaluation order is undefined.

 + - Convert a list into a Set + Convert a list into a Set.

Returns a set of the elements in List.

 + - - Test for membership of a Set + + Return the intersection of a list of Sets. -

Returns true if Element is an element of - Set, otherwise false.

+

Returns the intersection of the non-empty list of sets.

 + - - Add an element to a Set + + Return the intersection of two Sets. -

Returns a new set formed from Set1 with - Element inserted.

+

Returns the intersection of Set1 and + Set2.

 + - - Remove an element from a Set + + Check whether two Sets are disjoint. -

Returns Set1, but with Element removed.

+

Returns true if Set1 and + Set2 are disjoint (have no elements in common), + otherwise false.

 + - - Return the union of two Sets + + Test for membership of a Set. -

Returns the merged (union) set of Set1 and - Set2.

+

Returns true if Element is an element of + Set, otherwise false.

 + - - Return the union of a list of Sets + + Test for a Set. -

Returns the merged (union) set of the list of sets.

+

Returns true if Set is a set of + elements, otherwise false.

 + - - Return the intersection of two Sets + + Test for subset. -

Returns the intersection of Set1 and - Set2.

+

Returns true when every element of Set1 is + also a member of Set2, otherwise false.

 + - - Return the intersection of a list of Sets + + Return an empty set. -

Returns the intersection of the non-empty list of sets.

+

Returns a new empty set.

 + - - Check whether two Sets are disjoint + + Return the number of elements in a set. -

Returns true if Set1 and - Set2 are disjoint (have no elements in common), - and false otherwise.

+

Returns the number of elements in Set.

 + - Return the difference of two Sets + Return the difference of two Sets. -

Returns only the elements of Set1 which are not +

Returns only the elements of Set1 that are not also elements of Set2.

 + - - Test for subset + + Convert a Setinto a list. -

Returns true when every element of Set11 is - also a member of Set2, otherwise false.

+

Returns the elements of Set as a list. + The order of the returned elements is undefined.

 + - - Fold over set elements + + Return the union of a list of Sets. -

Fold Function over every element in Set - returning the final value of the accumulator. - The evaluation order is undefined.

+

Returns the merged (union) set of the list of sets.

 + - - Filter set elements + + Return the union of two Sets. -

Filter elements in Set1 with boolean function - Pred.

+

Returns the merged (union) set of Set1 and + Set2.
See Also -

ordsets(3), - gb_sets(3)

+

gb_sets(3), + ordsets(3)

 diff --git a/lib/stdlib/doc/src/shell.xml b/lib/stdlib/doc/src/shell.xml index 65c441203c..d6e8036d4e 100644 --- a/lib/stdlib/doc/src/shell.xml +++ b/lib/stdlib/doc/src/shell.xml @@ -24,87 +24,96 @@ shell Bjorn Gustavsson - Bjarne Dacker + Bjarne Däcker 1 Bjarne Däcker - 97-01-24 + 1997-01-24 A - shell.sgml + shell.xml
shell - The Erlang Shell + The Erlang shell. -

The module shell implements an Erlang shell. -

-

The shell is a user interface program +

This module provides an Erlang shell.

+ +

The shell is a user interface program for entering expression sequences. The expressions are - evaluated and a value is returned. + evaluated and a value is returned. A history mechanism saves previous commands and their values, which can then be incorporated in later commands. How many commands and results to save can be determined by the user, - either interactively, by calling shell:history/1 and - shell:results/1, or by setting the application configuration + either interactively, by calling + history/1 and + results/1, + or by setting the application configuration parameters shell_history_length and - shell_saved_results for the application STDLIB. -

-

The shell uses a helper process for evaluating commands in - order to protect the history mechanism from exceptions. By + shell_saved_results for the STDLIB application.

+ +

The shell uses a helper process for evaluating commands + to protect the history mechanism from exceptions. By default the evaluator process is killed when an exception - occurs, but by calling shell:catch_exception/1 or by + occurs, but by calling + catch_exception/1 or by setting the application configuration parameter - shell_catch_exception for the application STDLIB - this behavior can be changed. See also the example below. -

+ shell_catch_exception for the STDLIB application + this behavior can be changed. See also the example below.

+

Variable bindings, and local process dictionary changes - which are generated in user expressions are preserved, and the variables + that are generated in user expressions are preserved, and the variables can be used in later commands to access their values. The - bindings can also be forgotten so the variables can be re-used. -

+ bindings can also be forgotten so the variables can be reused.

+

The special shell commands all have the syntax of (local) function calls. They are evaluated as normal function calls and many commands can be used in one - expression sequence. -

+ expression sequence.

+

If a command (local function call) is not recognized by the - shell, an attempt is first made to find the function in the + shell, an attempt is first made to find the function in module user_default, where customized local commands - can be placed. If found, then the function is evaluated. - Otherwise, an attempt is made to evaluate the function in the - module shell_default. The module - user_default must be explicitly loaded. -

+ can be placed. If found, the function is evaluated, + otherwise an attempt is made to evaluate the function in + module shell_default. Module + user_default must be explicitly loaded.

+

The shell also permits the user to start multiple concurrent - jobs. A job can be regarded as a set of processes which can - communicate with the shell. -

+ jobs. A job can be regarded as a set of processes that can + communicate with the shell.

+

There is some support for reading and printing records in the shell. During compilation record expressions are translated to tuple expressions. In runtime it is not known whether a tuple - actually represents a record. Nor are the record definitions - used by compiler available at runtime. So in order to read the + represents a record, and the record definitions + used by the compiler are unavailable at runtime. So, to read the record syntax and print tuples as records when possible, record - definitions have to be maintained by the shell itself. The shell - commands for reading, defining, forgetting, listing, and - printing records are described below. Note that each job has its - own set of record definitions. To facilitate matters record - definitions in the modules shell_default and + definitions must be maintained by the shell itself.

+ +

The shell commands for reading, defining, forgetting, listing, and + printing records are described below. Notice that each job has its + own set of record definitions. To facilitate matters, record + definitions in modules shell_default and user_default (if loaded) are read each time a new job is - started. For instance, adding the line

+ started. For example, adding the following line + to user_default makes the definition of file_info + readily available in the shell:

+ - -include_lib("kernel/include/file.hrl"). -

to user_default makes the definition of file_info - readily available in the shell. -

-

The shell runs in two modes:

+-include_lib("kernel/include/file.hrl"). + +

The shell runs in two modes:

+ - Normal (possibly restricted) mode, in which - commands can be edited and expressions evaluated. + +

Normal (possibly restricted) mode, in which + commands can be edited and expressions evaluated

 - Job Control Mode JCL, in which jobs can be - started, killed, detached and connected. + +

Job Control Mode, JCL, in which jobs can be + started, killed, detached, and connected

 +

Only the currently connected job can 'talk' to the shell.

 @@ -117,60 +126,51 @@ f() -

Removes all variable bindings. -

+

Removes all variable bindings.

 f(X) -

Removes the binding of variable X. -

+

Removes the binding of variable X.

 h() -

Prints the history list. -

+

Prints the history list.

 history(N)

Sets the number of previous commands to keep in the history list to N. The previous number is returned. - The default number is 20. -

+ Defaults to 20.

 results(N)

Sets the number of results from previous commands to keep in the history list to N. The previous number is returned. - The default number is 20. -

+ Defaults to 20.

 e(N) -

Repeats the command N, if N is positive. If +

Repeats command N, if N is positive. If it is negative, the Nth previous command is repeated - (i.e., e(-1) repeats the previous command). -

+ (that is, e(-1) repeats the previous command).

 v(N) -

Uses the return value of the command N in the +

Uses the return value of command N in the current command, if N is positive. If it is negative, the return value of the Nth previous command is used - (i.e., v(-1) uses the value of the previous command). -

+ (that is, v(-1) uses the value of the previous command).

 help() -

Evaluates shell_default:help(). -

+

Evaluates shell_default:help().

 c(File)

Evaluates shell_default:c(File). This compiles and loads code in File and purges old versions of code, if necessary. Assumes that the file and module names - are the same. -

+ are the same.

 catch_exception(Bool) @@ -179,161 +179,264 @@ (false) is to kill the evaluator process when an exception occurs, which causes the shell to create a new evaluator process. When the exception handling is set to - true the evaluator process lives on which means that - for instance ports and ETS tables as well as processes - linked to the evaluator process survive the exception. -

+ true, the evaluator process lives on. This means, + for example, that ports and ETS tables as well as processes + linked to the evaluator process survive the exception.

 rd(RecordName, RecordDefinition)

Defines a record in the shell. RecordName is an atom and RecordDefinition lists the field names and the default values. Usually record definitions are made - known to the shell by use of the rr commands + known to the shell by use of the rr/1,2,3 commands described below, but sometimes it is handy to define records - on the fly. -

+ on the fly.

 rf()

Removes all record definitions, then reads record definitions from the modules shell_default and user_default (if loaded). Returns the names of the - records defined. -

+ records defined.

 rf(RecordNames)

Removes selected record definitions. RecordNames is a record name or a list of record names. - Use '_' to remove all record definitions. -

+ To remove all record definitions, use '_'.

 rl() -

Prints all record definitions. -

+

Prints all record definitions.

 rl(RecordNames)

Prints selected record definitions. - RecordNames is a record name or a list of record names. -

+ RecordNames is a record name or a list of record names.

 rp(Term)

Prints a term using the record definitions known to the shell. All of Term is printed; the depth is not - limited as is the case when a return value is printed. -

+ limited as is the case when a return value is printed.

 rr(Module)

Reads record definitions from a module's BEAM file. If there are no record definitions in the BEAM file, the source file is located and read instead. Returns the names - of the record definitions read. Module is an atom. -

+ of the record definitions read. Module is an atom.

 rr(Wildcard)

Reads record definitions from files. Existing definitions of any of the record names read are replaced. Wildcard is a wildcard string as defined in - filelib(3) but not an atom. -

+ filelib(3), + but not an atom.

 rr(WildcardOrModule, RecordNames)

Reads record definitions from files but discards record names not mentioned in RecordNames (a - record name or a list of record names). -

+ record name or a list of record names).

 rr(WildcardOrModule, RecordNames, Options)

Reads record definitions from files. The compiler options {i, Dir}, {d, Macro}, and {d, Macro, Value} are recognized and used - for setting up the include path and macro definitions. Use - '_' as value of RecordNames to read all record - definitions. -

+ for setting up the include path and macro definitions. + To read all record definitions, use + '_' as value of RecordNames.
Example -

The following example is a long dialogue with the shell. Commands +

The following example is a long dialog with the shell. Commands starting with > are inputs to the shell. All other lines - are output from the shell. All commands in this example are explained at the end of the dialogue. - .

+ are output from the shell.

+ 
 strider 1> erl
 Erlang (BEAM) emulator version 5.3 [hipe] [threads:0]
 
 Eshell V5.3  (abort with ^G)
-1>Str = "abcd".
-"abcd"
+1> Str = "abcd".
+"abcd"
+ +

Command 1 sets variable Str to string "abcd".

+ + 
 2> L = length(Str).
-4
+4
+ +

Command 2 sets L to the length of string Str.

+ + 
 3> Descriptor = {L, list_to_atom(Str)}.
-{4,abcd}
+{4,abcd}
+ +

Command 3 builds the tuple Descriptor, evaluating the BIF + list_to_atom/1 + .

+ + 
 4> L. 
-4
+4
+ +

Command 4 prints the value of variable L.

+ + 
 5> b().
 Descriptor = {4,abcd}
 L = 4
 Str = "abcd"
-ok
+ok
+ +

Command 5 evaluates the internal shell command b(), which + is an abbreviation of "bindings". This prints + the current shell variables and their bindings. ok at + the end is the return value of function b().

+ + 
 6> f(L). 
-ok
+ok
+ +

Command 6 evaluates the internal shell command f(L) (abbreviation + of "forget"). The value of variable L is removed.

+ + 
 7> b().
 Descriptor = {4,abcd}
 Str = "abcd"
-ok
+ok
+ +

Command 7 prints the new bindings.

+ + 
 8> f(L).
-ok
+ok
+ +

Command 8 has no effect, as L has no value.

+ + 
 9> {L, _} = Descriptor.
-{4,abcd}
+{4,abcd}
+ +

Command 9 performs a pattern matching operation on + Descriptor, binding a new value to L.

+ + 
 10> L.
-4
+4
+ +

Command 10 prints the current value of L.

+ + 
 11> {P, Q, R} = Descriptor.
-** exception error: no match of right hand side value {4,abcd}
+** exception error: no match of right hand side value {4,abcd}
+ +

Command 11 tries to match {P, Q, R} against + Descriptor, which is {4, abc}. The match fails and + none of the new variables become bound. The printout starting + with "** exception error:" is not the value of the + expression (the expression had no value because its evaluation + failed), but a warning printed by the system to inform + the user that an error has occurred. The values of the other + variables (L, Str, and so on) are unchanged.

+ + 
 12> P.
-* 1: variable 'P' is unbound **
+* 1: variable 'P' is unbound
 13> Descriptor.
-{4,abcd}
+{4,abcd}
+ +

Commands 12 and 13 show that P is unbound because the + previous command failed, and that Descriptor has not + changed.

+ + 
 14>{P, Q} = Descriptor.
 {4,abcd}
 15> P.
-4
+4
+ +

Commands 14 and 15 show a correct match where P and + Q are bound.

+ + 
 16> f().
-ok
+ok
+ +

Command 16 clears all bindings.

+ +

The next few commands assume that test1:demo(X) is + defined as follows:

+ +

demo(X) ->

+     put(aa, worked),

+     X = 1,

+     X + 10.

+ + 
 17> put(aa, hello).
 undefined
 18> get(aa).
-hello
+hello
+ +

Commands 17 and 18 set and inspect the value of item + aa in the process dictionary.

+ + 
 19> Y = test1:demo(1).
-11
+11
+ +

Command 19 evaluates test1:demo(1). The evaluation + succeeds and the changes made in the process dictionary become + visible to the shell. The new value of dictionary item + aa can be seen in command 20.

+ + 
 20> get().
 [{aa,worked}]
 21> put(aa, hello).
 worked
 22> Z = test1:demo(2).
 ** exception error: no match of right hand side value 1
-     in function  test1:demo/1
+     in function  test1:demo/1
+ +

Commands 21 and 22 change the value of dictionary item + aa to hello and call test1:demo(2). Evaluation + fails and the changes made to the dictionary in + test1:demo(2), before the error occurred, are discarded.

+ + 
 23> Z.
-* 1: variable 'Z' is unbound **
+* 1: variable 'Z' is unbound
 24> get(aa).
-hello
+hello
+ +

Commands 23 and 24 show that Z was not bound and that + dictionary item aa has retained its original value.

+ + 
 25> erase(), put(aa, hello).
 undefined
 26> spawn(test1, demo, [1]).
 <0.57.0>
 27> get(aa).
-hello
+hello
+ +

Commands 25, 26, and 27 show the effect of evaluating + test1:demo(1) in the background. In this case, the + expression is evaluated in a newly spawned process. Any + changes made in the process dictionary are local to the newly + spawned process and therefore not visible to the shell.

+ + 
 28> io:format("hello hello\n").
 hello hello
 ok
@@ -341,31 +444,96 @@ ok
 hello hello
 ok
 30> v(28).
-ok
+ok
+ +

Commands 28, 29 and 30 use the history facilities of the shell. + Command 29 re-evaluates command 28. Command 30 uses the value (result) + of command 28. In the cases of a pure function (a function + with no side effects), the result is the same. For a function + with side effects, the result can be different.

+ +

The next few commands show some record manipulation. It is + assumed that ex.erl defines a record as follows:

+ +

-record(rec, {a, b = val()}).

+

val() ->

+     3.

+ + 
 31> c(ex).
 {ok,ex}
 32> rr(ex).
-[rec]
+[rec]
+ +

Commands 31 and 32 compile file ex.erl and read + the record definitions in ex.beam. If the compiler did not + output any record definitions on the BEAM file, rr(ex) + tries to read record definitions from the source file instead.

+ + 
 33> rl(rec).
 -record(rec,{a,b = val()}).
-ok
+ok
+ +

Command 33 prints the definition of the record named + rec.

+ + 
 34> #rec{}.
-** exception error: undefined shell command val/0
+** exception error: undefined shell command val/0
+ +

Command 34 tries to create a rec record, but fails + as function val/0 is undefined.

+ + 
 35> #rec{b = 3}.
-#rec{a = undefined,b = 3}
+#rec{a = undefined,b = 3}
+ +

Command 35 shows the workaround: explicitly assign values to record + fields that cannot otherwise be initialized.

+ + 
 36> rp(v(-1)).
 #rec{a = undefined,b = 3}
-ok
+ok
+ +

Command 36 prints the newly created record using record + definitions maintained by the shell.

+ + 
 37> rd(rec, {f = orddict:new()}).
-rec
+rec
+ +

Command 37 defines a record directly in the shell. The + definition replaces the one read from file ex.beam.

+ + 
 38> #rec{}.
 #rec{f = []}
-ok
+ok
+ +

Command 38 creates a record using the new definition, and + prints the result.

+ + 
 39> rd(rec, {c}), A.
-* 1: variable 'A' is unbound **
+* 1: variable 'A' is unbound
 40> #rec{}.
 #rec{c = undefined}
-ok
+ok
+ +

Command 39 and 40 show that record definitions are updated + as side effects. The evaluation of the command fails, but + the definition of rec has been carried out.

+ +

For the next command, it is assumed that test1:loop(N) is + defined as follows:

+ +

loop(N) ->

+     io:format("Hello Number: ~w~n", [N]),

+     loop(N+1).

+ + 
 41> test1:loop(0).
 Hello Number: 0
 Hello Number: 1
@@ -383,225 +551,122 @@ Hello Number: 3375
 Hello Number: 3376
 Hello Number: 3377
 Hello Number: 3378
-** exception exit: killed
+** exception exit: killed
+ +

Command 41 evaluates test1:loop(0), which puts the + system into an infinite loop. At this point the user types + ^G (Control G), which suspends output from the + current process, + which is stuck in a loop, and activates JCL mode. In JCL + mode the user can start and stop jobs.

+ +

In this particular case, command i ("interrupt") + terminates the looping program, and command c + connects to the shell again. As the process was + running in the background before we killed it, more + printouts occur before message "** exception exit: killed" + is shown.

+ + 
 42> E = ets:new(t, []).
-17
+17
+ +

Command 42 creates an ETS table.

+ + 
 43> ets:insert({d,1,2}).
-** exception error: undefined function ets:insert/1
+** exception error: undefined function ets:insert/1
+ +

Command 43 tries to insert a tuple into the ETS table, but the + first argument (the table) is missing. The exception kills the + evaluator process.

+ + 
 44> ets:insert(E, {d,1,2}).
 ** exception error: argument is of wrong type
      in function  ets:insert/2
-        called as ets:insert(16,{d,1,2})
+        called as ets:insert(16,{d,1,2})
+ +

Command 44 corrects the mistake, but the ETS table has been + destroyed as it was owned by the killed evaluator process.

+ + 
 45> f(E).
 ok
 46> catch_exception(true).
-false
+false
+ +

Command 46 sets the exception handling of the evaluator process + to true. The exception handling can also be set when + starting Erlang by erl -stdlib shell_catch_exception true.

+ + 
 47> E = ets:new(t, []).
 18
 48> ets:insert({d,1,2}).
-* exception error: undefined function ets:insert/1
-49> ets:insert(E, {d,1,2}).
-true
-50> halt().
-strider 2>
-
+* exception error: undefined function ets:insert/1 -
- Comments -

Command 1 sets the variable Str to the string - "abcd". -

-

Command 2 sets L to the length of the string evaluating - the BIF atom_to_list. -

-

Command 3 builds the tuple Descriptor. -

-

Command 4 prints the value of the variable L. -

-

Command 5 evaluates the internal shell command b(), which - is an abbreviation of "bindings". This prints - the current shell variables and their bindings. The ok at - the end is the return value of the b() function. -

-

Command 6 f(L) evaluates the internal shell command - f(L) (abbreviation of "forget"). The value of the variable - L is removed. -

-

Command 7 prints the new bindings. -

-

Command 8 has no effect since L has no value.

-

Command 9 performs a pattern matching operation on - Descriptor, binding a new value to L. -

-

Command 10 prints the current value of L. -

-

Command 11 tries to match {P, Q, R} against - Descriptor which is {4, abc}. The match fails and - none of the new variables become bound. The printout starting - with "** exception error:" is not the value of the - expression (the expression had no value because its evaluation - failed), but rather a warning printed by the system to inform - the user that an error has occurred. The values of the other - variables (L, Str, etc.) are unchanged. -

-

Commands 12 and 13 show that P is unbound because the - previous command failed, and that Descriptor has not - changed. -

-

Commands 14 and 15 show a correct match where P and - Q are bound. -

-

Command 16 clears all bindings. -

-

The next few commands assume that test1:demo(X) is - defined in the following way:

- 
-demo(X) ->
-    put(aa, worked),
-    X = 1,
-    X + 10.
-

Commands 17 and 18 set and inspect the value of the item - aa in the process dictionary. -

-

Command 19 evaluates test1:demo(1). The evaluation - succeeds and the changes made in the process dictionary become - visible to the shell. The new value of the dictionary item - aa can be seen in command 20. -

-

Commands 21 and 22 change the value of the dictionary item - aa to hello and call test1:demo(2). Evaluation - fails and the changes made to the dictionary in - test1:demo(2), before the error occurred, are discarded. -

-

Commands 23 and 24 show that Z was not bound and that the - dictionary item aa has retained its original value. -

-

Commands 25, 26 and 27 show the effect of evaluating - test1:demo(1) in the background. In this case, the - expression is evaluated in a newly spawned process. Any - changes made in the process dictionary are local to the newly - spawned process and therefore not visible to the shell. -

-

Commands 28, 29 and 30 use the history facilities of the shell. -

-

Command 29 is e(28). This re-evaluates command - 28. Command 30 is v(28). This uses the value (result) of - command 28. In the cases of a pure function (a function - with no side effects), the result is the same. For a function - with side effects, the result can be different. -

-

The next few commands show some record manipulation. It is - assumed that ex.erl defines a record like this:

- 
--record(rec, {a, b = val()}).
-
-val() ->
-    3.
-

Commands 31 and 32 compiles the file ex.erl and reads - the record definitions in ex.beam. If the compiler did not - output any record definitions on the BEAM file, rr(ex) - tries to read record definitions from the source file instead. -

-

Command 33 prints the definition of the record named - rec. -

-

Command 34 tries to create a rec record, but fails - since the function val/0 is undefined. Command 35 shows - the workaround: explicitly assign values to record fields that - cannot otherwise be initialized. -

-

Command 36 prints the newly created record using record - definitions maintained by the shell. -

-

Command 37 defines a record directly in the shell. The - definition replaces the one read from the file ex.beam. -

-

Command 38 creates a record using the new definition, and - prints the result. -

-

Command 39 and 40 show that record definitions are updated - as side effects. The evaluation of the command fails but - the definition of rec has been carried out. -

-

For the next command, it is assumed that test1:loop(N) is - defined in the following way:

- 
-loop(N) ->
-    io:format("Hello Number: ~w~n", [N]), 
-    loop(N+1).
-

Command 41 evaluates test1:loop(0), which puts the - system into an infinite loop. At this point the user types - Control G, which suspends output from the current process, - which is stuck in a loop, and activates JCL mode. In JCL - mode the user can start and stop jobs. -

-

In this particular case, the i command ("interrupt") is - used to terminate the looping program, and the c command - is used to connect to the shell again. Since the process was - running in the background before we killed it, there will be - more printouts before the "** exception exit: killed" - message is shown. -

-

Command 42 creates an ETS table.

-

Command 43 tries to insert a tuple into the ETS table but the - first argument (the table) is missing. The exception kills the - evaluator process.

-

Command 44 corrects the mistake, but the ETS table has been - destroyed since it was owned by the killed evaluator process.

-

Command 46 sets the exception handling of the evaluator process - to true. The exception handling can also be set when - starting Erlang, like this: erl -stdlib shell_catch_exception - true.

Command 48 makes the same mistake as in command 43, but this time the evaluator process lives on. The single star at the beginning of the printout signals that the exception has been caught.

+ + 
+49> ets:insert(E, {d,1,2}).
+true
+

Command 49 successfully inserts the tuple into the ETS table.

-

The halt() command exits the Erlang runtime system. -

+ + 
+50> halt().
+strider 2>
+ +

Command 50 exits the Erlang runtime system.

JCL Mode

When the shell starts, it starts a single evaluator - process. This process, together with any local processes which + process. This process, together with any local processes that it spawns, is referred to as a job. Only the current job, which is said to be connected, can perform operations - with standard IO. All other jobs, which are said to be detached, are - blocked if they attempt to use standard IO. -

-

All jobs which do not use standard IO run in the normal way. -

-

The shell escape key ^G (Control G) detaches the current job - and activates JCL mode. The JCL mode prompt is "-->". If "?" is entered at the prompt, the following help message is - displayed:

- 
-          --> ?
-          c [nn]            - connect to job
-          i [nn]            - interrupt job
-          k [nn]            - kill job
-          j                 - list all jobs
-          s [shell]         - start local shell
-          r [node [shell]]  - start remote shell
-          q        - quit erlang
-          ? | h             - this message
+ with standard I/O. All other jobs, which are said to be detached, + are blocked if they attempt to use standard I/O.

+ +

All jobs that do not use standard I/O run in the normal way.

+ +

The shell escape key ^G (Control G) detaches the current + job and activates JCL mode. The JCL mode prompt is + "-->". If "?" is entered at the prompt, the following help + message is displayed:

+ + 
+--> ?
+c [nn]            - connect to job
+i [nn]            - interrupt job
+k [nn]            - kill job
+j                 - list all jobs
+s [shell]         - start local shell
+r [node [shell]]  - start remote shell
+q                 - quit erlang
+? | h             - this message
+

The JCL commands have the following meaning:

+ c [nn]

Connects to job number ]]> or the current - job. The standard shell is resumed. Operations which use - standard IO by the current job will be interleaved with - user inputs to the shell. -

+ job. The standard shell is resumed. Operations that use + standard I/O by the current job are interleaved with + user inputs to the shell.

 i [nn]

Stops the current evaluator process for job number nn or the current job, but does not kill the shell - process. Accordingly, any variable bindings and the process dictionary - will be preserved and the job can be connected again. - This command can be used to interrupt an endless loop. -

+ process. So, any variable bindings and the process + dictionary are preserved and the job can be connected again. + This command can be used to interrupt an endless loop.

 k [nn] @@ -609,135 +674,166 @@ loop(N) -> job. All spawned processes in the job are killed, provided they have not evaluated the group_leader/1 BIF and are located on - the local machine. Processes spawned on remote nodes will - not be killed. -

+ the local machine. Processes spawned on remote nodes + are not killed.

 j

Lists all jobs. A list of all known jobs is - printed. The current job name is prefixed with '*'. -

+ printed. The current job name is prefixed with '*'.

 s -

Starts a new job. This will be assigned the new index - [nn] which can be used in references. -

+

Starts a new job. This is assigned the new index + [nn], which can be used in references.

 s [shell] -

Starts a new job. This will be assigned the new index - [nn] which can be used in references. - If the optional argument shell is given, it is assumed - to be a module that implements an alternative shell. -

+

Starts a new job. This is assigned the new index + [nn], which can be used in references. + If optional argument shell is specified, it is assumed + to be a module that implements an alternative shell.

 r [node]

Starts a remote job on node. This is used in distributed Erlang to allow a shell running on one node to - control a number of applications running on a network of - nodes. - If the optional argument shell is given, it is assumed - to be a module that implements an alternative shell. -

+ control a number of applications running on a network of nodes. + If optional argument shell is specified, it is assumed + to be a module that implements an alternative shell.

 q -

Quits Erlang. Note that this option is disabled if - Erlang is started with the ignore break, +Bi, - system flag (which may be useful e.g. when running - a restricted shell, see below). -

+

Quits Erlang. Notice that this option is disabled if + Erlang is started with the ignore break, +Bi, + system flag (which can be useful, for example when running + a restricted shell, see the next section).

 ? -

Displays this message.

+

Displays the help message above.

 -

It is possible to alter the behavior of shell escape by means - of the STDLIB application variable shell_esc. The value of + +

The behavior of shell escape can be changed by the STDLIB + application variable shell_esc. The value of the variable can be either jcl (erl -stdlib shell_esc jcl) or abort (erl -stdlib shell_esc abort). The - first option sets ^G to activate JCL mode (which is also - default behavior). The latter sets ^G to terminate the current - shell and start a new one. JCL mode cannot be invoked when - shell_esc is set to abort.

-

If you want an Erlang node to have a remote job active from the start - (rather than the default local job), you start Erlang with the - -remsh flag. Example: erl -sname this_node -remsh other_node@other_host

+ first option sets ^G to activate JCL mode (which + is also default behavior). The latter sets ^G to + terminate the current shell and start a new one. + JCL mode cannot be invoked when + shell_esc is set to abort.

+ +

If you want an Erlang node to have a remote job active from the start + (rather than the default local job), start Erlang with flag + -remsh, for example, + erl -sname this_node -remsh other_node@other_host

Restricted Shell -

The shell may be started in a +

The shell can be started in a restricted mode. In this mode, the shell evaluates a function call only if allowed. This feature makes it possible to, for example, prevent a user from accidentally calling a function from the prompt that could harm a running system (useful in combination - with the the system flag +Bi).

+ with system flag +Bi).

+

When the restricted shell evaluates an expression and - encounters a function call or an operator application, + encounters a function call or an operator application, it calls a callback function (with information about the function call in question). This callback function returns true to let the shell go ahead with the evaluation, or false to abort it. There are two possible callback functions for the user to implement:

-

local_allowed(Func, ArgList, State) -> {true,NewState} | {false,NewState}

-

to determine if the call to the local function Func - with arguments ArgList should be allowed.

-

non_local_allowed(FuncSpec, ArgList, State) -> {true,NewState} | {false,NewState} | {{redirect,NewFuncSpec,NewArgList},NewState}

-

to determine if the call to non-local function - FuncSpec ({Module,Func} or a fun) with arguments - ArgList should be allowed. The return value - {redirect,NewFuncSpec,NewArgList} can be used to let - the shell evaluate some other function than the one specified by - FuncSpec and ArgList.

-

These callback functions are in fact called from local and + + + +

local_allowed(Func, ArgList, State) -> {boolean(),NewState}

+

This is used to determine if the call to the local function + Func with arguments ArgList is to be allowed.

+ + +

non_local_allowed(FuncSpec, ArgList, State) + -> {boolean(),NewState} + | {{redirect,NewFuncSpec,NewArgList},NewState}

+

This is used to determine if the call to non-local function + FuncSpec ({Module,Func} or a fun) with arguments + ArgList is to be allowed. The return value + {redirect,NewFuncSpec,NewArgList} can be used to let + the shell evaluate some other function than the one specified by + FuncSpec and ArgList.

+ + + +

These callback functions are called from local and non-local evaluation function handlers, described in the - erl_eval + erl_eval manual page. (Arguments in ArgList are evaluated before the callback functions are called.)

-

The State argument is a tuple + +

Argument State is a tuple {ShellState,ExprState}. The return value NewState - has the same form. This may be used to carry a state between calls + has the same form. This can be used to carry a state between calls to the callback functions. Data saved in ShellState lives through an entire shell session. Data saved in ExprState lives only through the evaluation of the current expression.

+

There are two ways to start a restricted shell session:

+ - Use the STDLIB application variable restricted_shell - and specify, as its value, the name of the callback - module. Example (with callback functions implemented in - callback_mod.erl): $ erl -stdlib restricted_shell callback_mod - From a normal shell session, call function - shell:start_restricted/1. This exits the current evaluator - and starts a new one in restricted mode. + +

Use STDLIB application variable restricted_shell + and specify, as its value, the name of the callback + module. Example (with callback functions implemented in + callback_mod.erl): + $ erl -stdlib restricted_shell callback_mod.

+ + +

From a normal shell session, call function + + start_restricted/1. This exits the current evaluator + and starts a new one in restricted mode.

+ +

Notes:

- When restricted shell mode is activated or - deactivated, new jobs started on the node will run in restricted - or normal mode respectively. - If restricted mode has been enabled on a - particular node, remote shells connecting to this node will also - run in restricted mode. - The callback functions cannot be used to allow or disallow - execution of functions called from compiled code (only functions - called from expressions entered at the shell prompt). + +

When restricted shell mode is activated or + deactivated, new jobs started on the node run in restricted + or normal mode, respectively.

+ + +

If restricted mode has been enabled on a + particular node, remote shells connecting to this node also + run in restricted mode.

+ + +

The callback functions cannot be used to allow or disallow + execution of functions called from compiled code (only functions + called from expressions entered at the shell prompt).

+ +

Errors when loading the callback module is handled in different ways depending on how the restricted shell is activated:

+ - If the restricted shell is activated by setting the kernel - variable during emulator startup and the callback module cannot be - loaded, a default restricted shell allowing only the commands - q() and init:stop() is used as fallback. - If the restricted shell is activated using - shell:start_restricted/1 and the callback module cannot be - loaded, an error report is sent to the error logger and the call - returns {error,Reason}. + +

If the restricted shell is activated by setting the STDLIB + variable during emulator startup, and the callback module cannot be + loaded, a default restricted shell allowing only the commands + q() and init:stop() is used as fallback.

+ + +

If the restricted shell is activated using + + start_restricted/1 and the callback module cannot + be loaded, an error report is sent to the error logger and the call + returns {error,Reason}.

+
@@ -746,44 +842,27 @@ loop(N) ->

The default shell prompt function displays the name of the node (if the node can be part of a distributed system) and the current command number. The user can customize the prompt - function by calling - shell:prompt_func/1 or by setting the application + function by calling + prompt_func/1 or by setting application configuration parameter shell_prompt_func for the - application STDLIB.

+ STDLIB application.

+

A customized prompt function is stated as a tuple {Mod, Func}. The function is called as Mod:Func(L), where L is a list of key-value pairs created by the shell. Currently there is only one pair: - {history, N}, where N is the current command number. The - function should return a list of characters or an atom. This - constraint is due to the Erlang I/O-protocol. Unicode characters - beyond codepoint 255 are allowed in the list. Note + {history, N}, where N is the current command number. The + function is to return a list of characters or an atom. This + constraint is because of the Erlang I/O protocol. Unicode characters + beyond code point 255 are allowed in the list. Notice that in restricted mode the call Mod:Func(L) must be - allowed or the default shell prompt function will be called.

- + allowed or the default shell prompt function is called.

+ - - - Sets the number of previous commands to keep - -

Sets the number of previous commands to keep in the - history list to N. The previous number is returned. - The default number is 20.

- - - - - Sets the number of previous results to keep - -

Sets the number of results from previous commands to keep in - the history list to N. The previous number is returned. - The default number is 20.

- - catch_exception(Bool) -> boolean() - Sets the exception handling of the shell + Set the exception handling of the shell. Bool = boolean() @@ -793,52 +872,76 @@ loop(N) -> (false) is to kill the evaluator process when an exception occurs, which causes the shell to create a new evaluator process. When the exception handling is set to - true the evaluator process lives on which means that - for instance ports and ETS tables as well as processes + true, the evaluator process lives on, which means that, + for example, ports and ETS tables as well as processes linked to the evaluator process survive the exception.

 + + + + Set the number of previous commands to keep. + +

Sets the number of previous commands to keep in the + history list to N. The previous number is + returned. Defaults to 20.

+ + + - Sets the shell prompt + Set the shell prompt.

Sets the shell prompt function to PromptFunc. The previous prompt function is returned.

 + + + + Set the number of previous results to keep. + +

Sets the number of results from previous commands to keep in + the history list to N. The previous number is + returned. Defaults to 20.

+ + + - Exits a normal shell and starts a restricted shell. + Exit a normal shell and starts a restricted shell. -

Exits a normal shell and starts a restricted - shell. Module specifies the callback module for the +

Exits a normal shell and starts a restricted shell. + Module specifies the callback module for the functions local_allowed/3 and non_local_allowed/3. The function is meant to be called from the shell.

If the callback module cannot be loaded, an error tuple is returned. The Reason in the error tuple is the one - returned by the code loader when trying to load the code of the callback - module.

+ returned by the code loader when trying to load the code of the + callback module.

 + - Exits a restricted shell and starts a normal shell. + Exit a restricted shell and starts a normal shell.

Exits a restricted shell and starts a normal shell. The function is meant to be called from the shell.

 + - Sets the shell's string recognition flag. + Set the shell's string recognition flag.

Sets pretty printing of lists to Strings. The previous value of the flag is returned.

The flag can also be set by the STDLIB application variable - shell_strings. The default is - true which means that lists of integers will be - printed using the string syntax, when possible. The value - false means that no lists will be printed using the + shell_strings. Defaults to + true, which means that lists of integers are + printed using the string syntax, when possible. Value + false means that no lists are printed using the string syntax.

 diff --git a/lib/stdlib/doc/src/shell_default.xml b/lib/stdlib/doc/src/shell_default.xml index 4a90b7d7cc..81c99bce10 100644 --- a/lib/stdlib/doc/src/shell_default.xml +++ b/lib/stdlib/doc/src/shell_default.xml @@ -32,25 +32,27 @@ Joe Armstrong 1996-09-09 A - shell_default.sgml + shell_default.xml
shell_default - Customizing the Erlang Environment + Customizing the Erlang environment. -

The functions in shell_default are called when no module - name is given in a shell command. -

-

Consider the following shell dialogue:

+

The functions in this module are called when no module name is + specified in a shell command.

+ +

Consider the following shell dialog:

+ 
-1 > lists:reverse("abc").
+1> lists:reverse("abc").
 "cba"
-2 > c(foo).
-{ok, foo}
-

In command one, the module lists is called. In command - two, no module name is specified. The shell searches the modules - user_default followed by shell_default for the - function foo/1. -

+2> c(foo). +{ok, foo} + +

In command one, module lists is + called. In command two, no module name is specified. The shell searches + module user_default followed by module shell_default for + function foo/1.

+

shell_default is intended for "system wide" customizations to the shell. user_default is intended for "local" or individual user customizations.

@@ -60,10 +62,12 @@ Hint

To add your own commands to the shell, create a module called user_default and add the commands you want. Then add the - following line as the first line in your .erlang file in your - home directory.

+ following line as the first line in your .erlang file in + your home directory.

+ 
-code:load_abs("$PATH/user_default").
+code:load_abs("$PATH/user_default"). +

$PATH is the directory where your user_default module can be found.

diff --git a/lib/stdlib/doc/src/slave.xml b/lib/stdlib/doc/src/slave.xml index 244822568b..e53ec8231b 100644 --- a/lib/stdlib/doc/src/slave.xml +++ b/lib/stdlib/doc/src/slave.xml @@ -29,89 +29,139 @@
slave - Functions to Starting and Controlling Slave Nodes + Functions for starting and controlling slave nodes. +

This module provides functions for starting Erlang slave nodes. - All slave nodes which are started by a master will terminate - automatically when the master terminates. All TTY output produced - at the slave will be sent back to the master node. File I/O is - done via the master.

+ All slave nodes that are started by a master terminate + automatically when the master terminates. All terminal output produced + at the slave is sent back to the master node. File I/O is + done through the master.

+

Slave nodes on other hosts than the current one are started with - the program rsh. The user must be allowed to rsh to + the rsh program. The user must be allowed to rsh to the remote hosts without being prompted for a password. This can - be arranged in a number of ways (refer to the rsh - documentation for details). A slave node started on the same host + be arranged in a number of ways (for details, see the rsh + documentation). A slave node started on the same host as the master inherits certain environment values from the master, such as the current directory and the environment variables. For what can be assumed about the environment when a slave is started - on another host, read the documentation for the rsh + on another host, see the documentation for the rsh program.

+

An alternative to the rsh program can be specified on - the command line to erl as follows: -rsh Program.

-

The slave node should use the same file system at the master. At - least, Erlang/OTP should be installed in the same place on both - computers and the same version of Erlang should be used.

-

Currently, a node running on Windows NT can only start slave + the command line to + erl(1) as follows:

+ + 
+-rsh Program
+ +

The slave node is to use the same file system at the master. At + least, Erlang/OTP is to be installed in the same place on both + computers and the same version of Erlang is to be used.

+ +

A node running on Windows can only start slave nodes on the host on which it is running.

+

The master node must be alive.

 + + + pseudo([Master | ServerList]) -> ok + Start a number of pseudo servers. + + Master = node() + ServerList = [atom()] + + +

Calls pseudo(Master, ServerList). If you want to start + a node from the command line and set up a number of pseudo + servers, an Erlang runtime system can be started as follows:

+ 
+% erl -name abc -s slave pseudo klacke@super x --
+ + + + + + Start a number of pseudo servers. + +

Starts a number of pseudo servers. A pseudo server is a + server with a registered name that does nothing + but pass on all message to the real server that executes at a + master node. A pseudo server is an intermediary that only has + the same registered name as the real server.

+

For example, if you have started a slave node N and + want to execute pxw graphics code on this node, you can + start server pxw_server as a pseudo server at + the slave node. This is illustrated as follows:

+ +rpc:call(N, slave, pseudo, [node(), [pxw_server]]). + + + + + + Run a pseudo server. + +

Runs a pseudo server. This function never returns any value + and the process that executes the function receives + messages. All messages received are simply passed on to + Pid.

+ + + - Start a slave node on a host + Start a slave node on a host. -

Starts a slave node on the host Host. Host names need - not necessarily be specified as fully qualified names; short +

Starts a slave node on host Host. Host names + need not necessarily be specified as fully qualified names; short names can also be used. This is the same condition that applies to names of distributed Erlang nodes.

-

The name of the started node will be Name@Host. If no - name is provided, the name will be the same as the node which - executes the call (with the exception of the host name part of - the node name).

+

The name of the started node becomes + Name@Host. If no + name is provided, the name becomes the same as the node that + executes the call (except the host name part of the node name).

The slave node resets its user process so that all - terminal I/O which is produced at the slave is automatically - relayed to the master. Also, the file process will be relayed + terminal I/O that is produced at the slave is automatically + relayed to the master. Also, the file process is relayed to the master.

-

The Args argument is used to set erl command - line arguments. If provided, it is passed to the new node and - can be used for a variety of purposes. See - erl(1)

-

As an example, suppose that we want to start a slave node at - host H with the node name Name@H, and we also +

Argument Args is used to set erl + command-line arguments. If provided, it is passed to the new + node and can be used for a variety of purposes; see + erl(1).

+

As an example, suppose that you want to start a slave node at + host H with node name Name@H and want the slave node to have the following properties:

- -

directory Dir should be added to the code path;

- - -

the Mnesia directory should be set to M;

- - -

the unix DISPLAY environment variable should be - set to the display of the master node.

- + Directory Dir is to be added to the code path. + The Mnesia directory is to be set to M. + The Unix DISPLAY environment variable is to be + set to the display of the master node.

The following code is executed to achieve this:

E = " -env DISPLAY " ++ net_adm:localhost() ++ ":0 ", Arg = "-mnesia_dir " ++ M ++ " -pa " ++ Dir ++ E, slave:start(H, Name, Arg). -

If successful, the function returns {ok, Node}, - where Node is the name of the new node. Otherwise it - returns {error, Reason}, where Reason can be - one of:

+

The function returns {ok, Node}, where + Node is the name of the new node, otherwise + {error, Reason}, where Reason + can be one of:

timeout

The master node failed to get in contact with the slave - node. This can happen in a number of circumstances:

+ node. This can occur in a number of circumstances:

- Erlang/OTP is not installed on the remote host - the file system on the other host has a different - structure to the the master - the Erlang nodes have different cookies. + Erlang/OTP is not installed on the remote host. + The file system on the other host has a different + structure to the the master. + The Erlang nodes have different cookies. no_rsh @@ -120,75 +170,35 @@ slave:start(H, Name, Arg). {already_running, Node} -

A node with the name Name@Host already exists.

+

A node with name Name@Host + already exists.

 + - Start and link to a slave node on a host + Start and link to a slave node on a host.

Starts a slave node in the same way as start/1,2,3, except that the slave node is linked to the currently executing process. If that process terminates, the slave node also terminates.

-

See start/1,2,3 for a description of arguments and - return values.

+

For a description of arguments and return values, see + start/1,2,3.

 + - Stop (kill) a node + Stop (kill) a node.

Stops (kills) a node.

 - - pseudo([Master | ServerList]) -> ok - Start a number of pseudo servers - - Master = node() - ServerList = [atom()] - - -

Calls pseudo(Master, ServerList). If we want to start - a node from the command line and set up a number of pseudo - servers, an Erlang runtime system can be started as - follows:

- 
-% erl -name abc -s slave pseudo klacke@super x --
- - - - - Start a number of pseudo servers - -

Starts a number of pseudo servers. A pseudo server is a - server with a registered name which does absolutely nothing - but pass on all message to the real server which executes at a - master node. A pseudo server is an intermediary which only has - the same registered name as the real server.

-

For example, if we have started a slave node N and - want to execute pxw graphics code on this node, we can - start the server pxw_server as a pseudo server at - the slave node. The following code illustrates:

- -rpc:call(N, slave, pseudo, [node(), [pxw_server]]). - - - - - Run a pseudo server - -

Runs a pseudo server. This function never returns any value - and the process which executes the function will receive - messages. All messages received will simply be passed on to - Pid.

- - diff --git a/lib/stdlib/doc/src/sofs.xml b/lib/stdlib/doc/src/sofs.xml index 1e5be367bd..4cf1984d46 100644 --- a/lib/stdlib/doc/src/sofs.xml +++ b/lib/stdlib/doc/src/sofs.xml @@ -24,260 +24,284 @@ sofs Hans Bolinder - nobody + - nobody - no + + 2001-08-25 PA1 - sofs.sgml + sofs.xml
sofs - Functions for Manipulating Sets of Sets + Functions for manipulating sets of sets. -

The sofs module implements operations on finite sets and +

This module provides operations on finite sets and relations represented as sets. Intuitively, a set is a collection of elements; every element belongs to the set, and the set contains every element.

+

Given a set A and a sentence S(x), where x is a free variable, a new set B whose elements are exactly those elements of A for which S(x) holds can be formed, this is denoted B = {x in A : S(x)}. Sentences are expressed using the logical operators "for some" (or "there exists"), "for all", "and", "or", "not". If the existence of a set containing all the - specified elements is known (as will always be the case in this - module), we write B = {x : S(x)}.

-

The unordered set containing the elements a, b and c - is denoted {a, b, c}. This notation is not to be - confused with tuples. The ordered pair of a and b, with - first coordinate a and second coordinate b, is denoted - (a, b). An ordered pair is an ordered set of two - elements. In this module ordered sets can contain one, two or - more elements, and parentheses are used to enclose the elements. - Unordered sets and ordered sets are orthogonal, again in this - module; there is no unordered set equal to any ordered set.

-

The set that contains no elements is called the empty set. - If two sets A and B contain the same elements, then A - is equal to B, denoted - A = B. Two ordered sets are equal if they contain the - same number of elements and have equal elements at each - coordinate. If a set A contains all elements that B contains, - then B is a subset of A. - The union of two sets A and B is - the smallest set that contains all elements of A and all elements of - B. The intersection of two - sets A and B is the set that contains all elements of A that - belong to B. - Two sets are disjoint if their - intersection is the empty set. - The difference of - two sets A and B is the set that contains all elements of A that - do not belong to B. - The symmetric - difference of - two sets is the set that contains those element that belong to - either of the two sets, but not both. - The union of a collection - of sets is the smallest set that contains all the elements that - belong to at least one set of the collection. - The intersection of - a non-empty collection of sets is the set that contains all elements - that belong to every set of the collection.

-

The Cartesian - product of - two sets X and Y, denoted X × Y, is the set - {a : a = (x, y) for some x in X and for - some y in Y}. - A relation is a subset of - X × Y. Let R be a relation. The fact that - (x, y) belongs to R is written as x R y. Since - relations are sets, the definitions of the last paragraph - (subset, union, and so on) apply to relations as well. - The domain of R is the - set {x : x R y for some y in Y}. - The range of R is the - set {y : x R y for some x in X}. - The converse of R is the - set {a : a = (y, x) for some - (x, y) in R}. If A is a subset of X, then - the image of - A under R is the set {y : x R y for some - x in A}, and if B is a subset of Y, then - the inverse image of B is - the set {x : x R y for some y in B}. If R is a - relation from X to Y and S is a relation from Y to Z, then - the relative product of - R and S is the relation T from X to Z defined so that x T z - if and only if there exists an element y in Y such that - x R y and y S z. - The restriction of R to A is - the set S defined so that x S y if and only if there exists an - element x in A such that x R y. If S is a restriction - of R to A, then R is - an extension of S to X. - If X = Y then we call R a relation in X. - The field of a relation R in X - is the union of the domain of R and the range of R. - If R is a relation in X, and - if S is defined so that x S y if x R y and - not x = y, then S is - the strict relation - corresponding to - R, and vice versa, if S is a relation in X, and if R is defined - so that x R y if x S y or x = y, - then R is the weak relation - corresponding to S. A relation R in X is reflexive if - x R x for every element x of X; it is - symmetric if x R y implies that - y R x; and it is transitive if - x R y and y R z imply that x R z.

-

A function F is a relation, a - subset of X × Y, such that the domain of F is - equal to X and such that for every x in X there is a unique - element y in Y with (x, y) in F. The latter condition can - be formulated as follows: if x F y and x F z - then y = z. In this module, it will not be required - that the domain of F be equal to X for a relation to be - considered a function. Instead of writing - (x, y) in F or x F y, we write - F(x) = y when F is a function, and say that F maps x - onto y, or that the value of F at x is y. Since functions are - relations, the definitions of the last paragraph (domain, range, - and so on) apply to functions as well. If the converse of a - function F is a function F', then F' is called - the inverse of F. - The relative product of two functions F1 and F2 is called - the composite of F1 and F2 - if the range of F1 is a subset of the domain of F2.

-

Sometimes, when the range of a function is more important than - the function itself, the function is called a family. - The domain of a family is called the index set, and the - range is called the indexed set. If x is a family from - I to X, then x[i] denotes the value of the function at index i. - The notation "a family in X" is used for such a family. When the - indexed set is a set of subsets of a set X, then we call x - a family of subsets of X. If x - is a family of subsets of X, then the union of the range of x is - called the union of the family x. If x is non-empty - (the index set is non-empty), - the intersection of the family x is the intersection of - the range of x. In this - module, the only families that will be considered are families - of subsets of some set X; in the following the word "family" - will be used for such families of subsets.

-

A partition of a set X is a - collection S of non-empty subsets of X whose union is X and - whose elements are pairwise disjoint. A relation in a set is an - equivalence relation if it is reflexive, symmetric and - transitive. If R is an equivalence relation in X, and x is an - element of X, - the equivalence - class of x with respect to R is the set of all those - elements y of X for which x R y holds. The equivalence - classes constitute a partitioning of X. Conversely, if C is a - partition of X, then the relation that holds for any two - elements of X if they belong to the same equivalence class, is - an equivalence relation induced by the partition C. If R is an - equivalence relation in X, then - the canonical map is - the function that maps every element of X onto its equivalence class. -

-

Relations as defined above - (as sets of ordered pairs) will from now on be referred to as - binary relations. We call a set of ordered sets - (x[1], ..., x[n]) an - (n-ary) relation, and say that the relation is a subset of - the Cartesian product - X[1] × ... × X[n] where x[i] is - an element of X[i], 1 <= i <= n. - The projection of an n-ary - relation R onto coordinate i is the set {x[i] : - (x[1], ..., x[i], ..., x[n]) in R for some - x[j] in X[j], 1 <= j <= n - and not i = j}. The projections of a binary relation R - onto the first and second coordinates are the domain and the - range of R respectively. The relative product of binary - relations can be generalized to n-ary relations as follows. Let - TR be an ordered set (R[1], ..., R[n]) of binary - relations from X to Y[i] and S a binary relation from - (Y[1] × ... × Y[n]) to Z. - The relative - product of - TR and S is the binary relation T from X to Z defined so that - x T z if and only if there exists an element y[i] in - Y[i] for each 1 <= i <= n such that - x R[i] y[i] and - (y[1], ..., y[n]) S z. Now let TR be a an - ordered set (R[1], ..., R[n]) of binary relations from - X[i] to Y[i] and S a subset of - X[1] × ... × X[n]. - The multiple - relative product of TR and S is defined to be the - set {z : z = ((x[1], ..., x[n]), (y[1],...,y[n])) - for some (x[1], ..., x[n]) in S and for some - (x[i], y[i]) in R[i], - 1 <= i <= n}. - The natural join of - an n-ary relation R - and an m-ary relation S on coordinate i and j is defined to be - the set {z : z = (x[1], ..., x[n],  - y[1], ..., y[j-1], y[j+1], ..., y[m]) - for some (x[1], ..., x[n]) in R and for some - (y[1], ..., y[m]) in S such that - x[i] = y[j]}.

-

The sets recognized by this - module will be represented by elements of the relation Sets, defined as - the smallest set such that:

+ specified elements is known (as is always the case in this + module), this is denoted B = {x : S(x)}.

+ - for every atom T except '_' and for every term X, - (T, X) belongs to Sets (atomic sets); + +

The unordered set containing the elements a, b, and c is + denoted {a, b, c}. This notation is not to be confused with + tuples.

+

The ordered pair of a and b, with first coordinate + a and second coordinate b, is denoted (a, b). An ordered pair + is an ordered set of two elements. In this module, ordered + sets can contain one, two, or more elements, and parentheses are + used to enclose the elements.

+

Unordered sets and ordered sets are orthogonal, again in this + module; there is no unordered set equal to any ordered set.

 - (['_'], []) belongs to Sets (the untyped empty set); + +

The empty set contains no elements.

+

Set A is equal to set B if they + contain the same elements, which is denoted A = B. Two + ordered sets are equal if they contain the same number of elements + and have equal elements at each coordinate.

+

Set B is a subset of set A + if A contains all elements that B contains.

+

The union of two sets A and B + is the smallest set that contains all elements of A and all elements + of B.

+

The intersection of two + sets A and B is the set that contains all elements of A that belong + to B.

+

Two sets are disjoint if + their intersection is the empty set.

+

The difference of two sets + A and B is the set that contains all elements of A that do not belong + to B.

+

The symmetric + difference of two sets is the set that contains those element + that belong to either of the two sets, but not both.

+

The union of a collection + of sets is the smallest set that contains all the elements that + belong to at least one set of the collection.

+

The intersection of + a non-empty collection of sets is the set that contains all elements + that belong to every set of the collection.

 - for every tuple T = {T[1], ..., T[n]} and - for every tuple X = {X[1], ..., X[n]}, if - (T[i], X[i]) belongs to Sets for every - 1 <= i <= n then (T, X) belongs - to Sets (ordered sets); + +

The Cartesian + product of two sets X and Y, denoted X × Y, is + the set {a : a = (x, y) for some x in X and + for some y in Y}.

+

A relation is a subset of + X × Y. Let R be a relation. The fact that (x, y) + belongs to R is written as x R y. As relations are sets, + the definitions of the last item (subset, union, and so on) apply to + relations as well.

+

The domain of R is the set + {x : x R y for some y in Y}.

+

The range of R is the set + {y : x R y for some x in X}.

+

The converse of R is the + set {a : a = (y, x) for some + (x, y) in R}.

+

If A is a subset of X, the image + of A under R is the set {y : x R y for some + x in A}. If B is a subset of Y, the + inverse image of B is the + set {x : x R y for some y in B}.

+

If R is a relation from X to Y, and S is a relation from Y to Z, the + relative product of R + and S is the relation T from X to Z defined so that x T z + if and only if there exists an element y in Y such that + x R y and y S z.

+

The restriction of R to A + is the set S defined so that x S y if and only if there + exists an element x in A such that x R y.

+

If S is a restriction of R to A, then R is an + extension of S to X.

+

If X = Y, then R is called a relation in X.

+

The field of a relation R in X + is the union of the domain of R and the range of R.

+

If R is a relation in X, and if S is defined so that x S y + if x R y and not x = y, then S is the + strict relation + corresponding to R. Conversely, if S is a relation in X, and if R is + defined so that x R y if x S y or x = y, + then R is the weak + relation corresponding to S.

+

A relation R in X is reflexive if x R x for every + element x of X, it is symmetric if x R y implies + that y R x, and it is transitive if + x R y and y R z imply that x R z.

+ + +

A function F is a relation, + a subset of X × Y, such that the domain of F is equal + to X and such that for every x in X there is a unique element y in Y + with (x, y) in F. The latter condition can be formulated as + follows: if x F y and x F z, then y = z. + In this module, it is not required that the domain of F is equal to X + for a relation to be considered a function.

+

Instead of writing (x, y) in F or x F y, we + write F(x) = y when F is a function, and say that F maps x + onto y, or that the value of F at x is y.

+

As functions are relations, the definitions of the last item (domain, + range, and so on) apply to functions as well.

+

If the converse of a function F is a function F', then F' is called + the inverse of F.

+

The relative product of two functions F1 and F2 is called + the composite of F1 and F2 + if the range of F1 is a subset of the domain of F2.

+ + +

Sometimes, when the range of a function is more important than the + function itself, the function is called a family.

+

The domain of a family is called the index set, and the + range is called the indexed set.

+

If x is a family from I to X, then x[i] denotes the value of the + function at index i. The notation "a family in X" is used for such a + family.

+

When the indexed set is a set of subsets of a set X, we call x a + family of subsets of X.

+

If x is a family of subsets of X, the union of the range of x is + called the union of the family x.

+

If x is non-empty (the index set is non-empty), the intersection + of the family x is the intersection of the range of x.

+

In this module, the only families that are considered are families + of subsets of some set X; in the following, the word "family" is + used for such families of subsets.

+ + +

A partition of a set X is a + collection S of non-empty subsets of X whose union is X and whose + elements are pairwise disjoint.

+

A relation in a set is an equivalence relation if it is + reflexive, symmetric, and transitive.

+

If R is an equivalence relation in X, and x is an element of X, the + equivalence class of + x with respect to R is the set of all those elements y of X for which + x R y holds. The equivalence classes constitute a + partitioning of X. Conversely, if C is a partition of X, the relation + that holds for any two elements of X if they belong to the same + equivalence class, is an equivalence relation induced by the + partition C.

+

If R is an equivalence relation in X, the + canonical map is the + function that maps every element of X onto its equivalence class.

+ + +

Relations as defined above + (as sets of ordered pairs) are from now on referred to as binary + relations.

+

We call a set of ordered sets (x[1], ..., x[n]) an + (n-ary) relation, and + say that the relation is a subset of the + Cartesian product + X[1] × ... × X[n], where x[i] is + an element of X[i], 1 <= i <= n.

+

The projection of an n-ary + relation R onto coordinate i is the set {x[i] : + (x[1], ..., x[i], ..., x[n]) in R for some + x[j] in X[j], 1 <= j <= n and + not i = j}. The projections of a binary relation R onto the + first and second coordinates are the domain and the range of R, + respectively.

+

The relative product of binary relations can be generalized to n-ary + relations as follows. Let TR be an ordered set + (R[1], ..., R[n]) of binary relations from X to Y[i] + and S a binary relation from + (Y[1] × ... × Y[n]) to Z. The + relative product + of TR and S is the binary relation T from X to Z defined so that + x T z if and only if there exists an element y[i] in Y[i] + for each 1 <= i <= n such that + x R[i] y[i] and + (y[1], ..., y[n]) S z. Now let TR be a an + ordered set (R[1], ..., R[n]) of binary relations from + X[i] to Y[i] and S a subset of + X[1] × ... × X[n]. + The multiple + relative product of TR and S is defined to be the set + {z : z = ((x[1], ..., x[n]), (y[1],...,y[n])) + for some (x[1], ..., x[n]) in S and for some + (x[i], y[i]) in R[i], 1 <= i <= n}.

+

The natural join of an + n-ary relation R and an m-ary relation S on coordinate i and j is + defined to be the set + {z : z = (x[1], ..., x[n],  + y[1], ..., y[j-1], y[j+1], ..., y[m]) + for some (x[1], ..., x[n]) in R and for some + (y[1], ..., y[m]) in S such that + x[i] = y[j]}.

+ + +

The sets recognized by this + module are represented by elements of the relation Sets, which is + defined as the smallest set such that:

+ + +

For every atom T, except '_', and for every term X, + (T, X) belongs to Sets (atomic sets).

+ + +

(['_'], []) belongs to Sets (the untyped empty + set).

+ + +

For every tuple T = {T[1], ..., T[n]} and + for every tuple X = {X[1], ..., X[n]}, if + (T[i], X[i]) belongs to Sets for every + 1 <= i <= n, then (T, X) belongs + to Sets (ordered sets).

+ + +

For every term T, if X is the empty list or a non-empty + sorted list [X[1], ..., X[n]] without duplicates + such that (T, X[i]) belongs to Sets for every + 1 <= i <= n, then ([T], X) + belongs to Sets (typed unordered sets).

+ + +

An external set is an + element of the range of Sets.

+

A type is an element of the + domain of Sets.

+

If S is an element (T, X) of Sets, then T is a + valid type of X, T is the + type of S, and X is the external set of S. + from_term/2 creates a + set from a type and an Erlang term turned into an external set.

+

The sets represented by Sets are the elements of the range of + function Set from Sets to Erlang terms and sets of Erlang terms:

+ + Set(T,Term) = Term, where T is an atom + Set({T[1], ..., T[n]}, {X[1], ..., +  X[n]}) = (Set(T[1], X[1]), ...,  + Set(T[n], X[n])) + Set([T], [X[1], ..., X[n]]) = + {Set(T, X[1]), ..., Set(T, X[n])} + Set([T], []) = {} + +

When there is no risk of confusion, elements of Sets are identified + with the sets they represent. For example, if U is the result of + calling union/2 with S1 + and S2 as arguments, then U is said to be the union of S1 and S2. + A more precise formulation is that Set(U) is the union of Set(S1) + and Set(S2).

 - for every term T, if X is the empty list or a non-empty - sorted list [X[1], ..., X[n]] without duplicates - such that (T, X[i]) belongs to Sets for every - 1 <= i <= n, then ([T], X) - belongs to Sets (typed unordered sets). - -

An external set is an - element of the range of Sets. - A type - is an element of the domain of Sets. If S is an element - (T, X) of Sets, then T is - a valid type of X, - T is the type of S, and X is the external set - of S. from_term/2 creates a - set from a type and an Erlang term turned into an external set.

-

The actual sets represented by Sets are the elements of the - range of the function Set from Sets to Erlang terms and sets of - Erlang terms:

- - Set(T,Term) = Term, where T is an atom; - Set({T[1], ..., T[n]}, {X[1], ..., X[n]}) -  = (Set(T[1], X[1]), ..., Set(T[n], X[n])); - Set([T], [X[1], ..., X[n]]) -  = {Set(T, X[1]), ..., Set(T, X[n])}; - Set([T], []) = {}. -

When there is no risk of confusion, elements of Sets will be - identified with the sets they represent. For instance, if U is - the result of calling union/2 with S1 and S2 as - arguments, then U is said to be the union of S1 and S2. A more - precise formulation would be that Set(U) is the union of Set(S1) - and Set(S2).

+

The types are used to implement the various conditions that - sets need to fulfill. As an example, consider the relative + sets must fulfill. As an example, consider the relative product of two sets R and S, and recall that the relative product of R and S is defined if R is a binary relation to Y and - S is a binary relation from Y. The function that implements the relative - product, relative_product/2, checks + S is a binary relation from Y. The function that implements the + relative product, + relative_product/2, checks that the arguments represent binary relations by matching [{A,B}] against the type of the first argument (Arg1 say), and [{C,D}] against the type of the second argument (Arg2 say). The fact @@ -290,33 +314,51 @@ ensure that W is equal to Y. The untyped empty set is handled separately: its type, ['_'], matches the type of any unordered set.

-

A few functions of this module (drestriction/3, - family_projection/2, partition/2, - partition_family/2, projection/2, - restriction/3, substitution/2) accept an Erlang + +

A few functions of this module + (drestriction/3, + family_projection/2, + partition/2, + partition_family/2, + projection/2, + restriction/3, + substitution/2) + accept an Erlang function as a means to modify each element of a given unordered set. Such a function, called - SetFun in the following, can be - specified as a functional object (fun), a tuple - {external, Fun}, or an integer. If SetFun is - specified as a fun, the fun is applied to each element of the - given set and the return value is assumed to be a set. If SetFun - is specified as a tuple {external, Fun}, Fun is applied - to the external set of each element of the given set and the - return value is assumed to be an external set. Selecting the - elements of an unordered set as external sets and assembling a - new unordered set from a list of external sets is in the present - implementation more efficient than modifying each element as a - set. However, this optimization can only be utilized when the - elements of the unordered set are atomic or ordered sets. It - must also be the case that the type of the elements matches some - clause of Fun (the type of the created set is the result of - applying Fun to the type of the given set), and that Fun does - nothing but selecting, duplicating or rearranging parts of the - elements. Specifying a SetFun as an integer I is equivalent to - specifying {external, fun(X) -> element(I, X) end}, - but is to be preferred since it makes it possible to handle this - case even more efficiently. Examples of SetFuns:

+ SetFun in the following, can be specified as a functional object (fun), + a tuple {external, Fun}, or an integer:

+ + + +

If SetFun is specified as a fun, the fun is applied to each element + of the given set and the return value is assumed to be a set.

+ + +

If SetFun is specified as a tuple {external, Fun}, Fun is + applied to the external set of each element of the given set and the + return value is assumed to be an external set. Selecting the + elements of an unordered set as external sets and assembling a + new unordered set from a list of external sets is in the present + implementation more efficient than modifying each element as a + set. However, this optimization can only be used when the + elements of the unordered set are atomic or ordered sets. It + must also be the case that the type of the elements matches some + clause of Fun (the type of the created set is the result of + applying Fun to the type of the given set), and that Fun does + nothing but selecting, duplicating, or rearranging parts of the + elements.

+ + +

Specifying a SetFun as an integer I is equivalent to + specifying {external, fun(X) -> + element(I, X) end}, but is to be preferred, as it + makes it possible to handle this case even more efficiently.

+ + + +

Examples of SetFuns:

+ 
 fun sofs:union/1
 fun(S) -> sofs:partition(1, S) end
@@ -325,22 +367,31 @@ fun(S) -> sofs:partition(1, S) end
 {external, fun({_,{_,C}}) -> C end}
 {external, fun({_,{_,{_,E}=C}}) -> {E,{E,C}} end}
 2
+

The order in which a SetFun is applied to the elements of an - unordered set is not specified, and may change in future - versions of sofs.

+ unordered set is not specified, and can change in future + versions of this module.

+

The execution time of the functions of this module is dominated by the time it takes to sort lists. When no sorting is needed, the execution time is in the worst case proportional to the sum of the sizes of the input arguments and the returned value. A - few functions execute in constant time: from_external, - is_empty_set, is_set, is_sofs_set, - to_external, type.

+ few functions execute in constant time: + from_external/2, + is_empty_set/1, + is_set/1, + is_sofs_set/1, + to_external/1 + type/1.

+

The functions of this module exit the process with a badarg, bad_function, or type_mismatch message when given badly formed arguments or sets the types of which are not compatible.

-

When comparing external sets the operator ==/2 is used.

+ +

When comparing external sets, operator ==/2 is used.

 + @@ -402,6 +453,7 @@ fun(S) -> sofs:partition(1, S) end

A tuple where the elements are of type T.

 + @@ -410,24 +462,25 @@ fun(S) -> sofs:partition(1, S) end

Creates a function. a_function(F, T) is equivalent to - from_term(F, T), if the result is a function. If + from_term(F, T) if the result is a function. If no type is explicitly - given, [{atom, atom}] is used as type of the - function.

+ specified, [{atom, atom}] is used as the + function type.

 + Return the canonical map.

Returns the binary relation containing the elements - (E, Set) such that Set belongs to SetOfSets and E - belongs to Set. If SetOfSets is - a partition of a set X and - R is the equivalence relation in X induced by SetOfSets, then the - returned relation is - the canonical map from - X onto the equivalence classes with respect to R.

+ (E, Set) such that Set belongs to SetOfSets + and E belongs to Set. If SetOfSets is + a partition of a set X and + R is the equivalence relation in X induced by SetOfSets, + then the returned relation is + the canonical map from + X onto the equivalence classes with respect to R.

 1> Ss = sofs:from_term([[a,b],[b,c]]),
 CR = sofs:canonical_relation(Ss),
@@ -435,13 +488,14 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[a,b]},{b,[a,b]},{b,[b,c]},{c,[b,c]}]
 + Return the composite of two functions.

Returns the composite of - the functions Function1 and - Function2.

+ the functions Function1 and + Function2.

 1> F1 = sofs:a_function([{a,1},{b,2},{c,2}]),
 F2 = sofs:a_function([{1,x},{2,y},{3,z}]),
@@ -450,13 +504,14 @@ fun(S) -> sofs:partition(1, S) end
 [{a,x},{b,y},{c,y}]
 + - Create the function that maps each element of a + Create the function that maps each element of a set onto another set.

Creates the function - that maps each element of the set Set onto AnySet.

+ that maps each element of set Set onto AnySet.

 1> S = sofs:set([a,b]),
 E = sofs:from_term(1),
@@ -465,12 +520,13 @@ fun(S) -> sofs:partition(1, S) end
 [{a,1},{b,1}]
 + Return the converse of a binary relation.

Returns the converse - of the binary relation BinRel1.

+ of the binary relation BinRel1.

 1> R1 = sofs:relation([{1,a},{2,b},{3,a}]),
 R2 = sofs:converse(R1),
@@ -478,39 +534,42 @@ fun(S) -> sofs:partition(1, S) end
 [{a,1},{a,3},{b,2}]
 + Return the difference of two sets. -

Returns the difference of - the sets Set1 and Set2.

+

Returns the difference of + the sets Set1 and Set2.

 + Create a family from a directed graph.

Creates a family from - the directed graph Graph. Each vertex a of - Graph is - represented by a pair (a, {b[1], ..., b[n]}) - where the b[i]'s are the out-neighbours of a. If no type is - explicitly given, [{atom, [atom]}] is used as type of - the family. It is assumed that Type is - a valid type of the - external set of the family.

+ the directed graph Graph. Each vertex a of + Graph is + represented by a pair (a, {b[1], ..., b[n]}), + where the b[i]:s are the out-neighbors of a. If no type is + explicitly specified, [{atom, [atom]}] is used as type of + the family. It is assumed that Type is + a valid type of the + external set of the family.

If G is a directed graph, it holds that the vertices and edges of G are the same as the vertices and edges of family_to_digraph(digraph_to_family(G)).

 + Return the domain of a binary relation. -

Returns the domain of - the binary relation BinRel.

+

Returns the domain of + the binary relation BinRel.

 1> R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),
 S = sofs:domain(R),
@@ -518,14 +577,15 @@ fun(S) -> sofs:partition(1, S) end
 [1,2]
 + Return a restriction of a binary relation.

Returns the difference between the binary relation - BinRel1 + BinRel1 and the restriction - of BinRel1 to Set.

+ of BinRel1 to Set.

 1> R1 = sofs:relation([{1,a},{2,b},{3,c}]),
 S = sofs:set([2,4,6]),
@@ -536,14 +596,15 @@ fun(S) -> sofs:partition(1, S) end
           difference(R, restriction(R, S)).

       
     
+
     
       
       Return a restriction of a relation.
       
-        
Returns a subset of Set1 containing those elements
-          that do
-          not yield an element in Set2 as the result of applying
-          SetFun.

+        
Returns a subset of Set1 containing those
+          elements that do not give
+          an element in Set2 as the result of applying
+          SetFun.

         
 1> SetFun = {external, fun({_A,B,C}) -> {B,C} end},
 R1 = sofs:relation([{a,aa,1},{b,bb,2},{c,cc,3}]),
@@ -555,24 +616,27 @@ fun(S) -> sofs:partition(1, S) end
           difference(S1, restriction(F, S1, S2)).

       
     
+
     
       
       Return the untyped empty set.
       
-        
Returns the untyped empty 
+        
Returns the untyped empty
           set. empty_set() is equivalent to
           from_term([], ['_']).

       
     
+
     
       
       Extend the domain of a binary relation.
       
-        
Returns the extension of 
-	  BinRel1 such that
-          for each element E in Set that does not belong to the
-          domain of BinRel1,
-          BinRel2 contains the pair (E, AnySet).

+        
Returns the extension of
+          BinRel1 such that for
+          each element E in Set that does not belong to the
+          domain of
+          BinRel1, BinRel2 contains the
+          pair (E, AnySet).

         
 1> S = sofs:set([b,c]),
 A = sofs:empty_set(),
@@ -582,31 +646,33 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[1,2]},{b,[3]},{c,[]}]

       
     
+
     
       
       
       Create a family of subsets.
       
-        
Creates a family of subsets. 
-	  family(F, T) is equivalent to
-          from_term(F, T), if the result is a family. If
+        
Creates a family of subsets.
+          family(F, T) is equivalent to
+          from_term(F, T) if the result is a family. If
           no type is explicitly
-          given, [{atom, [atom]}] is used as type of the
-          family.

+          specified, [{atom, [atom]}] is used as the
+          family type.

       
     
+
     
       
       Return the difference of two families.
       
-        
If Family1 and Family2
-	  are families, then 
-	  Family3 is the family
+        
If Family1 and Family2
+          are families, then
+          Family3 is the family
           such that the index set is equal to the index set of
-          Family1, and Family3[i] is the
-          difference between Family1[i]
-          and Family2[i] if Family2 maps i,
-          Family1[i] otherwise.

+          Family1, and Family3[i] is
+          the difference between Family1[i]
+          and Family2[i] if Family2
+          maps i, otherwise Family1[i].

         
 1> F1 = sofs:family([{a,[1,2]},{b,[3,4]}]),
 F2 = sofs:family([{b,[4,5]},{c,[6,7]}]),
@@ -615,19 +681,20 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[1,2]},{b,[3]}]

       
     
+
     
       
       Return a family of domains.
       
-        
If Family1 is
+        
If Family1 is
           a family
-          and Family1[i] is a binary relation for every i
-          in the index set of Family1,
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is
+          and Family1[i] is a binary relation for every i
+          in the index set of Family1,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is
           the domain of
-          Family1[i].

+          Family1[i].

         
 1> FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
 F = sofs:family_domain(FR),
@@ -635,43 +702,46 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[1,2,3]},{b,[]},{c,[4,5]}]

       
     
+
     
       
       Return a family of fields.
       
-        
If Family1 is
+        
If Family1 is
           a family
-          and Family1[i] is a binary relation for every i
-          in the index set of Family1,
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is
+          and Family1[i] is a binary relation for every i
+          in the index set of Family1,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is
           the field of
-          Family1[i].

+          Family1[i].

         
 1> FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
 F = sofs:family_field(FR),
 sofs:to_external(F).
 [{a,[1,2,3,a,b,c]},{b,[]},{c,[4,5,d,e]}]

         
family_field(Family1) is equivalent to
-          family_union(family_domain(Family1), family_range(Family1)).

+          family_union(family_domain(Family1),
+          family_range(Family1)).

       
     
+
     
       
       Return the intersection of a family
          of sets of sets.
       
-        
If Family1 is
+        
If Family1 is
           a family
-          and Family1[i] is a set of sets for every i in
-          the index set of Family1,
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is
+          and Family1[i] is a set of sets for every i in
+          the index set of Family1,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is
           the intersection
-          of Family1[i].

-        
If Family1[i] is an empty set for some i, then
+          of Family1[i].

+        
If Family1[i] is an empty set for some i,
           the process exits with a badarg message.

         
 1> F1 = sofs:from_term([{a,[[1,2,3],[2,3,4]]},{b,[[x,y,z],[x,y]]}]),
@@ -680,17 +750,18 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[2,3]},{b,[x,y]}]

       
     
+
     
       
       Return the intersection of two families.
       
-        
If Family1 and Family2
-	  are families,
-	  then Family3 is the family such that the index
-	  set is the intersection of Family1's and
-	  Family2's index sets,
-	  and Family3[i] is the intersection of
-	  Family1[i] and Family2[i].

+        
If Family1 and Family2
+          are families,
+          then Family3 is the family such that the index
+          set is the intersection of Family1:s and
+          Family2:s index sets,
+          and Family3[i] is the intersection of
+          Family1[i] and Family2[i].

         
 1> F1 = sofs:family([{a,[1,2]},{b,[3,4]},{c,[5,6]}]),
 F2 = sofs:family([{b,[4,5]},{c,[7,8]},{d,[9,10]}]),
@@ -699,17 +770,18 @@ fun(S) -> sofs:partition(1, S) end
 [{b,[4]},{c,[]}]

       
     
+
     
       
       Return a family of modified subsets.
       
-        
If Family1 is
-          a family
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is the result of
-          calling SetFun with Family1[i] as
-          argument.

+        
If Family1 is
+          a family,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is the result of
+          calling SetFun with Family1[i]
+          as argument.

         
 1> F1 = sofs:from_term([{a,[[1,2],[2,3]]},{b,[[]]}]),
 F2 = sofs:family_projection(fun sofs:union/1, F1),
@@ -717,19 +789,20 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[1,2,3]},{b,[]}]

       
     
+
     
       
       Return a family of ranges.
       
-        
If Family1 is
+        
If Family1 is
           a family
-          and Family1[i] is a binary relation for every i
-          in the index set of Family1,
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is
+          and Family1[i] is a binary relation for every i
+          in the index set of Family1,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is
           the range of
-          Family1[i].

+          Family1[i].

         
 1> FR = sofs:from_term([{a,[{1,a},{2,b},{3,c}]},{b,[]},{c,[{4,d},{5,e}]}]),
 F = sofs:family_range(FR),
@@ -737,22 +810,23 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[a,b,c]},{b,[]},{c,[d,e]}]

       
     
+
     
       
       Select a subset of a family using a predicate.
       
-        
If Family1 is
+        
If Family1 is
           a family,
-          then Family2 is
+          then Family2 is
           the restriction of
-          Family1 to those elements i of the index set
-          for which Fun applied
-          to Family1[i] returns
-          true. If Fun is a
-          tuple {external, Fun2}, Fun2 is applied to
+          Family1 to those elements i of the index set
+          for which Fun applied
+          to Family1[i] returns
+          true. If Fun is a
+          tuple {external, Fun2}, then Fun2 is applied to
           the external set
-          of Family1[i], otherwise Fun is
-          applied to Family1[i].

+          of Family1[i], otherwise Fun
+           is applied to Family1[i].

         
 1> F1 = sofs:family([{a,[1,2,3]},{b,[1,2]},{c,[1]}]),
 SpecFun = fun(S) -> sofs:no_elements(S) =:= 2 end,
@@ -761,23 +835,24 @@ fun(S) -> sofs:partition(1, S) end
 [{b,[1,2]}]

       
     
+
     
       
       
       Create a directed graph from a family.
       
-        
Creates a directed graph from 
-	  the family Family.
+        
Creates a directed graph from
+          family Family.
           For each pair (a, {b[1], ..., b[n]})
-          of Family, the vertex
-          a as well the edges (a, b[i]) for
+          of Family, vertex
+          a and the edges (a, b[i]) for
           1 <= i <= n are added to a newly
           created directed graph.

-        
If no graph type is given 
-          digraph:new/0 is used for
-          creating the directed graph, otherwise the GraphType
-          argument is passed on as second argument to
-          digraph:new/1.

+        
If no graph type is specified, 
+          digraph:new/0 is used for
+          creating the directed graph, otherwise argument
+          GraphType is passed on as second argument to
+          digraph:new/1.

         
It F is a family, it holds that F is a subset of
           digraph_to_family(family_to_digraph(F), type(F)).
           Equality holds if union_of_family(F) is a subset of
@@ -786,16 +861,17 @@ fun(S) -> sofs:partition(1, S) end
           a cyclic message.

       
     
+
     
       
       Create a binary relation from a family.
       
-        
If Family is
+        
If Family is
           a family,
-          then BinRel is the binary relation containing
+          then BinRel is the binary relation containing
           all pairs (i, x) such that i belongs to the index set
-          of Family and x belongs
-          to Family[i].

+          of Family and x belongs
+          to Family[i].

         
 1> F = sofs:family([{a,[]}, {b,[1]}, {c,[2,3]}]),
 R = sofs:family_to_relation(F),
@@ -803,19 +879,20 @@ fun(S) -> sofs:partition(1, S) end
 [{b,1},{c,2},{c,3}]

       
     
+
     
       
       Return the union of a family of sets of sets.
       
-        
If Family1 is
+        
If Family1 is
           a family
-          and Family1[i] is a set of sets for each i in
-          the index set of Family1,
-          then Family2 is the family with the same index
-          set as Family1 such
-          that Family2[i] is
+          and Family1[i] is a set of sets for each i in
+          the index set of Family1,
+          then Family2 is the family with the same index
+          set as Family1 such
+          that Family2[i] is
           the union of
-          Family1[i].

+          Family1[i].

         
 1> F1 = sofs:from_term([{a,[[1,2],[2,3]]},{b,[[]]}]),
 F2 = sofs:family_union(F1),
@@ -825,19 +902,20 @@ fun(S) -> sofs:partition(1, S) end
           family_projection(fun sofs:union/1, F).

       
     
+
     
       
       Return the union of two families.
       
-        
If Family1 and Family2
-	  are families,
-	  then Family3 is the family such that the index
-	  set is the union of Family1's
-	  and Family2's index sets,
-	  and Family3[i] is the union
-	  of Family1[i] and Family2[i] if
-	  both maps i, Family1[i]
-	  or Family2[i] otherwise.

+        
If Family1 and Family2
+          are families,
+          then Family3 is the family such that the index
+          set is the union of Family1:s
+          and Family2:s index sets,
+          and Family3[i] is the union
+          of Family1[i] and Family2[i]
+          if both map i, otherwise Family1[i]
+          or Family2[i].

         
 1> F1 = sofs:family([{a,[1,2]},{b,[3,4]},{c,[5,6]}]),
 F2 = sofs:family([{b,[4,5]},{c,[7,8]},{d,[9,10]}]),
@@ -846,40 +924,43 @@ fun(S) -> sofs:partition(1, S) end
 [{a,[1,2]},{b,[3,4,5]},{c,[5,6,7,8]},{d,[9,10]}]

       
     
+
     
       
       Return the field of a binary relation.
       
         
Returns the field of the
-          binary relation BinRel.

+          binary relation BinRel.

         
 1> R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),
 S = sofs:field(R),
 sofs:to_external(S).
 [1,2,a,b,c]

-        
field(R) is equivalent 
-	  to union(domain(R), range(R)).

+        
field(R) is equivalent
+          to union(domain(R), range(R)).

       
     
+
     
       
       Create a set.
       
         
Creates a set from the external 
-	  set ExternalSet
-          and the type Type.
-          It is assumed that Type is
+          set ExternalSet and
+          the type Type.
+          It is assumed that Type is
           a valid
-	  type of ExternalSet.

+          type of ExternalSet.

       
     
+
     
       
       Create a set out of a list of sets.
       
-        
Returns the unordered 
-          set containing the sets of the list
-          ListOfSets.

+        
Returns the unordered
+          set containing the sets of list
+          ListOfSets.

         
 1> S1 = sofs:relation([{a,1},{b,2}]),
 S2 = sofs:relation([{x,3},{y,4}]),
@@ -888,31 +969,33 @@ fun(S) -> sofs:partition(1, S) end
 [[{a,1},{b,2}],[{x,3},{y,4}]]

       
     
+
     
       
       Create an ordered set out of a tuple of sets.
       
-        
Returns the ordered 
-	  set containing the sets of the non-empty tuple 
-	  TupleOfSets.

+        
Returns the ordered
+          set containing the sets of the non-empty tuple
+          TupleOfSets.

       
     
+
     
       
       
       Create a set.
       
-        
Creates an element 
-	  of Sets by 
-	  traversing the term Term, sorting lists,
-          removing duplicates and
-	  deriving or verifying a valid 
-	  type for the so obtained external set. An
-          explicitly given type
-          Type
+        
Creates an element
+          of Sets by
+          traversing term Term, sorting lists,
+          removing duplicates, and
+          deriving or verifying a valid
+          type for the so obtained external set. An
+          explicitly specified type
+          Type
           can be used to limit the depth of the traversal; an atomic
-          type stops the traversal, as demonstrated by this example
-          where "foo" and {"foo"} are left unmodified:

+          type stops the traversal, as shown by the following example
+          where "foo" and {"foo"} are left unmodified:

         
 1> S = sofs:from_term([{{"foo"},[1,1]},{"foo",[2,2]}],
 [{atom,[atom]}]),
@@ -920,12 +1003,12 @@ fun(S) -> sofs:partition(1, S) end
 [{{"foo"},[1]},{"foo",[2]}]

         
from_term can be used for creating atomic or ordered
           sets. The only purpose of such a set is that of later
-          building unordered sets since all functions in this module
+          building unordered sets, as all functions in this module
           that do anything operate on unordered sets.
           Creating unordered sets from a collection of ordered sets
-          may be the way to go if the ordered sets are big and one
+          can be the way to go if the ordered sets are big and one
           does not want to waste heap by rebuilding the elements of
-          the unordered set. An example showing that a set can be
+          the unordered set. The following example shows that a set can be
           built "layer by layer":

         
 1> A = sofs:from_term(a),
@@ -935,19 +1018,25 @@ fun(S) -> sofs:partition(1, S) end
 Ss = sofs:from_sets([P1,P2]),
 sofs:to_external(Ss).
 [{a,[1,2,3]},{b,[4,5,6]}]

-        
Other functions that create sets are from_external/2
-          and from_sets/1. Special cases of from_term/2
-          are a_function/1,2, empty_set/0,
-          family/1,2, relation/1,2, and set/1,2.

+        
Other functions that create sets are
+          from_external/2
+          and from_sets/1.
+          Special cases of from_term/2 are
+          a_function/1,2,
+          empty_set/0,
+          family/1,2,
+          relation/1,2, and
+          set/1,2.

       
     
+
     
       
       Return the image of a set under a binary relation.
       
-        
Returns the image of the
-          set Set1 under the binary
-          relation BinRel.

+        
Returns the image of
+          set Set1 under the binary
+          relation BinRel.

         
 1> R = sofs:relation([{1,a},{2,b},{2,c},{3,d}]),
 S1 = sofs:set([1,2]),
@@ -956,32 +1045,35 @@ fun(S) -> sofs:partition(1, S) end
 [a,b,c]

       
     
+
     
       
       Return the intersection of a set of sets.
       
-        
Returns 
-	  the intersection of 
-	  the set of sets SetOfSets.

+        
Returns
+          the intersection of
+          the set of sets SetOfSets.

         
Intersecting an empty set of sets exits the process with a
           badarg message.

       
     
+
     
       
       Return the intersection of two sets.
       
-        
Returns 
-	  the intersection of 
-	  Set1 and Set2.

+        
Returns
+          the intersection of
+          Set1 and Set2.

       
     
+
     
       
       Return the intersection of a family.
       
-        
Returns the intersection of 
-	  the family Family.
+        
Returns the intersection of
+          family Family.
         

         
Intersecting an empty family exits the process with a
           badarg message.

@@ -992,12 +1084,13 @@ fun(S) -> sofs:partition(1, S) end
 [2]

       
     
+
     
       
       Return the inverse of a function.
       
         
Returns the inverse
-          of the function Function1.

+          of function Function1.

         
 1> R1 = sofs:relation([{1,a},{2,b},{3,c}]),
 R2 = sofs:inverse(R1),
@@ -1005,14 +1098,15 @@ fun(S) -> sofs:partition(1, S) end
 [{a,1},{b,2},{c,3}]

       
     
+
     
       
-      Return the inverse image of a set under 
+      Return the inverse image of a set under
         a binary relation.
       
         
Returns the inverse
-	  image of Set1 under the binary
-	  relation BinRel.

+          image of Set1 under the binary
+          relation BinRel.

         
 1> R = sofs:relation([{1,a},{2,b},{2,c},{3,d}]),
 S1 = sofs:set([c,d,e]),
@@ -1021,42 +1115,46 @@ fun(S) -> sofs:partition(1, S) end
 [2,3]

       
     
+
     
       
       Test for a function.
       
-        
Returns true if the binary relation BinRel
+        
Returns true if the binary relation BinRel
           is a function or the
-          untyped empty set, false otherwise.

+          untyped empty set, otherwise false.

       
     
+
     
       
       Test for disjoint sets.
       
-        
Returns true if Set1
-	  and Set2
-	  are disjoint, false
-          otherwise.

+        
Returns true if Set1
+          and Set2
+          are disjoint, otherwise
+          false.

       
     
+
     
       
       Test for an empty set.
       
-        
Returns true if AnySet is an empty
-          unordered set, false otherwise.

+        
Returns true if AnySet is an empty
+          unordered set, otherwise false.

       
     
+
     
       
       Test two sets for equality.
       
-        
Returns true if the AnySet1
-	  and AnySet2
-	  are equal, false 
-	  otherwise. This example shows that ==/2 is used when
-          comparing sets for equality:

+        
Returns true if AnySet1
+          and AnySet2
+          are equal, otherwise
+          false. The following  example shows that ==/2 is
+          used when comparing sets for equality:

         
 1> S1 = sofs:set([1.0]),
 S2 = sofs:set([1]),
@@ -1064,50 +1162,55 @@ fun(S) -> sofs:partition(1, S) end
 true

       
     
+
     
       
       Test for an unordered set.
       
-        
Returns true if AnySet is
-	  an unordered set, and
-          false if AnySet is an ordered set or an
+        
Returns true if AnySet is
+          an unordered set, and
+          false if AnySet is an ordered set or an
           atomic set.

       
     
+
     
       
       Test for an unordered set.
       
-        
Returns true if Term is
+        
Returns true if Term is
           an unordered set, an
-          ordered set or an atomic set, false otherwise.

+          ordered set, or an atomic set, otherwise false.

       
     
+
     
       
       Test two sets for subset.
       
-        
Returns true if Set1 is
-	  a subset
-	  of Set2, false otherwise.

+        
Returns true if Set1 is
+          a subset
+          of Set2, otherwise false.

       
     
+
     
       
       Test for a type.
       
-        
Returns true if the term Term is
-	  a type.

+        
Returns true if term Term is
+          a type.

       
     
+
     
       
       Return the join of two relations.
       
-        
Returns the natural 
-	  join of the relations Relation1
-	  and Relation2 on coordinates I and
-	  J.

+        
Returns the natural
+          join of the relations Relation1
+          and Relation2 on coordinates I
+          and J.

         
 1> R1 = sofs:relation([{a,x,1},{b,y,2}]),
 R2 = sofs:relation([{1,f,g},{1,h,i},{2,3,4}]),
@@ -1116,18 +1219,19 @@ true

 [{a,x,1,f,g},{a,x,1,h,i},{b,y,2,3,4}]

       
     
+
     
       
-      Return the multiple relative product of a tuple of binary 
+      Return the multiple relative product of a tuple of binary
         relations and a relation.
       
-        
If TupleOfBinRels is a non-empty tuple
+        
If TupleOfBinRels is a non-empty tuple
           {R[1], ..., R[n]} of binary relations
-          and BinRel1 is a binary relation,
-          then BinRel2 is
-	  the multiple relative 
-	  product of the ordered set
-          (R[i], ..., R[n]) and BinRel1.

+          and BinRel1 is a binary relation,
+          then BinRel2 is
+          the multiple relative
+          product of the ordered set
+          (R[i], ..., R[n]) and BinRel1.

         
 1> Ri = sofs:relation([{a,1},{b,2},{c,3}]),
 R = sofs:relation([{a,b},{b,c},{c,a}]),
@@ -1136,22 +1240,24 @@ true

 [{1,2},{2,3},{3,1}]
 + Return the number of elements of a set.

Returns the number of elements of the ordered or unordered - set ASet.

+ set ASet.

 + Return the coarsest partition given a set of sets. -

Returns the partition of - the union of the set of sets SetOfSets such that two - elements are considered equal if they belong to the same - elements of SetOfSets.

+

Returns the partition of + the union of the set of sets SetOfSets such that + two elements are considered equal if they belong to the same + elements of SetOfSets.

 1> Sets1 = sofs:from_term([[a,b,c],[d,e,f],[g,h,i]]),
 Sets2 = sofs:from_term([[b,c,d],[e,f,g],[h,i,j]]),
@@ -1160,13 +1266,14 @@ true
[[a],[b,c],[d],[e,f],[g],[h,i],[j]] + Return a partition of a set. -

Returns the partition of - Set such that two elements are considered equal - if the results of applying SetFun are equal.

+

Returns the partition of + Set such that two elements are considered equal + if the results of applying SetFun are equal.

 1> Ss = sofs:from_term([[a],[b],[c,d],[e,f]]),
 SetFun = fun(S) -> sofs:from_term(sofs:no_elements(S)) end,
@@ -1175,17 +1282,18 @@ true
[[[a],[b]],[[c,d],[e,f]]] + Return a partition of a set.

Returns a pair of sets that, regarded as constituting a - set, forms a partition of - Set1. If the - result of applying SetFun to an element - of Set1 yields an element in Set2, - the element belongs to Set3, otherwise the - element belongs to Set4.

+ set, forms a partition of + Set1. If the + result of applying SetFun to an element of + Set1 gives an element in Set2, + the element belongs to Set3, otherwise the + element belongs to Set4.

 1> R1 = sofs:relation([{1,a},{2,b},{3,c}]),
 S = sofs:set([2,4,6]),
@@ -1193,23 +1301,23 @@ true
{sofs:to_external(R2),sofs:to_external(R3)}. {[{2,b}],[{1,a},{3,c}]}

partition(F, S1, S2) is equivalent to - {restriction(F, S1, S2), + {restriction(F, S1, S2), drestriction(F, S1, S2)}.

 + Return a family indexing a partition. -

Returns the family - Family where the indexed set is - a partition - of Set such that two elements are considered - equal if the results of applying SetFun are the - same value i. This i is the index that Family - maps onto - the equivalence - class.

+

Returns family + Family where the indexed set is + a partition + of Set such that two elements are considered + equal if the results of applying SetFun are the + same value i. This i is the index that Family + maps onto the equivalence + class.

 1> S = sofs:relation([{a,a,a,a},{a,a,b,b},{a,b,b,b}]),
 SetFun = {external, fun({A,_,C,_}) -> {A,C} end},
@@ -1218,16 +1326,16 @@ true
[{{a,a},[{a,a,a,a}]},{{a,b},[{a,a,b,b},{a,b,b,b}]}] + Return the Cartesian product of a tuple of sets. -

Returns the Cartesian - product of the non-empty tuple of sets - TupleOfSets. If (x[1], ..., x[n]) is - an element of the n-ary relation Relation, then - x[i] is drawn from element i - of TupleOfSets.

+

Returns the Cartesian + product of the non-empty tuple of sets + TupleOfSets. If (x[1], ..., x[n]) is + an element of the n-ary relation Relation, then + x[i] is drawn from element i of TupleOfSets.

 1> S1 = sofs:set([a,b]),
 S2 = sofs:set([1,2]),
@@ -1237,13 +1345,14 @@ true
[{a,1,x},{a,1,y},{a,2,x},{a,2,y},{b,1,x},{b,1,y},{b,2,x},{b,2,y}] + Return the Cartesian product of two sets. -

Returns the Cartesian - product of Set1 - and Set2.

+

Returns the Cartesian + product of Set1 + and Set2.

 1> S1 = sofs:set([1,2]),
 S2 = sofs:set([a,b]),
@@ -1254,17 +1363,18 @@ true
product({S1, S2}).

 + Return a set of substituted elements.

Returns the set created by substituting each element of - Set1 by the result of - applying SetFun to the element.

-

If SetFun is a number i >= 1 and - Set1 is a relation, then the returned set is + Set1 by the result of + applying SetFun to the element.

+

If SetFun is a number i >= 1 and + Set1 is a relation, then the returned set is the projection of - Set1 onto coordinate i.

+ Set1 onto coordinate i.

 1> S1 = sofs:from_term([{1,a},{2,b},{3,a}]),
 S2 = sofs:projection(2, S1),
@@ -1272,12 +1382,13 @@ true
[a,b] + Return the range of a binary relation.

Returns the range of the - binary relation BinRel.

+ binary relation BinRel.

 1> R = sofs:relation([{1,a},{1,b},{2,b},{2,c}]),
 S = sofs:range(R),
@@ -1285,6 +1396,7 @@ true
[a,b,c] + @@ -1292,27 +1404,28 @@ true

Creates a relation. relation(R, T) is equivalent to - from_term(R, T), if T is - a type and the result is a - relation. If Type is an integer N, then - [{atom, ..., atom}]), where the size of the - tuple is N, is used as type of the relation. If no type is - explicitly given, the size of the first tuple of - Tuples is + from_term(R, T), if T is + a type and the result is a + relation. If Type is an integer N, then + [{atom, ..., atom}]), where the tuple size + is N, is used as type of the relation. If no type is + explicitly specified, the size of the first tuple of + Tuples is used if there is such a tuple. relation([]) is equivalent to relation([], 2).

 + Create a family from a binary relation. -

Returns the family - Family such that the index set is equal to - the domain of the binary - relation BinRel, and Family[i] is - the image of the set of i - under BinRel.

+

Returns family + Family such that the index set is equal to + the domain of the binary + relation BinRel, and Family[i] + is the image of the set of i + under BinRel.

 1> R = sofs:relation([{b,1},{c,2},{c,3}]),
 F = sofs:relation_to_family(R),
@@ -1320,20 +1433,21 @@ true
[{b,[1]},{c,[2,3]}] + Return the relative product of a list of binary relations - and a binary relation. + and a binary relation. -

If ListOfBinRels is a non-empty list +

If ListOfBinRels is a non-empty list [R[1], ..., R[n]] of binary relations and - BinRel1 - is a binary relation, then BinRel2 is the relative product + BinRel1 + is a binary relation, then BinRel2 is the + relative product of the ordered set (R[i], ..., R[n]) and - BinRel1.

-

If BinRel1 is omitted, the relation of equality + BinRel1.

+

If BinRel1 is omitted, the relation of equality between the elements of the Cartesian product of the ranges of R[i], @@ -1345,33 +1459,33 @@ true R2 = sofs:relative_product([TR, R1]), sofs:to_external(R2). [{1,{a,u}},{1,{aa,u}},{2,{b,v}}] -

Note that relative_product([R1], R2) is +

Notice that relative_product([R1], R2) is different from relative_product(R1, R2); the - list of one element is not identified with the element - itself.

+ list of one element is not identified with the element itself.

 + - Return the relative product of + Return the relative product of two binary relations. -

Returns - the relative - product of the binary relations BinRel1 - and BinRel2.

+

Returns the relative + product of the binary relations BinRel1 + and BinRel2.

 + - Return the relative_product of + Return the relative_product of two binary relations. -

Returns the relative - product of - the converse of the - binary relation BinRel1 and the binary - relation BinRel2.

+

Returns the relative + product of + the converse of the + binary relation BinRel1 and the binary + relation BinRel2.

 1> R1 = sofs:relation([{1,a},{1,aa},{2,b}]),
 R2 = sofs:relation([{1,u},{2,v},{3,c}]),
@@ -1382,13 +1496,14 @@ true
relative_product(converse(R1), R2).

 + Return a restriction of a binary relation.

Returns the restriction of - the binary relation BinRel1 - to Set.

+ the binary relation BinRel1 + to Set.

 1> R1 = sofs:relation([{1,a},{2,b},{3,c}]),
 S = sofs:set([1,2,4]),
@@ -1397,13 +1512,14 @@ true
[{1,a},{2,b}] + Return a restriction of a set. -

Returns a subset of Set1 containing those - elements that yield an element in Set2 as the - result of applying SetFun.

+

Returns a subset of Set1 containing those + elements that gives an element in Set2 as the + result of applying SetFun.

 1> S1 = sofs:relation([{1,a},{2,b},{3,c}]),
 S2 = sofs:set([b,c,d]),
@@ -1412,28 +1528,30 @@ true
[{2,b},{3,c}] + Create a set of atoms or any type of sets. -

Creates an unordered - set. set(L, T) is equivalent to +

Creates an unordered + set. set(L, T) is equivalent to from_term(L, T), if the result is an unordered set. If no type is - explicitly given, [atom] is used as type of the set.

+ explicitly specified, [atom] is used as the set type.

 + Select a subset using a predicate.

Returns the set containing every element - of Set1 for which Fun - returns true. If Fun is a tuple - {external, Fun2}, Fun2 is applied to the + of Set1 for which Fun + returns true. If Fun is a tuple + {external, Fun2}, Fun2 is applied to the external set of - each element, otherwise Fun is applied to each + each element, otherwise Fun is applied to each element.

 1> R1 = sofs:relation([{a,1},{b,2}]),
@@ -1444,14 +1562,15 @@ true
[[{a,1},{b,2}]] + - Return the strict relation corresponding to + Return the strict relation corresponding to a given relation. -

Returns the strict +

Returns the strict relation corresponding to the binary - relation BinRel1.

+ relation BinRel1.

 1> R1 = sofs:relation([{1,1},{1,2},{2,1},{2,2}]),
 R2 = sofs:strict_relation(R1),
@@ -1459,13 +1578,14 @@ true
[{1,2},{2,1}] + Return a function with a given set as domain.

Returns a function, the domain of which - is Set1. The value of an element of the domain - is the result of applying SetFun to the + is Set1. The value of an element of the domain + is the result of applying SetFun to the element.

 1> L = [{a,1},{b,2}].
@@ -1482,24 +1602,24 @@ true
1> I = sofs:substitution(fun(A) -> A end, sofs:set([a,b,c])), sofs:to_external(I). [{a,a},{b,b},{c,c}] -

Let SetOfSets be a set of sets and BinRel a binary - relation. The function that maps each element Set of - SetOfSets onto the image - of Set under BinRel is returned by this function:

+

Let SetOfSets be a set of sets and BinRel a binary + relation. The function that maps each element Set of + SetOfSets onto the image + of Set under BinRel is returned by the following + function:

 images(SetOfSets, BinRel) ->
    Fun = fun(Set) -> sofs:image(BinRel, Set) end,
    sofs:substitution(Fun, SetOfSets).
-

Here might be the place to reveal something that was more - or less stated before, namely that external unordered sets - are represented as sorted lists. As a consequence, creating - the image of a set under a relation R may traverse all +

External unordered sets are represented as sorted lists. So, + creating the image of a set under a relation R can traverse all elements of R (to that comes the sorting of results, the - image). In images/2, BinRel will be traversed once - for each element of SetOfSets, which may take too long. The - following efficient function could be used instead under the - assumption that the image of each element of SetOfSets under - BinRel is non-empty:

+ image). In image/2, + BinRel is traversed once + for each element of SetOfSets, which can take too long. The + following efficient function can be used instead under the + assumption that the image of each element of SetOfSets under + BinRel is non-empty:

 images2(SetOfSets, BinRel) ->
    CR = sofs:canonical_relation(SetOfSets),
@@ -1507,13 +1627,14 @@ images2(SetOfSets, BinRel) ->
    sofs:relation_to_family(R).
 + Return the symmetric difference of two sets. -

Returns the symmetric +

Returns the symmetric difference (or the Boolean sum) - of Set1 and Set2.

+ of Set1 and Set2.

 1> S1 = sofs:set([1,2,3]),
 S2 = sofs:set([2,3,4]),
@@ -1522,68 +1643,81 @@ images2(SetOfSets, BinRel) ->
 [1,4]
 + Return a partition of two sets. -

Returns a triple of sets: Set3 contains the - elements of Set1 that do not belong - to Set2; Set4 contains the - elements of Set1 that belong - to Set2; Set5 contains the - elements of Set2 that do not belong - to Set1.

+

Returns a triple of sets:

+ + Set3 contains the elements of + Set1 that do not belong to + Set2. + + Set4 contains the elements of + Set1 that belong to Set2. + + Set5 contains the elements of + Set2 that do not belong to + Set1. + + + Return the elements of a set. -

Returns the external - set of an atomic, ordered or unordered set.

+

Returns the external + set of an atomic, ordered, or unordered set.

 + - Return a list or a tuple of the elements of set. + Return a list or a tuple of the elements of a set. -

Returns the elements of the ordered set ASet +

Returns the elements of the ordered set ASet as a tuple of sets, and the elements of the unordered set - ASet as a sorted list of sets without + ASet as a sorted list of sets without duplicates.

 + Return the type of a set.

Returns the type of an - atomic, ordered or unordered set.

+ atomic, ordered, or unordered set.

 + Return the union of a set of sets.

Returns the union of the - set of sets SetOfSets.

+ set of sets SetOfSets.

 + Return the union of two sets.

Returns the union of - Set1 and Set2.

+ Set1 and Set2.

 + Return the union of a family. -

Returns the union of - the family Family. -

+

Returns the union of family + Family.

 1> F = sofs:family([{a,[0,2,4]},{b,[0,1,2]},{c,[2,3]}]),
 S = sofs:union_of_family(F),
@@ -1591,16 +1725,17 @@ images2(SetOfSets, BinRel) ->
 [0,1,2,3,4]
 + - Return the weak relation corresponding to + Return the weak relation corresponding to a given relation.

Returns a subset S of the weak relation W - corresponding to the binary relation BinRel1. + corresponding to the binary relation BinRel1. Let F be the field of - BinRel1. The + BinRel1. The subset S is defined so that x S y if x W y for some x in F and for some y in F.

@@ -1614,11 +1749,11 @@ images2(SetOfSets, BinRel) ->
 
   

     See Also
-    
dict(3), 
-      digraph(3),
-      orddict(3), 
-      ordsets(3), 
-      sets(3)

+    
dict(3),
+      digraph(3),
+      orddict(3),
+      ordsets(3),
+      sets(3)

   

 
 
diff --git a/lib/stdlib/doc/src/stdlib_app.xml b/lib/stdlib/doc/src/stdlib_app.xml
index 5508be9c5d..cde73269a8 100644
--- a/lib/stdlib/doc/src/stdlib_app.xml
+++ b/lib/stdlib/doc/src/stdlib_app.xml
@@ -29,38 +29,38 @@
STDLIB - The STDLIB Application + The STDLIB application. -

The STDLIB is mandatory in the sense that the minimal system - based on Erlang/OTP consists of Kernel and STDLIB. The STDLIB - application contains no services.

+

The STDLIB application is mandatory in the sense that the minimal + system based on Erlang/OTP consists of Kernel and STDLIB. + The STDLIB application contains no services.
Configuration -

The following configuration parameters are defined for the STDLIB - application. See app(4) for more information about - configuration parameters.

+

The following configuration parameters are defined for the STDLIB + application. For more information about configuration parameters, see the + app(4) module in Kernel.

+ shell_esc = icl | abort -

This parameter can be used to alter the behaviour of - the Erlang shell when ^G is pressed.

+

Can be used to change the behavior of the Erlang shell when + ^G is pressed.

 restricted_shell = module() -

This parameter can be used to run the Erlang shell - in restricted mode.

+

Can be used to run the Erlang shell in restricted mode.

 shell_catch_exception = boolean() -

This parameter can be used to set the exception handling - of the Erlang shell's evaluator process.

+

Can be used to set the exception handling of the evaluator process of + Erlang shell.

 shell_history_length = integer() >= 0 -

This parameter can be used to determine how many - commands are saved by the Erlang shell.

+

Can be used to determine how many commands are saved by the Erlang + shell.

 shell_prompt_func = {Mod, Func} | default @@ -69,27 +69,26 @@ Mod = atom() Func = atom() -

This parameter can be used to set a customized - Erlang shell prompt function.

+

Can be used to set a customized Erlang shell prompt function.

 shell_saved_results = integer() >= 0 -

This parameter can be used to determine how many - results are saved by the Erlang shell.

+

Can be used to determine how many results are saved by the Erlang + shell.

 shell_strings = boolean() -

This parameter can be used to determine how the Erlang - shell outputs lists of integers.

+

Can be used to determine how the Erlang shell outputs lists of + integers.
See Also -

app(4), - application(3), - shell(3),

+

app(4), + application(3), + shell(3)

diff --git a/lib/stdlib/doc/src/string.xml b/lib/stdlib/doc/src/string.xml index a9ecb60244..dddedf1132 100644 --- a/lib/stdlib/doc/src/string.xml +++ b/lib/stdlib/doc/src/string.xml @@ -24,306 +24,372 @@ string Robert Virding - Bjarne Dacker + Bjarne Däcker 1 Bjarne Däcker - 96-09-28 + 1996-09-28 A - string.sgml + string.xml
string - String Processing Functions + String processing functions. -

This module contains functions for string processing.

+

This module provides functions for string processing.

 + - - Return the length of a string + + + Center a string. -

Returns the number of characters in the string.

+

Returns a string, where String is centered in the + string and surrounded by blanks or Character. + The resulting string has length Number.

 + - - Test string equality + + + Returns a string consisting of numbers of characters. -

Tests whether two strings are equal. Returns true if - they are, otherwise false.

+

Returns a string consisting of Number characters + Character. Optionally, the string can end with + string Tail.

 + - - Concatenate two strings + + Return the index of the first occurrence of + a character in a string. -

Concatenates two strings to form a new string. Returns the - new string.

+

Returns the index of the first occurrence of + Character in String. Returns + 0 if Character does not occur.

 + - - - Return the index of the first/last occurrence ofCharacterin String + + Concatenate two strings. -

Returns the index of the first/last occurrence of - Character in String. 0 is returned if Character does not - occur.

+

Concatenates String1 and + String2 to form a new string + String3, which is returned.

 + - - - Find the index of a substring + + Copy a string. -

Returns the position where the first/last occurrence of - SubString begins in String. 0 is returned if SubString - does not exist in String. - For example:

- -> string:str(" Hello Hello World World ", "Hello World"). -8 +

Returns a string containing String repeated + Number times.

 + - - Span characters at start of string + Span characters at start of a string.

Returns the length of the maximum initial segment of - String, which consists entirely of characters from (not - from) Chars.

-

For example:

+ String, which consists entirely of characters + not from Chars.

+

Example:

-> string:span("\t abcdef", " \t"). -5 > string:cspan("\t abcdef", " \t"). -0 +0 + - - - Return a substring of String + + Test string equality. + +

Returns true if String1 and + String2 are equal, otherwise false.

+ + + + + + Join a list of strings with separator. -

Returns a substring of String, starting at the - position Start, and ending at the end of the string or - at length Length.

-

For example:

+

Returns a string with the elements of StringList + separated by the string in Separator.

+

Example:

-> substr("Hello World", 4, 5). -"lo Wo" +> join(["one", "two", "three"], ", "). +"one, two, three" + - - Split string into tokens + + + Adjust left end of a string. -

Returns a list of tokens in String, separated by the - characters in SeparatorList.

-

For example:

+

Returns String with the length adjusted in + accordance with Number. The left margin is + fixed. If length(String) < + Number, then String is padded + with blanks or Characters.

+

Example:

-> tokens("abc defxxghix jkl", "x "). -["abc", "def", "ghi", "jkl"] -

Note that, as shown in the example above, two or more - adjacent separator characters in String - will be treated as one. That is, there will not be any empty - strings in the resulting list of tokens.

+> string:left("Hello",10,$.). +"Hello....." + - - Join a list of strings with separator + + Return the length of a string. -

Returns a string with the elements of StringList - separated by the string in Separator.

-

For example:

- -> join(["one", "two", "three"], ", "). -"one, two, three" +

Returns the number of characters in String.

 + - - - Returns a string consisting of numbers of characters + + Return the index of the last occurrence of + a character in a string. -

Returns a string consisting of Number of characters - Character. Optionally, the string can end with the - string Tail.

+

Returns the index of the last occurrence of + Character in String. Returns + 0 if Character does not occur.

 + - - Copy a string + + + Adjust right end of a string. -

Returns a string containing String repeated - Number times.

+

Returns String with the length adjusted in + accordance with Number. The right margin is + fixed. If the length of (String) < + Number, then String is padded + with blanks or Characters.

+

Example:

+ +> string:right("Hello", 10, $.). +".....Hello" + - - - Count blank separated words + + Find the index of a substring. -

Returns the number of words in String, separated by - blanks or Character.

-

For example:

+

Returns the position where the last occurrence of + SubString begins in String. + Returns 0 if SubString + does not exist in String.

+

Example:

-> words(" Hello old boy!", $o). -4 +> string:rstr(" Hello Hello World World ", "Hello World"). +8 + - - - Extract subword + + Span characters at start of a string. -

Returns the word in position Number of String. - Words are separated by blanks or Characters.

-

For example:

+

Returns the length of the maximum initial segment of + String, which consists entirely of characters + from Chars.

+

Example:

-> string:sub_word(" Hello old boy !",3,$o). -"ld b" +> string:span("\t abcdef", " \t"). +5 + + + + Find the index of a substring. + +

Returns the position where the first occurrence of + SubString begins in String. + Returns 0 if SubString + does not exist in String.

+

Example:

+ +> string:str(" Hello Hello World World ", "Hello World"). +8 + + + - Strip leading or trailing characters + Strip leading or trailing characters.

Returns a string, where leading and/or trailing blanks or a number of Character have been removed. - Direction can be left, right, or - both and indicates from which direction blanks are to be - removed. The function strip/1 is equivalent to + Direction, which can be left, right, + or both, indicates from which direction blanks are to be + removed. strip/1 is equivalent to strip(String, both).

-

For example:

+

Example:

> string:strip("...Hello.....", both, $.). -"Hello" +"Hello" + - - - Adjust left end of string + + + Extract a substring. -

Returns the String with the length adjusted in - accordance with Number. The left margin is - fixed. If the length(String) < Number, - String is padded with blanks or Characters.

-

For example:

+

Returns a substring of String, starting at + position Start to the end of the string, or to + and including position Stop.

+

Example:

-> string:left("Hello",10,$.). -"Hello....." +sub_string("Hello World", 4, 8). +"lo Wo" + - - - Adjust right end of string + + + Return a substring of a string. -

Returns the String with the length adjusted in - accordance with Number. The right margin is - fixed. If the length of (String) < Number, - String is padded with blanks or Characters.

-

For example:

+

Returns a substring of String, starting at + position Start, and ending at the end of the + string or at length Length.

+

Example:

-> string:right("Hello", 10, $.). -".....Hello" - - - - - - Center a string - -

Returns a string, where String is centred in the - string and surrounded by blanks or characters. The resulting - string will have the length Number.

+> substr("Hello World", 4, 5). +"lo Wo" + - - - Extract a substring + + + Extract subword. -

Returns a substring of String, starting at the - position Start to the end of the string, or to and - including the Stop position.

-

For example:

+

Returns the word in position Number of + String. Words are separated by blanks or + Characters.

+

Example:

-sub_string("Hello World", 4, 8). -"lo Wo" +> string:sub_word(" Hello old boy !",3,$o). +"ld b" + - Returns a float whose text representation is the integers (ASCII values) in String. + Returns a float whose text representation is the integers + (ASCII values) in a string. -

Argument String is expected to start with a valid text - represented float (the digits being ASCII values). Remaining characters - in the string after the float are returned in Rest.

-

Example:

+

Argument String is expected to start with a + valid text represented float (the digits are ASCII values). + Remaining characters in the string after the float are returned in + Rest.

+

Example:

- > {F1,Fs} = string:to_float("1.0-1.0e-1"), - > {F2,[]} = string:to_float(Fs), - > F1+F2. - 0.9 - > string:to_float("3/2=1.5"). - {error,no_float} - > string:to_float("-1.5eX"). - {-1.5,"eX"} +> {F1,Fs} = string:to_float("1.0-1.0e-1"), +> {F2,[]} = string:to_float(Fs), +> F1+F2. +0.9 +> string:to_float("3/2=1.5"). +{error,no_float} +> string:to_float("-1.5eX"). +{-1.5,"eX"} + - Returns an integer whose text representation is the integers (ASCII values) in String. + Returns an integer whose text representation is the integers + (ASCII values) in a string. -

Argument String is expected to start with a valid text - represented integer (the digits being ASCII values). Remaining characters - in the string after the integer are returned in Rest.

-

Example:

+

Argument String is expected to start with a + valid text represented integer (the digits are ASCII values). + Remaining characters in the string after the integer are returned in + Rest.

+

Example:

- > {I1,Is} = string:to_integer("33+22"), - > {I2,[]} = string:to_integer(Is), - > I1-I2. - 11 - > string:to_integer("0.5"). - {0,".5"} - > string:to_integer("x=2"). - {error,no_integer} +> {I1,Is} = string:to_integer("33+22"), +> {I2,[]} = string:to_integer(Is), +> I1-I2. +11 +> string:to_integer("0.5"). +{0,".5"} +> string:to_integer("x=2"). +{error,no_integer} + - Convert case of string (ISO/IEC 8859-1) + Convert case of string (ISO/IEC 8859-1). -

The given string or character is case-converted. Note that - the supported character set is ISO/IEC 8859-1 (a.k.a. Latin 1), - all values outside this set is unchanged

+

The specified string or character is case-converted. Notice that + the supported character set is ISO/IEC 8859-1 (also called Latin 1); + all values outside this set are unchanged

+ + + + + + Split string into tokens. + +

Returns a list of tokens in String, separated + by the characters in SeparatorList.

+

Example:

+ +> tokens("abc defxxghix jkl", "x "). +["abc", "def", "ghi", "jkl"] +

Notice that, as shown in this example, two or more + adjacent separator characters in String + are treated as one. That is, there are no empty + strings in the resulting list of tokens.

+ + + + + + + Count blank separated words. + +

Returns the number of words in String, separated + by blanks or Character.

+

Example:

+ +> words(" Hello old boy!", $o). +4
Notes -

Some of the general string functions may seem to overlap each - other. The reason for this is that this string package is the - combination of two earlier packages and all the functions of - both packages have been retained. -

+

Some of the general string functions can seem to overlap each + other. The reason is that this string package is the + combination of two earlier packages and all functions of + both packages have been retained.

+ -

Any undocumented functions in string should not be used.

+

Any undocumented functions in string are not to be used.
diff --git a/lib/stdlib/doc/src/supervisor.xml b/lib/stdlib/doc/src/supervisor.xml index 29e5a732d5..294196f746 100644 --- a/lib/stdlib/doc/src/supervisor.xml +++ b/lib/stdlib/doc/src/supervisor.xml @@ -29,124 +29,138 @@
supervisor - Generic Supervisor Behaviour + Generic supervisor behavior. -

A behaviour module for implementing a supervisor, a process which +

This behavior module provides a supervisor, a process that supervises other processes called child processes. A child process can either be another supervisor or a worker process. Worker processes are normally implemented using one of the - gen_event, gen_fsm, gen_statem or gen_server - behaviours. A supervisor implemented using this module will have + gen_event, + gen_fsm, + gen_server, or + gen_statem + behaviors. A supervisor implemented using this module has a standard set of interface functions and include functionality for tracing and error reporting. Supervisors are used to build a hierarchical process structure called a supervision tree, a - nice way to structure a fault tolerant application. Refer to - OTP Design Principles for more information.

+ nice way to structure a fault-tolerant application. For more + information, see + Supervisor Behaviour in OTP Design Principles.

+

A supervisor expects the definition of which child processes to supervise to be specified in a callback module exporting a - pre-defined set of functions.

-

Unless otherwise stated, all functions in this module will fail + predefined set of functions.

+ +

Unless otherwise stated, all functions in this module fail if the specified supervisor does not exist or if bad arguments - are given.

+ are specified.
+ Supervision Principles -

The supervisor is responsible for starting, stopping and +

The supervisor is responsible for starting, stopping, and monitoring its child processes. The basic idea of a supervisor is - that it shall keep its child processes alive by restarting them + that it must keep its child processes alive by restarting them when necessary.

+

The children of a supervisor are defined as a list of child specifications. When the supervisor is started, the child processes are started in order from left to right according to this list. When the supervisor terminates, it first terminates its child processes in reversed start order, from right to left.

+ -

The properties of a supervisor are defined by the supervisor - flags. This is the type definition for the supervisor flags: -

- 
sup_flags() = #{strategy => strategy(),         % optional
+    
The supervisor properties are defined by the supervisor flags.
+      The type definition for the supervisor flags is as follows:

+
+    
+sup_flags() = #{strategy => strategy(),         % optional
                 intensity => non_neg_integer(), % optional
-                period => pos_integer()}        % optional
-      

-    
A supervisor can have one of the following restart
-	strategies, specified with the strategy key in the
-      above map:
-    

+                period => pos_integer()}        % optional
+ +

A supervisor can have one of the following restart strategies + specified with the strategy key in the above map:

+ -

one_for_one - if one child process terminates and - should be restarted, only that child process is +

one_for_one - If one child process terminates and + is to be restarted, only that child process is affected. This is the default restart strategy.

 -

one_for_all - if one child process terminates and - should be restarted, all other child processes are terminated +

one_for_all - If one child process terminates and + is to be restarted, all other child processes are terminated and then all child processes are restarted.

 -

rest_for_one - if one child process terminates and - should be restarted, the 'rest' of the child processes -- - i.e. the child processes after the terminated child process - in the start order -- are terminated. Then the terminated +

rest_for_one - If one child process terminates and + is to be restarted, the 'rest' of the child processes (that + is, the child processes after the terminated child process + in the start order) are terminated. Then the terminated child process and all child processes after it are restarted.

 -

simple_one_for_one - a simplified one_for_one +

simple_one_for_one - A simplified one_for_one supervisor, where all child processes are dynamically added - instances of the same process type, i.e. running the same + instances of the same process type, that is, running the same code.

-

The functions delete_child/2 - and restart_child/2 are invalid for - simple_one_for_one supervisors and will return +

Functions + delete_child/2 and + restart_child/2 + are invalid for simple_one_for_one supervisors and return {error,simple_one_for_one} if the specified supervisor uses this restart strategy.

-

The function terminate_child/2 can be used for +

Function + terminate_child/2 can be used for children under simple_one_for_one supervisors by - giving the child's pid() as the second argument. If + specifying the child's pid() as the second argument. If instead the child specification identifier is used, - terminate_child/2 will return + terminate_child/2 return {error,simple_one_for_one}.

-

Because a simple_one_for_one supervisor could have +

As a simple_one_for_one supervisor can have many children, it shuts them all down asynchronously. This - means that the children will do their cleanup in parallel, + means that the children do their cleanup in parallel, and therefore the order in which they are stopped is not defined.

 +

To prevent a supervisor from getting into an infinite loop of child process terminations and restarts, a maximum restart intensity is defined using two integer values specified - with the intensity and period keys in the above + with keys intensity and period in the above map. Assuming the values MaxR for intensity - and MaxT for period, then if more than MaxR - restarts occur within MaxT seconds, the supervisor will - terminate all child processes and then itself. The default value - for intensity is 1, and the default value - for period is 5. -

+ and MaxT for period, then, if more than MaxR + restarts occur within MaxT seconds, the supervisor + terminates all child processes and then itself. intensity + defaults to 1 and period defaults to 5.

+ -

This is the type definition of a child specification:

- 
child_spec() = #{id => child_id(),       % mandatory
+    
The type definition of a child specification is as follows:

+
+    
+child_spec() = #{id => child_id(),       % mandatory
                  start => mfargs(),      % mandatory
                  restart => restart(),   % optional
                  shutdown => shutdown(), % optional
                  type => worker(),       % optional
                  modules => modules()}   % optional

+
     
The old tuple format is kept for backwards compatibility,
       see child_spec(),
-      but the map is preferred.
-    

+      but the map is preferred.

+
     
       
         
id is used to identify the child
           specification internally by the supervisor.

 	
The id key is mandatory.

-	
Note that this identifier on occations has been called
-	  "name". As far as possible, the terms "identifier" or "id"
-	  are now used but in order to keep backwards compatibility,
-	  some occurences of "name" can still be found, for example
-	  in error messages.

+        
Notice that this identifier on occations has been called
+          "name". As far as possible, the terms "identifier" or "id"
+          are now used but to keep backward compatibility,
+          some occurences of "name" can still be found, for example
+          in error messages.

       
       
         
start defines the function call used to start the
@@ -154,84 +168,86 @@
           tuple {M,F,A} used as apply(M,F,A).

         
The start function must create and link to the child
           process, and must return {ok,Child} or
-          {ok,Child,Info} where Child is the pid of
-          the child process and Info an arbitrary term which is
+          {ok,Child,Info}, where Child is the pid of
+          the child process and Info any term that is
           ignored by the supervisor.

         
The start function can also return ignore if the child
           process for some reason cannot be started, in which case
-          the child specification will be kept by the supervisor
-	  (unless it is a temporary child) but the non-existing child
-	  process will be ignored.

-        
If something goes wrong, the function may also return an
+          the child specification is kept by the supervisor
+          (unless it is a temporary child) but the non-existing child
+          process is ignored.

+        
If something goes wrong, the function can also return an
           error tuple {error,Error}.

-        
Note that the start_link functions of the different
-          behaviour modules fulfill the above requirements.

-	
The start key is mandatory.

+        
Notice that the start_link functions of the different
+          behavior modules fulfill the above requirements.

+        
The start key is mandatory.

       
       
         
restart defines when a terminated child process
-          shall be restarted. A permanent child process will
-          always be restarted, a temporary child process will
-          never be restarted (even when the supervisor's restart strategy
+          must be restarted. A permanent child process is
+          always restarted. A temporary child process is
+          never restarted (even when the supervisor's restart strategy
           is rest_for_one or one_for_all and a sibling's
-          death causes the temporary process to be terminated) and a
-          transient child process will be restarted only if
-          it terminates abnormally, i.e. with another exit reason
-          than normal, shutdown or {shutdown,Term}.

-	
The restart key is optional. If it is not given, the
-	  default value permanent will be used.

+          death causes the temporary process to be terminated).
+          A transient child process is restarted only if
+          it terminates abnormally, that is, with another exit reason
+          than normal, shutdown, or {shutdown,Term}.

+        
The restart key is optional. If it is not specified,
+          it defaults to permanent.

       
       
-        
shutdown defines how a child process shall be
-          terminated. brutal_kill means the child process will
-          be unconditionally terminated using exit(Child,kill).
-          An integer timeout value means that the supervisor will tell
+        
shutdown defines how a child process must be
+          terminated. brutal_kill means that the child process
+          is unconditionally terminated using exit(Child,kill).
+          An integer time-out value means that the supervisor tells
           the child process to terminate by calling
           exit(Child,shutdown) and then wait for an exit signal
-          with reason shutdown back from the child process. If
-          no exit signal is received within the specified number of milliseconds,
+          with reason shutdown back from the child process. If no
+          exit signal is received within the specified number of milliseconds,
           the child process is unconditionally terminated using
           exit(Child,kill).

         
If the child process is another supervisor, the shutdown time
-          should be set to infinity to give the subtree ample
+          is to be set to infinity to give the subtree ample
           time to shut down. It is also allowed to set it to infinity,
           if the child process is a worker.

         
           
Be careful when setting the shutdown time to
-          infinity when the child process is a worker. Because, in this
-          situation, the termination of the supervision tree depends on the
-          child process, it must be implemented in a safe way and its cleanup
-          procedure must always return.

+            infinity when the child process is a worker. Because, in this
+            situation, the termination of the supervision tree depends on the
+            child process, it must be implemented in a safe way and its cleanup
+            procedure must always return.

         
-        
Note that all child processes implemented using the standard
-          OTP behaviour modules automatically adhere to the shutdown
+        
Notice that all child processes implemented using the standard
+          OTP behavior modules automatically adhere to the shutdown
           protocol.

-	
The shutdown key is optional. If it is not given,
-	  the default value 5000 will be used if the child is
-	  of type worker; and infinity will be used if
-	  the child is of type supervisor.

+        
The shutdown key is optional. If it is not specified,
+          it defaults to 5000 if the child is
+          of type worker and it defaults to infinity if
+          the child is of type supervisor.

       
       
         
type specifies if the child process is a supervisor or
           a worker.

-	
The type key is optional. If it is not given, the
-	  default value worker will be used.

+        
The type key is optional. If it is not specified,
+          it defaults to worker.

       
       
         
modules is used by the release handler during code
           replacement to determine which processes are using a certain
           module. As a rule of thumb, if the child process is a
           supervisor, gen_server,
-	  gen_fsm or gen_statem
-	  this should be a list with one element [Module],
-	  where Module is the callback module. If the child
-	  process is an event manager (gen_event) with a
-	  dynamic set of callback modules, the value dynamic
-	  shall be used. See OTP Design Principles for more
-	  information about release handling.

-	
The modules key is optional. If it is not given, it
-	  defaults to [M], where M comes from the
-	  child's start {M,F,A}

+	  gen_statem, or gen_fsm,
+          this is to be a list with one element [Module],
+          where Module is the callback module. If the child
+          process is an event manager (gen_event) with a
+          dynamic set of callback modules, value dynamic
+          must be used. For more information about release handling, see
+          
+          Release Handling
+	  in OTP Design Principles.

+        
The modules key is optional. If it is not specified, it
+          defaults to [M], where M comes from the
+          child's start {M,F,A}.

       
       
         
Internally, the supervisor also keeps track of the pid
@@ -240,6 +256,7 @@
+ @@ -250,20 +267,18 @@ -

The tuple format is kept for backwards compatibility - only. A map is preferred; see more details - above.

 +

The tuple format is kept for backward compatibility + only. A map is preferred; see more details + above.

 - -

The value undefined for A (the - argument list) is only to be used internally - in supervisor. If the restart type of the child - is temporary, then the process is never to be - restarted and therefore there is no need to store the real - argument list. The value undefined will then be - stored instead.

+

Value undefined for A (the + argument list) is only to be used internally + in supervisor. If the restart type of the child + is temporary, the process is never to be + restarted and therefore there is no need to store the real + argument list. Value undefined is then stored instead.

 @@ -280,9 +295,9 @@ -

The tuple format is kept for backwards compatibility - only. A map is preferred; see more details - above.

 +

The tuple format is kept for backward compatibility + only. A map is preferred; see more details + above.

 @@ -291,307 +306,355 @@ + - - - Create a supervisor process. - - - + + Check if children specifications are syntactically correct. + -

Creates a supervisor process as part of a supervision tree. - The function will, among other things, ensure that - the supervisor is linked to the calling process (its - supervisor).

-

The created supervisor process calls Module:init/1 to - find out about restart strategy, maximum restart intensity - and child processes. To ensure a synchronized start-up - procedure, start_link/2,3 does not return until - Module:init/1 has returned and all child processes - have been started.

-

If SupName={local,Name}, the supervisor is registered - locally as Name using register/2. If - SupName={global,Name} the supervisor is registered - globally as Name using global:register_name/2. If - SupName={via,Module,Name} the supervisor - is registered as Name using the registry represented by - Module. The Module callback must export the functions - register_name/2, unregister_name/1 and send/2, - which shall behave like the corresponding functions in global. - Thus, {via,global,Name} is a valid reference.

-

If no name is provided, the supervisor is not registered.

-

Module is the name of the callback module.

-

Args is an arbitrary term which is passed as - the argument to Module:init/1.

-

If the supervisor and its child processes are successfully - created (i.e. if all child process start functions return - {ok,Child}, {ok,Child,Info}, or ignore), - the function returns {ok,Pid}, where Pid is - the pid of the supervisor. If there already exists a process - with the specified SupName, the function returns - {error,{already_started,Pid}}, where Pid is - the pid of that process.

-

If Module:init/1 returns ignore, this function - returns ignore as well, and the supervisor terminates - with reason normal. - If Module:init/1 fails or returns an incorrect value, - this function returns {error,Term} where Term - is a term with information about the error, and the supervisor - terminates with reason Term.

-

If any child process start function fails or returns an error - tuple or an erroneous value, the supervisor will first terminate - all already started child processes with reason shutdown - and then terminate itself and return - {error, {shutdown, Reason}}.

+

Takes a list of child specification as argument + and returns ok if all of them are syntactically + correct, otherwise {error,Error}.

 + - - Dynamically add a child process to a supervisor. - - + + Return counts for the number of child specifications, + active children, supervisors, and workers. -

Dynamically adds a child specification to the supervisor - SupRef which starts the corresponding child process.

-

SupRef can be:

+

Returns a property list (see + proplists) containing the + counts for each of the following elements of the supervisor's + child specifications and managed processes:

- the pid, - Name, if the supervisor is locally registered, - {Name,Node}, if the supervisor is locally - registered at another node, or - {global,Name}, if the supervisor is globally - registered. - {via,Module,Name}, if the supervisor is registered - through an alternative process registry. + +

specs - The total count of children, dead or alive.

+ + +

active - The count of all actively running child + processes managed by this supervisor. For a + simple_one_for_one supervisors, no check is done to ensure + that each child process is still alive, although the result + provided here is likely to be very + accurate unless the supervisor is heavily overloaded.

+ + +

supervisors - The count of all children marked as + child_type = supervisor in the specification list, + regardless if the child process is still alive.

+ + +

workers - The count of all children marked as + child_type = worker in the specification list, + regardless if the child process is still alive.

+ -

ChildSpec must be a valid child specification - (unless the supervisor is a simple_one_for_one - supervisor; see below). The child process will be started by - using the start function as defined in the child - specification.

-

In the case of a simple_one_for_one supervisor, - the child specification defined in Module:init/1 will - be used, and ChildSpec shall instead be an arbitrary - list of terms List. The child process will then be - started by appending List to the existing start - function arguments, i.e. by calling - apply(M, F, A++List) where {M,F,A} is the start - function defined in the child specification.

-

If there already exists a child specification with - the specified identifier, ChildSpec is discarded, and - the function returns {error,already_present} or - {error,{already_started,Child}}, depending on if - the corresponding child process is running or not.

-

If the child process start function returns {ok,Child} - or {ok,Child,Info}, the child specification and pid are - added to the supervisor and the function returns the same - value.

-

If the child process start function returns ignore, - the child specification is added to the supervisor (unless the - supervisor is a simple_one_for_one supervisor, see below), - the pid is set to undefined and the function returns - {ok,undefined}. -

-

In the case of a simple_one_for_one supervisor, when a child - process start function returns ignore the functions returns - {ok,undefined} and no child is added to the supervisor. -

-

If the child process start function returns an error tuple or - an erroneous value, or if it fails, the child specification is - discarded, and the function returns {error,Error} where - Error is a term containing information about the error - and child specification.

+

For a description of SupRef, see + start_child/2.

 - - - Terminate a child process belonging to a supervisor. - -

Tells the supervisor SupRef to terminate the given - child.

- -

If the supervisor is not simple_one_for_one, - Id must be the child specification - identifier. The process, if there is one, is terminated and, - unless it is a temporary child, the child specification is - kept by the supervisor. The child process may later be - restarted by the supervisor. The child process can also be - restarted explicitly by calling - restart_child/2. Use delete_child/2 to remove - the child specification.

- -

If the child is temporary, the child specification is deleted as - soon as the process terminates. This means - that delete_child/2 has no meaning, - and restart_child/2 can not be used for these - children.

-

If the supervisor is simple_one_for_one, Id - must be the child process' pid(). If the specified - process is alive, but is not a child of the given - supervisor, the function will return - {error,not_found}. If the child specification - identifier is given instead of a pid(), the - function will return {error,simple_one_for_one}.

-

If successful, the function returns ok. If there is - no child specification with the specified Id, the - function returns {error,not_found}.

-

See start_child/2 - for a description of SupRef.

- - Delete a child specification from a supervisor. -

Tells the supervisor SupRef to delete the child - specification identified by Id. The corresponding child - process must not be running. Use terminate_child/2 to - terminate it.

-

See start_child/2 - for a description of SupRef.

+

Tells supervisor SupRef to delete the child + specification identified by Id. The corresponding + child process must not be running. Use + + terminate_child/2 to terminate it.

+

For a description of SupRef, see + start_child/2.

If successful, the function returns ok. If the child - specification identified by Id exists but - the corresponding child process is running or about to be restarted, - the function returns {error,running} or - {error,restarting}, respectively. If the child specification + specification identified by Id exists but the + corresponding child process is running or is about to be restarted, + the function returns {error,running} or + {error,restarting}, respectively. If the child specification identified by Id does not exist, the function - returns {error,not_found}.

+ returns {error,not_found}.

+ + + + + + Return the child specification map for the specified + child. + +

Returns the child specification map for the child identified + by Id under supervisor SupRef. The returned + map contains all keys, both mandatory and optional.

+

For a description of SupRef, see + start_child/2.

 + - Restart a terminated child process belonging to a supervisor. + Restart a terminated child process belonging to a supervisor. + -

Tells the supervisor SupRef to restart +

Tells supervisor SupRef to restart a child process corresponding to the child specification identified by Id. The child specification must exist, and the corresponding child process must not be running.

-

Note that for temporary children, the child specification - is automatically deleted when the child terminates; thus - it is not possible to restart such children.

-

See start_child/2 - for a description of SupRef.

+

Notice that for temporary children, the child specification + is automatically deleted when the child terminates; thus, + it is not possible to restart such children.

+

For a description of SupRef, see + start_child/2.

If the child specification identified by Id does not exist, the function returns {error,not_found}. If the child specification exists but the corresponding process is already running, the - function returns - {error,running}.

+ function returns {error,running}.

If the child process start function returns {ok,Child} or {ok,Child,Info}, the pid is added to the supervisor and the function returns the same value.

If the child process start function returns ignore, - the pid remains set to undefined, and the function + the pid remains set to undefined and the function returns {ok,undefined}.

If the child process start function returns an error tuple or an erroneous value, or if it fails, the function returns - {error,Error} + {error,Error}, where Error is a term containing information about the error.

 + - - Return information about all children specifications and - child processes belonging to a supervisor. + + Dynamically add a child process to a supervisor. + + -

Returns a newly created list with information about all child - specifications and child processes belonging to - the supervisor SupRef.

-

Note that calling this function when supervising a large - number of children under low memory conditions can cause an - out of memory exception.

-

See start_child/2 for a description of - SupRef.

-

The information given for each child specification/process - is:

+

Dynamically adds a child specification to supervisor + SupRef, which starts the corresponding child + process.

+

SupRef can be any of the + following:

+ + The pid + Name, if the supervisor is locally registered + {Name,Node}, if the supervisor is locally + registered at another node + {global,Name}, if the supervisor is globally + registered + {via,Module,Name}, if the supervisor is registered + through an alternative process registry + +

ChildSpec must be a valid child specification + (unless the supervisor is a simple_one_for_one + supervisor; see below). The child process is started by + using the start function as defined in the child specification.

+

For a simple_one_for_one supervisor, + the child specification defined in Module:init/1 is used, + and ChildSpec must instead be an arbitrary + list of terms List. The child process is then + started by appending List to the existing start + function arguments, that is, by calling + apply(M, F, A++List), where {M,F,A} is the + start function defined in the child specification.

-

Id - as defined in the child specification or - undefined in the case of a - simple_one_for_one supervisor.

- - -

Child - the pid of the corresponding child - process, the atom restarting if the process is about to be - restarted, or undefined if there is no such process.

+

If there already exists a child specification with the specified + identifier, ChildSpec is discarded, and + the function returns {error,already_present} or + {error,{already_started,Child}}, depending on + if the corresponding child process is running or not.

 -

Type - as defined in the child specification.

+

If the child process start function returns + {ok,Child} or + {ok,Child,Info}, the child + specification and pid are added to the supervisor and the + function returns the same value.

 -

Modules - as defined in the child specification.

+

If the child process start function returns ignore, + the child specification is added to the supervisor (unless the + supervisor is a simple_one_for_one supervisor, see below), + the pid is set to undefined, and the function returns + {ok,undefined}.

 +

For a simple_one_for_one supervisor, when a child + process start function returns ignore, the functions returns + {ok,undefined} and no child is added to the supervisor.

+

If the child process start function returns an error tuple or + an erroneous value, or if it fails, the child specification is + discarded, and the function returns {error,Error}, where + Error is a term containing information about the error + and child specification.

 + - - Return counts for the number of child specifications, - active children, supervisors, and workers. + + + Create a supervisor process. + + + -

Returns a property list (see proplists) containing the - counts for each of the following elements of the supervisor's - child specifications and managed processes:

+

Creates a supervisor process as part of a supervision tree. + For example, the function ensures that the supervisor is linked to + the calling process (its supervisor).

+

The created supervisor process calls + Module:init/1 to + find out about restart strategy, maximum restart intensity, + and child processes. To ensure a synchronized startup + procedure, start_link/2,3 does not return until + Module:init/1 has returned and all child + processes have been started.

-

specs - the total count of children, dead or alive.

+

If SupName={local,Name}, the supervisor is + registered locally as Name using register/2.

 -

active - the count of all actively running child processes - managed by this supervisor. In the case of simple_one_for_one - supervisors, no check is carried out to ensure that each child process - is still alive, though the result provided here is likely to be very - accurate unless the supervisor is heavily overloaded.

+

If SupName={global,Name}, the supervisor is + registered globally as Name using + + global:register_name/2.

 -

supervisors - the count of all children marked as - child_type = supervisor in the spec list, whether or not the - child process is still alive.

+

If + SupName={via,Module,Name}, + the supervisor is registered as Name using the registry + represented by Module. The Module callback must + export the functions register_name/2, + unregister_name/1, and send/2, which must behave + like the corresponding functions in + global. Thus, + {via,global,Name} is a valid reference.

+ + +

If no name is provided, the supervisor is not registered.

+

Module is the name of the callback module.

+

Args is any term that is passed as + the argument to Module:init/1.

+ + +

If the supervisor and its child processes are successfully + created (that is, if all child process start functions return + {ok,Child}, {ok,Child,Info}, or ignore), + the function returns {ok,Pid}, where Pid is + the pid of the supervisor.

 -

workers - the count of all children marked as - child_type = worker in the spec list, whether or not the child - process is still alive.

+

If there already exists a process with the specified + SupName, the function returns + {error,{already_started,Pid}}, where Pid is + the pid of that process.

+ + +

If Module:init/1 returns ignore, this + function returns ignore as well, and the supervisor + terminates with reason normal.

+ + +

If Module:init/1 fails or returns an + incorrect value, this function returns {error,Term}, where + Term is a term with information about the error, and the + supervisor terminates with reason Term.

+ + +

If any child process start function fails or returns an error + tuple or an erroneous value, the supervisor first terminates + all already started child processes with reason shutdown + and then terminate itself and returns + {error, {shutdown, Reason}}.

 -

See start_child/2 - for a description of SupRef.

 + - - Check if children specifications are syntactically correct. + + Terminate a child process belonging to a supervisor. -

This function takes a list of child specification as argument - and returns ok if all of them are syntactically - correct, or {error,Error} otherwise.

+

Tells supervisor SupRef to terminate the + specified child.

+

If the supervisor is not simple_one_for_one, + Id must be the child specification + identifier. The process, if any, is terminated and, + unless it is a temporary child, the child specification is + kept by the supervisor. The child process can later be + restarted by the supervisor. The child process can also be + restarted explicitly by calling + restart_child/2. + Use + delete_child/2 + to remove the child specification.

+

If the child is temporary, the child specification is deleted as + soon as the process terminates. This means + that delete_child/2 has no meaning + and restart_child/2 cannot be used for these children.

+

If the supervisor is simple_one_for_one, + Id + must be the pid() of the child process. If the specified + process is alive, but is not a child of the specified + supervisor, the function returns + {error,not_found}. If the child specification + identifier is specified instead of a pid(), the + function returns {error,simple_one_for_one}.

+

If successful, the function returns ok. If there is + no child specification with the specified Id, the + function returns {error,not_found}.

+

For a description of SupRef, see + start_child/2.

 + - - Return the child specification map for the given - child. + + Return information about all children specifications and + child processes belonging to a supervisor. -

Returns the child specification map for the child identified - by Id under supervisor SupRef. The returned - map contains all keys, both mandatory and optional.

-

See start_child/2 - for a description of SupRef.

+

Returns a newly created list with information about all child + specifications and child processes belonging to + supervisor SupRef.

+

Notice that calling this function when supervising many + childrens under low memory conditions can cause an + out of memory exception.

+

For a description of SupRef, see + start_child/2.

+

The following information is given for each child + specification/process:

+ + +

Id - As defined in the child specification or + undefined for a simple_one_for_one supervisor.

+ + +

Child - The pid of the corresponding child + process, the atom restarting if the process is about to be + restarted, or undefined if there is no such process.

+ + +

Type - As defined in the child + specification.

+ + +

Modules - As defined in the child + specification.

+ +
- CALLBACK FUNCTIONS -

The following functions must be exported from a + Callback Functions +

The following function must be exported from a supervisor callback module.

+ Module:init(Args) -> Result @@ -599,47 +662,52 @@ Args = term() Result = {ok,{SupFlags,[ChildSpec]}} | ignore -  SupFlags = sup_flags() -  ChildSpec = child_spec() +  SupFlags = + sup_flags() +  ChildSpec = + child_spec()

Whenever a supervisor is started using - supervisor:start_link/2,3, this function is called by + start_link/2,3, + this function is called by the new process to find out about restart strategy, maximum restart intensity, and child specifications.

Args is the Args argument provided to the start function.

SupFlags is the supervisor flags defining the - restart strategy and max restart intensity for the + restart strategy and maximum restart intensity for the supervisor. [ChildSpec] is a list of valid child specifications defining which child processes the supervisor - shall start and monitor. See the discussion about - Supervision Principles above.

-

Note that when the restart strategy is + must start and monitor. See the discussion in section + + Supervision Principles earlier.

+

Notice that when the restart strategy is simple_one_for_one, the list of child specifications must be a list with one child specification only. - (The child specification identifier is ignored.) No child process is then started + (The child specification identifier is ignored.) + No child process is then started during the initialization phase, but all children are assumed to be started dynamically using - supervisor:start_child/2.

-

The function may also return ignore.

-

Note that this function might also be called as a part of a - code upgrade procedure. For this reason, the function should - not have any side effects. See - Design - Principles for more information about code upgrade - of supervisors.

+ start_child/2.

+

The function can also return ignore.

+

Notice that this function can also be called as a part of a code + upgrade procedure. Therefore, the function is not to have any side + effects. For more information about code upgrade of supervisors, see + section + Changing + a Supervisor in OTP Design Principles.
- SEE ALSO -

gen_event(3), - gen_fsm(3), - gen_statem(3), - gen_server(3), - sys(3)

+ See Also +

gen_event(3), + gen_fsm(3), + gen_statem(3), + gen_server(3), + sys(3)

 diff --git a/lib/stdlib/doc/src/supervisor_bridge.xml b/lib/stdlib/doc/src/supervisor_bridge.xml index e40c8bbd6f..c4c1b37548 100644 --- a/lib/stdlib/doc/src/supervisor_bridge.xml +++ b/lib/stdlib/doc/src/supervisor_bridge.xml @@ -31,73 +31,106 @@ supervisor_bridge - Generic Supervisor Bridge Behaviour. + Generic supervisor bridge behavior. -

A behaviour module for implementing a supervisor_bridge, a process - which connects a subsystem not designed according to the OTP design - principles to a supervision tree. The supervisor_bridge sits between +

This behavior module provides a supervisor bridge, a process + that connects a subsystem not designed according to the OTP design + principles to a supervision tree. The supervisor bridge sits between a supervisor and the subsystem. It behaves like a real supervisor to its own supervisor, but has a different interface than a real - supervisor to the subsystem. Refer to OTP Design Principles - for more information.

-

A supervisor_bridge assumes the functions for starting and stopping + supervisor to the subsystem. For more information, see + + Supervisor Behaviour in OTP Design Principles. +

+ +

A supervisor bridge assumes the functions for starting and stopping the subsystem to be located in a callback module exporting a - pre-defined set of functions.

-

The sys module can be used for debugging a - supervisor_bridge.

-

Unless otherwise stated, all functions in this module will fail if - the specified supervisor_bridge does not exist or if bad arguments are - given.

+ predefined set of functions.

+ +

The sys(3) module can be used + for debugging a supervisor bridge.

+ +

Unless otherwise stated, all functions in this module fail if + the specified supervisor bridge does not exist or if bad arguments are + specified.

 + Create a supervisor bridge process. -

Creates a supervisor_bridge process, linked to the calling - process, which calls Module:init/1 to start the subsystem. - To ensure a synchronized start-up procedure, this function does +

Creates a supervisor bridge process, linked to the calling process, + which calls Module:init/1 to start the subsystem. + To ensure a synchronized startup procedure, this function does not return until Module:init/1 has returned.

-

If SupBridgeName={local,Name} the supervisor_bridge is - registered locally as Name using register/2. - If SupBridgeName={global,Name} the supervisor_bridge is - registered globally as Name using - global:register_name/2. - If SupBridgeName={via,Module,Name} the supervisor_bridge is - registered as Name using a registry represented - by Module. The Module callback should export - the functions register_name/2, unregister_name/1 - and send/2, which should behave like the - corresponding functions in global. Thus, - {via,global,GlobalName} is a valid reference. - If no name is provided, the supervisor_bridge is not registered. - If there already exists a process with the specified - SupBridgeName the function returns - {error,{already_started,Pid}}, where Pid is the pid - of that process.

+ + +

If SupBridgeName={local,Name}, + the supervisor bridge is registered locally as + Name using register/2.

+ + +

If SupBridgeName={global,Name}, + the supervisor bridge is registered globally as + Name using + + global:register_name/2.

+ + +

If + SupBridgeName={via,Module,Name}, + the supervisor bridge is registered as Name + using a registry represented by Module. The + Module callback is to export functions + register_name/2, unregister_name/1, and send/2, + which are to behave like the corresponding functions in + global. + Thus, {via,global,GlobalName} is a valid reference.

+ + +

If no name is provided, the supervisor bridge is not registered.

Module is the name of the callback module.

-

Args is an arbitrary term which is passed as the argument - to Module:init/1.

-

If the supervisor_bridge and the subsystem are successfully - started the function returns {ok,Pid}, where Pid is - is the pid of the supervisor_bridge.

-

If Module:init/1 returns ignore, this function - returns ignore as well and the supervisor_bridge terminates - with reason normal. - If Module:init/1 fails or returns an error tuple or an - incorrect value, this function returns {error,Errorr} where - Error is a term with information about the error, and - the supervisor_bridge terminates with reason Error.

+

Args is an arbitrary term that is passed as the + argument to Module:init/1.

+ + +

If the supervisor bridge and the subsystem are successfully + started, the function returns {ok,Pid}, where + Pid is is the pid of the supervisor + bridge.

+ + +

If there already exists a process with the specified + SupBridgeName, the function returns + {error,{already_started,Pid}}, where + Pid is the pid of that process.

+ + +

If Module:init/1 returns ignore, this + function returns ignore as well and the supervisor bridge + terminates with reason normal.

+ + +

If Module:init/1 fails or returns an error + tuple or an incorrect value, this function returns + {error,Errorr}, where + Error is a term with information about the + error, and the supervisor bridge + terminates with reason Error.

+ +
- CALLBACK FUNCTIONS -

The following functions should be exported from a + Callback Functions +

The following functions must be exported from a supervisor_bridge callback module.

+ Module:init(Args) -> Result @@ -110,25 +143,26 @@  Error = term() -

Whenever a supervisor_bridge is started using - supervisor_bridge:start_link/2,3, this function is called +

Whenever a supervisor bridge is started using + start_link/2,3, + this function is called by the new process to start the subsystem and initialize.

Args is the Args argument provided to the start function.

-

The function should return {ok,Pid,State} where Pid +

The function is to return {ok,Pid,State}, where Pid is the pid of the main process in the subsystem and State is any term.

If later Pid terminates with a reason Reason, - the supervisor bridge will terminate with reason Reason as - well. - If later the supervisor_bridge is stopped by its supervisor with - reason Reason, it will call + the supervisor bridge terminates with reason Reason as well. + If later the supervisor bridge is stopped by its supervisor with + reason Reason, it calls Module:terminate(Reason,State) to terminate.

-

If something goes wrong during the initialization the function - should return {error,Error} where Error is any - term, or ignore.

+

If the initialization fails, the function is to return + {error,Error}, where Error is any term, + or ignore.

 + Module:terminate(Reason, State) Clean up and stop subsystem. @@ -137,15 +171,15 @@ State = term() -

This function is called by the supervisor_bridge when it is about - to terminate. It should be the opposite of Module:init/1 +

This function is called by the supervisor bridge when it is about + to terminate. It is to be the opposite of Module:init/1 and stop the subsystem and do any necessary cleaning up. The return value is ignored.

-

Reason is shutdown if the supervisor_bridge is - terminated by its supervisor. If the supervisor_bridge terminates +

Reason is shutdown if the supervisor bridge is + terminated by its supervisor. If the supervisor bridge terminates because a a linked process (apart from the main process of the subsystem) has terminated with reason Term, - Reason will be Term.

+ then Reason becomes Term.

State is taken from the return value of Module:init/1.

 @@ -153,9 +187,9 @@
- SEE ALSO -

supervisor(3), - sys(3)

+ See Also +

supervisor(3), + sys(3)

diff --git a/lib/stdlib/doc/src/sys.xml b/lib/stdlib/doc/src/sys.xml index 2255395f46..1120b926d5 100644 --- a/lib/stdlib/doc/src/sys.xml +++ b/lib/stdlib/doc/src/sys.xml @@ -4,7 +4,7 @@
- 19962016 + 19962014 Ericsson AB. All Rights Reserved. @@ -30,62 +30,67 @@ 1996-06-06 - sys.sgml + sys.xml
sys - A Functional Interface to System Messages + A functional interface to system messages. -

This module contains functions for sending system messages used by programs, and messages used for debugging purposes. -

-

Functions used for implementation of processes - should also understand system messages such as debugging - messages and code change. These functions must be used to implement the use of system messages for a process; either directly, or through standard behaviours, such as gen_server.

-

The default timeout is 5000 ms, unless otherwise specified. The - timeout defines the time period to wait for the process to +

This module contains functions for sending system messages used by + programs, and messages used for debugging purposes.

+

Functions used for implementation of processes are also expected to + understand system messages, such as debug messages and code change. These + functions must be used to implement the use of system messages for a + process; either directly, or through standard behaviors, such as + gen_server.

+

The default time-out is 5000 ms, unless otherwise specified. + timeout defines the time to wait for the process to respond to a request. If the process does not respond, the function evaluates exit({timeout, {M, F, A}}).

-

The functions make reference to a debug structure. - The debug structure is a list of dbg_opt(). - dbg_opt() is an internal data type used by the - handle_system_msg/6 function. No debugging is performed if it is an empty list. -

+ +

The functions make references to a debug structure. + The debug structure is a list of dbg_opt(), which is an internal + data type used by function + handle_system_msg/6. No debugging is performed if it is + an empty list.
System Messages -

Processes which are not implemented as one of the standard - behaviours must still understand system - messages. There are three different messages which must be - understood: -

+

Processes that are not implemented as one of the standard + behaviors must still understand system messages. The following + three messages must be understood:

Plain system messages. These are received as {system, From, Msg}. The content and meaning of this message are not interpreted by the - receiving process module. When a system message has been - received, the function sys:handle_system_msg/6 - is called in order to handle the request. -

+ receiving process module. When a system message is received, function + + handle_system_msg/6 + is called to handle the request.

Shutdown messages. If the process traps exits, it must - be able to handle an shut-down request from its parent, the + be able to handle a shutdown request from its parent, the supervisor. The message {'EXIT', Parent, Reason} - from the parent is an order to terminate. The process must terminate when this message is received, normally with the + from the parent is an order to terminate. The process must + terminate when this message is received, normally with the same Reason as Parent.

-

There is one more message which the process must understand if the modules used to implement the process change dynamically during runtime. An example of such a process is the gen_event processes. This message is {get_modules, From}. The reply to this message is From ! {modules, Modules}, - where Modules is a list of the currently active modules in the process. -

+

If the modules used to implement the process change dynamically + during runtime, the process must understand one more message. An + example is the gen_event + processes. The message is {get_modules, From}. + The reply to this message is From ! {modules, Modules}, where + Modules is a list of the currently active modules in the + process.

This message is used by the release handler to find which - processes execute a certain module. The process may at a - later time be suspended and ordered to perform a code change - for one of its modules. -

+ processes that execute a certain module. The process can later be + suspended and ordered to perform a code change for one of its + modules.
@@ -93,15 +98,16 @@
System Events

When debugging a process with the functions of this - module, the process generates system_events which are + module, the process generates system_events, which are then treated in the debug function. For example, trace - formats the system events to the tty. + formats the system events to the terminal.

-

There are three predefined system events which are used when a +

Three predefined system events are used when a process receives or sends a message. The process can also define its own system events. It is always up to the process itself to format these events.

+ @@ -111,7 +117,7 @@ -

See above.

 +

See the introduction of this manual page.

 @@ -120,421 +126,594 @@ + - - - Log system events in memory - -

Turns the logging of system events On or Off. If On, a - maximum of N events are kept in the - debug structure (the default is 10). If Flag is get, a list of all - logged events is returned. If Flag is print, the - logged events are printed to standard_io. The events are - formatted with a function that is defined by the process that - generated the event (with a call to - sys:handle_debug/4).

- - - - - - Log system events to the specified file - -

Enables or disables the logging of all system events in textual - format to the file. The events are formatted with a function that is - defined by the process that generated the event (with a call - to sys:handle_debug/4).

- - - - - - Enable or disable the collections of statistics + + + Send the code change system message to the process. -

Enables or disables the collection of statistics. If Flag is - get, the statistical collection is returned.

+

Tells the process to change code. The process must be + suspended to handle this message. Argument Extra + is reserved for each process to use as its own. Function + Module:system_code_change/4 is called. + OldVsn is the old version of the + Module.

 + - - - Print all system events on standard_io + + + Get the state of the process. -

Prints all system events on standard_io. The events are - formatted with a function that is defined by the process that - generated the event (with a call to - sys:handle_debug/4).

+

Gets the state of the process.

+ +

These functions are intended only to help with debugging. They are + provided for convenience, allowing developers to avoid having to + create their own state extraction functions and also avoid having + to interactively extract the state from the return values of + get_status/1 or + get_status/2 + while debugging.

+ +

The value of State varies for different types of + processes, as follows:

+ + +

For a + gen_server + process, the returned State + is the state of the callback module.

+ + +

For a + gen_fsm + process, State is the tuple + {CurrentStateName, CurrentStateData}.

+ + +

For a + gen_statem + process, State is the tuple + {CurrentState,CurrentData}.

+ + +

For a + gen_event + process, State is a list of tuples, + where each tuple corresponds to an event handler registered + in the process and contains {Module, Id, HandlerState}, + as follows:

+ + Module + +

The module name of the event handler.

+ + Id + +

The ID of the handler (which is false if it was + registered without an ID).

+ + HandlerState + +

The state of the handler.

+ + + + +

If the callback module exports a function system_get_state/1, + it is called in the target process to get its state. Its argument is + the same as the Misc value returned by + get_status/1,2, and + function + Module:system_get_state/1 is expected to extract the + state of the callback module from it. Function + system_get_state/1 must return {ok, State}, where + State is the state of the callback module.

+

If the callback module does not export a system_get_state/1 + function, get_state/1,2 assumes that the Misc value is + the state of the callback module and returns it directly instead.

+

If the callback module's system_get_state/1 function crashes + or throws an exception, the caller exits with error + {callback_failed, {Module, system_get_state}, {Class, Reason}}, + where Module is the name of the callback module and + Class and Reason indicate details of the exception.

+

Function system_get_state/1 is primarily useful for + user-defined behaviors and modules that implement OTP + special processes. + The gen_server, gen_fsm, + gen_statem, and gen_event OTP + behavior modules export this function, so callback modules for those + behaviors need not to supply their own.

+

For more information about a process, including its state, see + get_status/1 and + get_status/2.

 + - - - Turn off debugging + + + Get the status of the process. -

Turns off all debugging for the process. This includes - functions that have been installed explicitly with the - install function, for example triggers.

+

Gets the status of the process.

+

The value of Misc varies for different types of + processes, for example:

+ + +

A gen_server + process returns the state of the callback module.

+ + +

A gen_fsm + process returns information, such as its current + state name and state data.

+ + +

A gen_statem + process returns information, such as its current + state name and state data.

+ + +

A gen_event + process returns information about each of its + registered handlers.

+ + +

Callback modules for gen_server, + gen_fsm, gen_statem, and gen_event + can also change the value of Misc + by exporting a function format_status/2, which contributes + module-specific information. For details, see + + gen_server:format_status/2, + + gen_fsm:format_status/2, + + gen_statem:format_status/2, and + + gen_event:format_status/2.

 + - - - Suspend the process + + + Install a debug function in the process. -

Suspends the process. When the process is suspended, it - will only respond to other system messages, but not other - messages.

+

Enables installation of alternative debug functions. An example of + such a function is a trigger, a function that waits for some + special event and performs some action when the event is + generated. For example, turning on low-level tracing.

+

Func is called whenever a system event is + generated. This function is to return done, or a new + Func state. In the first case, the function is removed. It is + also removed if the function fails.

 + - - - Resume a suspended process + + + Log system events in memory. -

Resumes a suspended process.

+

Turns the logging of system events on or off. If on, a + maximum of N events are kept in the + debug structure (default is 10).

+

If Flag is get, a list of all logged + events is returned.

+

If Flag is print, the logged events + are printed to standard_io.

+

The events are formatted with a function that is defined by the + process that generated the event (with a call to + + handle_debug/4).

 + - - - Send the code change system message to the process + + + Log system events to the specified file. -

Tells the process to change code. The process must be - suspended to handle this message. The Extra argument is - reserved for each process to use as its own. The function - Module:system_code_change/4 is called. OldVsn is - the old version of the Module.

+

Enables or disables the logging of all system events in text + format to the file. The events are formatted with a function that is + defined by the process that generated the event (with a call to + handle_debug/4). +

+ - - - Get the status of the process + + + Turn off debugging. -

Gets the status of the process.

-

The value of Misc varies for different types of - processes. For example, a gen_server process returns - the callback module's state, a gen_fsm process - returns information such as its current state name and state data, - a gen_statem process returns information about - its current state and data, and a gen_event process - returns information about each of its - registered handlers. Callback modules for gen_server, - gen_fsm, gen_statem and gen_event - can also customise the value - of Misc by exporting a format_status/2 - function that contributes module-specific information; - see gen_server format_status/2, - gen_fsm format_status/2, - gen_statem format_status/2, and - gen_event format_status/2 - for more details.

+

Turns off all debugging for the process. This includes + functions that are installed explicitly with function + install/2,3, + for example, triggers.

 + - - - Get the state of the process + + + Remove a debug function from the process. -

Gets the state of the process.

- -

These functions are intended only to help with debugging. They are provided for - convenience, allowing developers to avoid having to create their own state extraction - functions and also avoid having to interactively extract state from the return values of - get_status/1 or - get_status/2 while debugging.

- -

The value of State varies for different types of - processes. For a gen_server process, the returned State - is simply the callback module's state. For a gen_fsm process, - State is the tuple {CurrentStateName, CurrentStateData}. - For a gen_statem process State is - the tuple {CurrentState,CurrentData}. - For a gen_event process, State a list of tuples, - where each tuple corresponds to an event handler registered in the process and contains - {Module, Id, HandlerState}, where Module is the event handler's module name, - Id is the handler's ID (which is the value false if it was registered without - an ID), and HandlerState is the handler's state.

-

If the callback module exports a system_get_state/1 function, it will be called in the - target process to get its state. Its argument is the same as the Misc value returned by - get_status/1,2, and the system_get_state/1 - function is expected to extract the callback module's state from it. The system_get_state/1 - function must return {ok, State} where State is the callback module's state.

-

If the callback module does not export a system_get_state/1 function, get_state/1,2 - assumes the Misc value is the callback module's state and returns it directly instead.

-

If the callback module's system_get_state/1 function crashes or throws an exception, the - caller exits with error {callback_failed, {Module, system_get_state}, {Class, Reason}} where - Module is the name of the callback module and Class and Reason indicate - details of the exception.

-

The system_get_state/1 function is primarily useful for user-defined - behaviours and modules that implement OTP special - processes. The gen_server, gen_fsm, - gen_statem and gen_event OTP - behaviour modules export this function, so callback modules for those behaviours - need not supply their own.

-

To obtain more information about a process, including its state, see - get_status/1 and - get_status/2.

+

Removes an installed debug function from the + process. Func must be the same as previously + installed.

 + - Replace the state of the process + Replace the state of the process.

Replaces the state of the process, and returns the new state.

-

These functions are intended only to help with debugging, and they should not be - be called from normal code. They are provided for convenience, allowing developers - to avoid having to create their own custom state replacement functions.

+

These functions are intended only to help with debugging, and are + not to be called from normal code. They are provided for + convenience, allowing developers to avoid having to create their own + custom state replacement functions.

 -

The StateFun function provides a new state for the process. - The State argument and NewState return value - of StateFun vary for different types of processes. For a - gen_server process, State is simply the callback module's - state, and NewState is a new instance of that state. For a - gen_fsm process, State is the tuple - {CurrentStateName, CurrentStateData}, and NewState - is a similar tuple that may contain a new state name, new state data, or both. - The same applies for a gen_statem process but - it names the tuple fields {CurrentState,CurrentData}. - For a gen_event process, State is the tuple - {Module, Id, HandlerState} where Module is the event handler's module name, - Id is the handler's ID (which is the value false if it was registered without - an ID), and HandlerState is the handler's state. NewState is a - similar tuple where Module and Id shall have the same values as in - State but the value of HandlerState may be different. Returning - a NewState whose Module or Id values differ from those of - State will result in the event handler's state remaining unchanged. For a - gen_event process, StateFun is called once for each event handler - registered in the gen_event process.

-

If a StateFun function decides not to effect any change in process - state, then regardless of process type, it may simply return its State - argument.

-

If a StateFun function crashes or throws an exception, then - for gen_server, gen_fsm or gen_statem processes, - the original state of the process is - unchanged. For gen_event processes, a crashing or failing StateFun - function means that only the state of the particular event handler it was working on when it - failed or crashed is unchanged; it can still succeed in changing the states of other event +

Function StateFun provides a new state for the + process. Argument State and the + NewState return value of + StateFun vary for different types of + processes as follows:

+ + +

For a gen_server + process, State is the state of the callback + module and NewState + is a new instance of that state.

+ + +

For a gen_fsm process, + State is the tuple {CurrentStateName, + CurrentStateData}, and NewState is a + similar tuple, which can contain + a new state name, new state data, or both.

+ + +

For a gen_statem + process, State is the + tuple {CurrentState,CurrentData}, + and NewState is a + similar tuple, which can contain + a new current state, new state data, or both.

+ + +

For a gen_event + process, State is the + tuple {Module, Id, HandlerState} as follows:

+ + Module + +

The module name of the event handler.

+ + Id + +

The ID of the handler (which is false if it was + registered without an ID).

+ + HandlerState + +

The state of the handler.

+ + +

NewState is a similar tuple where + Module and Id are to have the same values as in + State, but the value of HandlerState + can be different. Returning a NewState, whose + Module or Id values differ from those of + State, leaves the state of the event handler + unchanged. For a gen_event process, + StateFun is called once for each event handler + registered in the gen_event process.

+ + +

If a StateFun function decides not to effect any + change in process state, then regardless of process type, it can + return its State argument.

+

If a StateFun function crashes or throws an + exception, the original state of the process is unchanged for + gen_server, gen_fsm, and gen_statem processes. + For gen_event processes, a crashing or + failing StateFun function + means that only the state of the particular event handler it was + working on when it failed or crashed is unchanged; it can still + succeed in changing the states of other event handlers registered in the same gen_event process.

-

If the callback module exports a system_replace_state/2 function, it will be called in the - target process to replace its state using StateFun. Its two arguments are StateFun - and Misc, where Misc is the same as the Misc value returned by - get_status/1,2. A system_replace_state/2 function - is expected to return {ok, NewState, NewMisc} where NewState is the callback module's - new state obtained by calling StateFun, and NewMisc is a possibly new value used to - replace the original Misc (required since Misc often contains the callback - module's state within it).

-

If the callback module does not export a system_replace_state/2 function, - replace_state/2,3 assumes the Misc value is the callback module's state, passes it - to StateFun and uses the return value as both the new state and as the new value of - Misc.

-

If the callback module's system_replace_state/2 function crashes or throws an exception, - the caller exits with error {callback_failed, {Module, system_replace_state}, {Class, Reason}} - where Module is the name of the callback module and Class and Reason indicate details - of the exception. If the callback module does not provide a system_replace_state/2 function and - StateFun crashes or throws an exception, the caller exits with error +

If the callback module exports a + + system_replace_state/2 function, it is called in the + target process to replace its state using StateFun. Its two + arguments are StateFun and Misc, where + Misc is the same as the Misc value returned by + get_status/1,2. + A system_replace_state/2 function is expected to return + {ok, NewState, NewMisc}, where NewState is the new state + of the callback module, obtained by calling StateFun, and + NewMisc is + a possibly new value used to replace the original Misc + (required as Misc often contains the state of the callback + module within it).

+

If the callback module does not export a + system_replace_state/2 function, + replace_state/2,3 + assumes that Misc is the state of the callback module, + passes it to StateFun and uses the return value as + both the new state and as the new value of Misc.

+

If the callback module's function system_replace_state/2 + crashes or throws an exception, the caller exits with error + {callback_failed, {Module, system_replace_state}, {Class, + Reason}}, where Module is the name of the callback module + and Class and Reason indicate details of the exception. + If the callback module does not provide a + system_replace_state/2 function and StateFun crashes or + throws an exception, the caller exits with error {callback_failed, StateFun, {Class, Reason}}.

-

The system_replace_state/2 function is primarily useful for user-defined behaviours and - modules that implement OTP special processes. The - gen_server, gen_fsm, gen_statem and - gen_event OTP behaviour modules export this function, - and so callback modules for those behaviours need not supply their own.

+

Function system_replace_state/2 is primarily useful for + user-defined behaviors and modules that implement OTP + special processes. The + OTP behavior modules gen_server, + gen_fsm, gen_statem, and gen_event + export this function, so callback modules for those + behaviors need not to supply their own.

 + - - - Install a debug function in the process + + + Resume a suspended process. -

This function makes it possible to install other debug - functions than the ones defined above. An example of such a - function is a trigger, a function that waits for some - special event and performs some action when the event is - generated. This could, for example, be turning on low level tracing. -

-

Func is called whenever a system event is - generated. This function should return done, or a new - func state. In the first case, the function is removed. It is removed - if the function fails.

+

Resumes a suspended process.

 + - - - Remove a debug function from the process + + + Enable or disable the collections of statistics. -

Removes a previously installed debug function from the - process. Func must be the same as previously - installed.

+

Enables or disables the collection of statistics. If + Flag is get, + the statistical collection is returned.

 + + + + + Suspend the process. + +

Suspends the process. When the process is suspended, it + only responds to other system messages, but not other + messages.

+ + + - Terminate the process + Terminate the process. -

This function orders the process to terminate with the - given Reason. The termination is done - asynchronously, so there is no guarantee that the process is - actually terminated when the function returns.

+

Orders the process to terminate with the + specified Reason. The termination is done + asynchronously, so it is not guaranteed that the process is + terminated when the function returns.

+ + + + + + + Print all system events on standard_io. + +

Prints all system events on standard_io. The events are + formatted with a function that is defined by the process that + generated the event (with a call to + handle_debug/4). +

Process Implementation Functions -

The following functions are used when implementing a - special process. This is an ordinary process which does not use a - standard behaviour, but a process which understands the standard system messages.

+ +

The following functions are used when implementing a + special process. This is an ordinary process, which does not use a + standard behavior, but a process that understands the standard system + messages.

+ - Convert a list of options to a debug structure + Convert a list of options to a debug structure. -

This function can be used by a process that initiates a debug - structure from a list of options. The values of the - Opt argument are the same as the corresponding +

Can be used by a process that initiates a debug + structure from a list of options. The values of argument + Opt are the same as for the corresponding functions.

 + - Get the data associated with a debug option + Get the data associated with a debug option. -

This function gets the data associated with a debug option. Default is returned if the - Item is not found. Can be - used by the process to retrieve debug data for printing - before it terminates.

+

Gets the data associated with a debug option. + Default + is returned if Item is not found. Can be + used by the process to retrieve debug data for printing before it + terminates.

 + - Generate a system event + Generate a system event.

This function is called by a process when it generates a - system event. FormFunc is a formatting - function which is called as FormFunc(Device, - Event, Extra) in order to print - the events, which is necessary if tracing is activated. - Extra is any extra information which the - process needs in the format function, for example the name - of the process.

+ system event. FormFunc is a formatting + function, called as FormFunc(Device, + Event, Extra) to print the events, + which is necessary if tracing is activated. + Extra is any extra information that the + process needs in the format function, for example, the process + name.

 + - Take care of system messages + Take care of system messages. -

This function is used by a process module that wishes to take care of system - messages. The process receives a {system, From, Msg} - message and passes the Msg and From to this - function. -

-

This function never returns. It calls the function - Module:system_continue(Parent, NDebug, Misc) where the - process continues the execution, or - Module:system_terminate(Reason, Parent, Debug, Misc) if - the process should terminate. The Module must export - system_continue/3, system_terminate/4, - system_code_change/4, system_get_state/1 and - system_replace_state/2 (see below). -

-

The Misc argument can be used to save internal data - in a process, for example its state. It is sent to +

This function is used by a process module to take care of system + messages. The process receives a + {system, From, Msg} message and + passes Msg and From to this + function.

+

This function never returns. It calls either of the + following functions:

+ + +

Module:system_continue(Parent, + NDebug, Misc), + where the process continues the execution.

+ + +

Module:system_terminate(Reason, + Parent, Debug, Misc), + if the process is to terminate.

+ + +

Module must export the following:

+ + system_continue/3 + system_terminate/4 + system_code_change/4 + system_get_state/1 + system_replace_state/2 + +

Argument Misc can be used to save internal data + in a process, for example, its state. It is sent to Module:system_continue/3 or - Module:system_terminate/4

+ Module:system_terminate/4.

 + - Print the logged events in the debug structure + Print the logged events in the debug structure. -

Prints the logged system events in the debug structure +

Prints the logged system events in the debug structure, using FormFunc as defined when the event was - generated by a call to handle_debug/4.

+ generated by a call to + handle_debug/4.

 + - Mod:system_continue(Parent, Debug, Misc) -> none() - Called when the process should continue its execution + Module:system_code_change(Misc, Module, OldVsn, Extra) -> + {ok, NMisc} + Called when the process is to perform a code change. - Parent = pid() - Debug = [dbg_opt()] Misc = term() + OldVsn = undefined | term() + Module = atom() + Extra = term() + NMisc = term() -

This function is called from sys:handle_system_msg/6 when the process - should continue its execution (for example after it has been - suspended). This function never returns.

+

Called from + handle_system_msg/6 when the process is to perform a + code change. The code change is used when the + internal data structure has changed. This function + converts argument Misc to the new data + structure. OldVsn is attribute vsn of the + old version of the Module. If no such attribute is + defined, the atom undefined is sent.

 + - Mod:system_terminate(Reason, Parent, Debug, Misc) -> none() - Called when the process should terminate + Module:system_continue(Parent, Debug, Misc) -> none() + Called when the process is to continue its execution. - Reason = term() Parent = pid() Debug = [dbg_opt()] Misc = term() -

This function is called from sys:handle_system_msg/6 when the process - should terminate. For example, this function is called when - the process is suspended and its parent orders shut-down. - It gives the process a chance to do a clean-up. This function never - returns.

+

Called from + handle_system_msg/6 when the process is to continue + its execution (for example, after it has been + suspended). This function never returns.

 + - Mod:system_code_change(Misc, Module, OldVsn, Extra) -> {ok, NMisc} - Called when the process should perform a code change + Module:system_get_state(Misc) -> {ok, State} + Called when the process is to return its current state. + Misc = term() - OldVsn = undefined | term() - Module = atom() - Extra = term() - NMisc = term() + State = term() -

Called from sys:handle_system_msg/6 when the process - should perform a code change. The code change is used when the - internal data structure has changed. This function - converts the Misc argument to the new data - structure. OldVsn is the vsn attribute of the - old version of the Module. If no such attribute was - defined, the atom undefined is sent.

+

Called from + handle_system_msg/6 + when the process is to return a term that reflects its current state. + State is the value returned by + get_state/2.

 + - Mod:system_get_state(Misc) -> {ok, State} - Called when the process should return its current state + Module:system_replace_state(StateFun, Misc) -> + {ok, NState, NMisc} + Called when the process is to replace its current state. + + StateFun = fun((State :: term()) -> NState) Misc = term() - State = term() - + NState = term() + NMisc = term() + -

This function is called from sys:handle_system_msg/6 when the process - should return a term that reflects its current state. State is the - value returned by sys:get_state/2.

+

Called from + handle_system_msg/6 when the process is to replace + its current state. NState is the value returned by + replace_state/3. +

+ - Mod:system_replace_state(StateFun, Misc) -> {ok, NState, NMisc} - Called when the process should replace its current state + Module:system_terminate(Reason, Parent, Debug, Misc) -> none() + Called when the process is to terminate. - StateFun = fun((State :: term()) -> NState) + Reason = term() + Parent = pid() + Debug = [dbg_opt()] Misc = term() - NState = term() - NMisc = term() - + -

This function is called from sys:handle_system_msg/6 when the process - should replace its current state. NState is the value returned by - sys:replace_state/3.

+

Called from + handle_system_msg/6 when the process is to terminate. + For example, this function is called when + the process is suspended and its parent orders shutdown. + It gives the process a chance to do a cleanup. This function never + returns.

 diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml index 4f259d57a8..8f2ce36b06 100644 --- a/lib/stdlib/doc/src/timer.xml +++ b/lib/stdlib/doc/src/timer.xml @@ -30,26 +30,25 @@ 1998-09-09 D - timer.sgml + timer.xml timer - Timer Functions + Timer functions.

This module provides useful functions related to time. Unless otherwise - stated, time is always measured in milliseconds. All - timer functions return immediately, regardless of work carried - out by another process. -

-

Successful evaluations of the timer functions yield return values - containing a timer reference, denoted TRef below. By using - cancel/1, the returned reference can be used to cancel any - requested action. A TRef is an Erlang term, the contents - of which must not be altered. -

-

The timeouts are not exact, but should be at least as long - as requested. -

+ stated, time is always measured in milliseconds. All + timer functions return immediately, regardless of work done by another + process.

+

Successful evaluations of the timer functions give return values + containing a timer reference, denoted TRef. By using + cancel/1, + the returned reference can be used to cancel any + requested action. A TRef is an Erlang term, which contents + must not be changed.

+

The time-outs are not exact, but are at least as long + as requested.

 + @@ -60,231 +59,286 @@

A timer reference.

 + - - Start a global timer server (named timer_server). + + Apply Module:Function(Arguments) after a specified + Time. -

Starts the timer server. Normally, the server does not need - to be started explicitly. It is started dynamically if it - is needed. This is useful during development, but in a - target system the server should be started explicitly. Use - configuration parameters for kernel for this.

+

Evaluates apply(Module, Function, + Arguments) after Time + milliseconds.

+

Returns {ok, TRef} or + {error, Reason}.

 + - - Apply Module:Function(Arguments)after a specified Time. + + Evaluate Module:Function(Arguments) repeatedly at + intervals of Time. -

Evaluates apply(Module, Function, Arguments) after Time amount of time - has elapsed. Returns {ok, TRef}, or {error, Reason}.

+

Evaluates apply(Module, Function, + Arguments) repeatedly at intervals of + Time.

+

Returns {ok, TRef} or + {error, Reason}.

 + - - - Send Messageto Pidafter a specified Time. + + Cancel a previously requested time-out identified by + TRef. - - send_after/3 - -

Evaluates Pid ! Message after Time amount - of time has elapsed. (Pid can also be an atom of a - registered name.) Returns {ok, TRef}, or - {error, Reason}.

- - send_after/2 - -

Same as send_after(Time, self(), Message).

- - +

Cancels a previously requested time-out. TRef is + a unique + timer reference returned by the related timer function.

+

Returns {ok, cancel}, or {error, Reason} + when TRef is not a timer reference.

 + - - - Send an exit signal with Reasonafter a specified Time. + Send an exit signal with Reason after a specified + Time. + +

exit_after/2 is the same as + exit_after(Time, self(), + Reason1).

+

exit_after/3 sends an exit signal with reason + Reason1 to + pid Pid. Returns {ok, TRef} + or {error, Reason2}.

+ + + + + + Convert Hours+Minutes+Seconds to + Milliseconds. + +

Returns the number of milliseconds in Hours + + Minutes + Seconds.

+ + + + + + Convert Hours to Milliseconds. + +

Returns the number of milliseconds in Hours.

+ + + + + + + Send an exit signal with Reason after a specified + Time. + +

kill_after/1 is the same as + exit_after(Time, self(), kill).

+

kill_after/2 is the same as + exit_after(Time, Pid, kill).

+ + + + + + Converts Minutes to Milliseconds. + +

Returns the number of milliseconds in + Minutes.

+ + + + + + Calculate time difference between time stamps. + In microseconds + +

Calculates the time difference Tdiff = + T2 - T1 in microseconds, + where T1 and T2 + are time-stamp tuples on the same format as returned from + + erlang:timestamp/0 or + + os:timestamp/0.

+ + + + + + Convert Seconds to Milliseconds. + +

Returns the number of milliseconds in + Seconds.

+ + + + + + + Send Message to Pid after a specified + Time. - exit_after/3 - -

Send an exit signal with reason Reason1 to Pid - Pid. Returns {ok, TRef}, or - {error, Reason2}.

- - exit_after/2 - -

Same as exit_after(Time, self(), Reason1).

- - kill_after/2 + send_after/3 -

Same as exit_after(Time, Pid, kill).

+

Evaluates Pid ! Message after + Time milliseconds. (Pid + can also be an atom of a registered name.)

+

Returns {ok, TRef} or + {error, Reason}.

 - kill_after/1 + send_after/2 -

Same as exit_after(Time, self(), kill).

+

Same as send_after(Time, self(), + Message).

 - - - Evaluate Module:Function(Arguments)repeatedly at intervals of Time. - -

Evaluates apply(Module, Function, Arguments) repeatedly at - intervals of Time. Returns {ok, TRef}, or - {error, Reason}.

- - + - Send Messagerepeatedly at intervals of Time. + Send Message repeatedly at intervals of Time. + send_interval/3 -

Evaluates Pid ! Message repeatedly after Time - amount of time has elapsed. (Pid can also be an atom of - a registered name.) Returns {ok, TRef} or +

Evaluates Pid ! Message + repeatedly after Time milliseconds. + (Pid can also be + an atom of a registered name.)

+

Returns {ok, TRef} or {error, Reason}.

 send_interval/2 -

Same as send_interval(Time, self(), Message).

+

Same as send_interval(Time, self(), + Message).

 + - - Cancel a previously requested timeout identified by TRef. + + Suspend the calling process for Time milliseconds. + -

Cancels a previously requested timeout. TRef is a unique - timer reference returned by the timer function in question. Returns - {ok, cancel}, or {error, Reason} when TRef - is not a timer reference.

+

Suspends the process calling this function for + Time milliseconds and then returns ok, + or suspends the process forever if Time is the + atom infinity. Naturally, this + function does not return immediately.

 + - - Suspend the calling process for Timeamount of milliseconds. + + Start a global timer server (named timer_server). + -

Suspends the process calling this function for Time amount - of milliseconds and then returns ok, or suspend the process - forever if Time is the atom infinity. Naturally, this - function does not return immediately.

+

Starts the timer server. Normally, the server does not need + to be started explicitly. It is started dynamically if it + is needed. This is useful during development, but in a + target system the server is to be started explicitly. Use + configuration parameters for + Kernel for this.

 + Measure the real time it takes to evaluate apply(Module, - Function, Arguments) or apply(Fun, Arguments) + Function, Arguments) or apply(Fun, Arguments). In microseconds tc/3 -

Evaluates apply(Module, Function, Arguments) and measures - the elapsed real time as reported by os:timestamp/0. - Returns {Time, Value}, where - Time is the elapsed real time in microseconds, - and Value is what is returned from the apply.

+

Evaluates apply(Module, Function, + Arguments) and measures the elapsed real time as + reported by + os:timestamp/0.

+

Returns {Time, Value}, where + Time is the elapsed real time in + microseconds, and Value is what is + returned from the apply.

 tc/2 -

Evaluates apply(Fun, Arguments). Otherwise works - like tc/3.

+

Evaluates apply(Fun, Arguments). + Otherwise the same as tc/3.

 tc/1 -

Evaluates Fun(). Otherwise works like tc/2.

+

Evaluates Fun(). Otherwise the same as + tc/2.

 - - - - Calculate time difference between timestamps - In microseconds - -

Calculates the time difference Tdiff = T2 - T1 in - microseconds, where T1 and T2 - are timestamp tuples on the same format as returned from - erlang:timestamp/0, - or os:timestamp/0.

- - - - - Convert Secondsto Milliseconds. - -

Returns the number of milliseconds in Seconds.

- - - - - Converts Minutes to Milliseconds. - -

Return the number of milliseconds in Minutes.

- - - - - Convert Hoursto Milliseconds. - -

Returns the number of milliseconds in Hours.

- - - - - Convert Hours+Minutes+Secondsto Milliseconds. - -

Returns the number of milliseconds in Hours + Minutes + Seconds.

- -
Examples -

This example illustrates how to print out "Hello World!" in 5 seconds:

+

Example 1

+

The following example shows how to print "Hello World!" in 5 seconds:

-      1> timer:apply_after(5000, io, format, ["~nHello World!~n", []]).
-      {ok,TRef}
-      Hello World!
-

The following coding example illustrates a process which performs a - certain action and if this action is not completed within a certain - limit, then the process is killed.

+1> timer:apply_after(5000, io, format, ["~nHello World!~n", []]). +{ok,TRef} +Hello World! + +

Example 2

+

The following example shows a process performing a + certain action, and if this action is not completed within a certain + limit, the process is killed:

- Pid = spawn(mod, fun, [foo, bar]), - %% If pid is not finished in 10 seconds, kill him - {ok, R} = timer:kill_after(timer:seconds(10), Pid), - ... - %% We change our mind... - timer:cancel(R), - ... +Pid = spawn(mod, fun, [foo, bar]), +%% If pid is not finished in 10 seconds, kill him +{ok, R} = timer:kill_after(timer:seconds(10), Pid), +... +%% We change our mind... +timer:cancel(R), +...
- WARNING -

A timer can always be removed by calling cancel/1. -

-

An interval timer, i.e. a timer created by evaluating any of the - functions apply_interval/4, send_interval/3, and - send_interval/2, is linked to the process towards which - the timer performs its task. -

-

A one-shot timer, i.e. a timer created by evaluating any of the - functions apply_after/4, send_after/3, - send_after/2, exit_after/3, exit_after/2, - kill_after/2, and kill_after/1 is not linked to any - process. Hence, such a timer is removed only when it reaches its - timeout, or if it is explicitly removed by a call to cancel/1.

+ Notes +

A timer can always be removed by calling + cancel/1.

+ +

An interval timer, that is, a timer created by evaluating any of the + functions + apply_interval/4, + send_interval/3, and + send_interval/2 + is linked to the process to which the timer performs its task.

+ +

A one-shot timer, that is, a timer created by evaluating any of the + functions + apply_after/4, + send_after/3, + send_after/2, + exit_after/3, + exit_after/2, + kill_after/2, and + kill_after/1 + is not linked to any process. Hence, such a timer is removed only + when it reaches its time-out, or if it is explicitly removed by a call to + cancel/1.

 diff --git a/lib/stdlib/doc/src/unicode.xml b/lib/stdlib/doc/src/unicode.xml index edc6830cb5..93d0d37456 100644 --- a/lib/stdlib/doc/src/unicode.xml +++ b/lib/stdlib/doc/src/unicode.xml @@ -31,12 +31,27 @@ unicode - Functions for converting Unicode characters + Functions for converting Unicode characters. -

This module contains functions for converting between different character representations. Basically it converts between ISO-latin-1 characters and Unicode ditto, but it can also convert between different Unicode encodings (like UTF-8, UTF-16 and UTF-32).

-

The default Unicode encoding in Erlang is in binaries UTF-8, which is also the format in which built in functions and libraries in OTP expect to find binary Unicode data. In lists, Unicode data is encoded as integers, each integer representing one character and encoded simply as the Unicode codepoint for the character.

-

Other Unicode encodings than integers representing codepoints or UTF-8 in binaries are referred to as "external encodings". The ISO-latin-1 encoding is in binaries and lists referred to as latin1-encoding.

-

It is recommended to only use external encodings for communication with external entities where this is required. When working inside the Erlang/OTP environment, it is recommended to keep binaries in UTF-8 when representing Unicode characters. Latin1 encoding is supported both for backward compatibility and for communication with external entities not supporting Unicode character sets.

+

This module contains functions for converting between different character + representations. It converts between ISO Latin-1 characters and Unicode + characters, but it can also convert between different Unicode encodings + (like UTF-8, UTF-16, and UTF-32).

+

The default Unicode encoding in Erlang is in binaries UTF-8, which is also + the format in which built-in functions and libraries in OTP expect to find + binary Unicode data. In lists, Unicode data is encoded as integers, each + integer representing one character and encoded simply as the Unicode code + point for the character.

+

Other Unicode encodings than integers representing code points or UTF-8 + in binaries are referred to as "external encodings". The ISO + Latin-1 encoding + is in binaries and lists referred to as latin1-encoding.

+

It is recommended to only use external encodings for communication with + external entities where this is required. When working inside the + Erlang/OTP environment, it is recommended to keep binaries in UTF-8 when + representing Unicode characters. ISO Latin-1 encoding is supported both + for backward compatibility and for communication + with external entities not supporting Unicode character sets.

 @@ -49,7 +64,8 @@ -

A binary() with characters encoded in the UTF-8 coding standard.

+

A binary() with characters encoded in the UTF-8 coding + standard.

 @@ -61,8 +77,8 @@ -

A binary() with characters coded in a user specified Unicode - encoding other than UTF-8 (UTF-16 or UTF-32).

+

A binary() with characters coded in a user-specified Unicode + encoding other than UTF-8 (that is, UTF-16 or UTF-32).

 @@ -73,23 +89,23 @@ -

A binary() with characters coded in ISO-latin-1.

+

A binary() with characters coded in ISO Latin-1.

 -

An integer() representing valid latin1 +

An integer() representing a valid ISO Latin-1 character (0-255).

 -

The same as iodata().

+

Same as iodata().

 -

The same as iolist().

+

Same as iolist().

 @@ -100,197 +116,224 @@ Identify UTF byte order marks in a binary. - A binary() such that byte_size(Bin) >= 4. + A binary() such that byte_size(Bin) >= 4. - -

Check for a UTF byte order mark (BOM) in the beginning of a - binary. If the supplied binary Bin begins with a valid - byte order mark for either UTF-8, UTF-16 or UTF-32, the function - returns the encoding identified along with the length of the BOM - in bytes.

- -

If no BOM is found, the function returns {latin1,0}

+

Checks for a UTF Byte Order Mark (BOM) in the beginning of a + binary. If the supplied binary Bin begins with a + valid BOM for either UTF-8, UTF-16, or UTF-32, the function + returns the encoding identified along with the BOM length + in bytes.

+

If no BOM is found, the function returns {latin1,0}.

 + - - Convert a collection of characters to list of Unicode characters + + Convert a collection of characters to a UTF-8 binary. -

Same as characters_to_list(Data, unicode).

+

Same as characters_to_binary(Data, unicode, + unicode).

 - - - Convert a collection of characters to list of Unicode characters - - -

Converts a possibly deep list of integers and - binaries into a list of integers representing Unicode - characters. The binaries in the input may have characters - encoded as latin1 (0 - 255, one character per byte), in which - case the InEncoding parameter should be given as - latin1, or have characters encoded as one of the - UTF-encodings, which is given as the InEncoding - parameter. Only when the InEncoding is one of the UTF - encodings, integers in the list are allowed to be greater than - 255.

- -

If InEncoding is latin1, the Data parameter - corresponds to the iodata() type, but for unicode, - the Data parameter can contain integers greater than 255 - (Unicode characters beyond the ISO-latin-1 range), which would - make it invalid as iodata().

- -

The purpose of the function is mainly to be able to convert - combinations of Unicode characters into a pure Unicode - string in list representation for further processing. For - writing the data to an external entity, the reverse function - characters_to_binary/3 - comes in handy.

- -

The option unicode is an alias for utf8, as this is the - preferred encoding for Unicode characters in - binaries. utf16 is an alias for {utf16,big} and - utf32 is an alias for {utf32,big}. The big - and little atoms denote big or little endian - encoding.

-

If for some reason, the data cannot be converted, either - because of illegal Unicode/latin1 characters in the list, or - because of invalid UTF encoding in any binaries, an error - tuple is returned. The error tuple contains the tag - error, a list representing the characters that could be - converted before the error occurred and a representation of the - characters including and after the offending integer/bytes. The - last part is mostly for debugging as it still constitutes a - possibly deep and/or mixed list, not necessarily of the same - depth as the original data. The error occurs when traversing the - list and whatever is left to decode is simply returned as is.

- -

However, if the input Data is a pure binary, the third - part of the error tuple is guaranteed to be a binary as - well.

- -

Errors occur for the following reasons:

- - - Integers out of range - If InEncoding is - latin1, an error occurs whenever an integer greater - than 255 is found in the lists. If InEncoding is - of a Unicode type, an error occurs whenever an integer - - greater than 16#10FFFF - (the maximum Unicode character), - in the range 16#D800 to 16#DFFF - (invalid range reserved for UTF-16 surrogate pairs) - - is found. - - - UTF encoding incorrect - If InEncoding is - one of the UTF types, the bytes in any binaries have to be valid - in that encoding. Errors can occur for various - reasons, including "pure" decoding errors - (like the upper - bits of the bytes being wrong), the bytes are decoded to a - too large number, the bytes are decoded to a code-point in the - invalid Unicode - range, or encoding is "overlong", meaning that a - number should have been encoded in fewer bytes. The - case of a truncated UTF is handled specially, see the - paragraph about incomplete binaries below. If - InEncoding is latin1, binaries are always valid - as long as they contain whole bytes, - as each byte falls into the valid ISO-latin-1 range. - - - -

A special type of error is when no actual invalid integers or - bytes are found, but a trailing binary() consists of too - few bytes to decode the last character. This error might occur - if bytes are read from a file in chunks or binaries in other - ways are split on non UTF character boundaries. In this case an - incomplete tuple is returned instead of the error - tuple. It consists of the same parts as the error tuple, but - the tag is incomplete instead of error and the - last element is always guaranteed to be a binary consisting of - the first part of a (so far) valid UTF character.

- -

If one UTF characters is split over two consecutive - binaries in the Data, the conversion succeeds. This means - that a character can be decoded from a range of binaries as long - as the whole range is given as input without errors - occurring. Example:

- - - decode_data(Data) -> - case unicode:characters_to_list(Data,unicode) of - {incomplete,Encoded, Rest} -> - More = get_some_more_data(), - Encoded ++ decode_data([Rest, More]); - {error,Encoded,Rest} -> - handle_error(Encoded,Rest); - List -> - List - end. - -

Bit-strings that are not whole bytes are however not allowed, - so a UTF character has to be split along 8-bit boundaries to - ever be decoded.

- -

If any parameters are of the wrong type, the list structure - is invalid (a number as tail) or the binaries do not contain - whole bytes (bit-strings), a badarg exception is - thrown.

- + + + Convert a collection of characters to a UTF-8 binary. + +

Same as characters_to_binary(Data, + InEncoding, unicode).

 + - - Convert a collection of characters to a UTF-8 binary + + Convert a collection of characters to a UTF-8 binary. -

Same as characters_to_binary(Data, unicode, unicode).

+

Behaves as + characters_to_list/2, but produces a binary + instead of a Unicode list.

+

InEncoding defines how input is to be interpreted + if binaries are present in Data

+

OutEncoding defines in what format output is to + be generated.

+

Options:

+ + unicode + +

An alias for utf8, as this is the preferred encoding for + Unicode characters in binaries.

+ + utf16 + +

An alias for {utf16,big}.

+ + utf32 + +

An alias for {utf32,big}.

+ + +

The atoms big and little denote big- or little-endian + encoding.

+

Errors and exceptions occur as in + + characters_to_list/2, but the second element + in tuple error or incomplete is a binary() + and not a list().

 - - - Convert a collection of characters to a UTF-8 binary + + + Convert a collection of characters to a list of Unicode + characters. -

Same as characters_to_binary(Data, InEncoding, unicode).

+

Same as characters_to_list(Data, unicode).

 - + + - - Convert a collection of characters to a UTF-8 binary + + Convert a collection of characters to a list of Unicode + characters. - -

Behaves as - characters_to_list/2, but produces an binary - instead of a Unicode list. The - InEncoding defines how input is to be interpreted if - binaries are present in the Data, while - OutEncoding defines in what format output is to be - generated.

- -

The option unicode is an alias for utf8, as this is the - preferred encoding for Unicode characters in - binaries. utf16 is an alias for {utf16,big} and - utf32 is an alias for {utf32,big}. The big - and little atoms denote big or little endian - encoding.

- -

Errors and exceptions occur as in - characters_to_list/2, but the second element - in the error or - incomplete tuple will be a binary() and not a - list().

- +

Converts a possibly deep list of integers and + binaries into a list of integers representing Unicode + characters. The binaries in the input can have characters + encoded as one of the following:

+ + +

ISO Latin-1 (0-255, one character per byte). Here, + case parameter InEncoding is to be specified + as latin1.

+ + +

One of the UTF-encodings, which is specified as parameter + InEncoding.

+ + +

Only when InEncoding is one of the UTF + encodings, integers in the list are allowed to be > 255.

+

If InEncoding is latin1, parameter + Data corresponds to the iodata() type, + but for unicode, parameter Data can + contain integers > 255 + (Unicode characters beyond the ISO Latin-1 range), which + makes it invalid as iodata().

+

The purpose of the function is mainly to convert + combinations of Unicode characters into a pure Unicode + string in list representation for further processing. For + writing the data to an external entity, the reverse function + + characters_to_binary/3 + comes in handy.

+

Option unicode is an alias for utf8, as this is the + preferred encoding for Unicode characters in + binaries. utf16 is an alias for {utf16,big} and + utf32 is an alias for {utf32,big}. The atoms big + and little denote big- or little-endian encoding.

+

If the data cannot be converted, either + because of illegal Unicode/ISO Latin-1 characters in the list, + or because of invalid UTF encoding in any binaries, an error + tuple is returned. The error tuple contains the tag + error, a list representing the characters that could be + converted before the error occurred and a representation of the + characters including and after the offending integer/bytes. The + last part is mostly for debugging, as it still constitutes a + possibly deep or mixed list, or both, not necessarily of the same + depth as the original data. The error occurs when traversing the + list and whatever is left to decode is returned "as is".

+

However, if the input Data is a pure binary, + the third part of the error tuple is guaranteed to be a binary as + well.

+

Errors occur for the following reasons:

+ + +

Integers out of range.

+

If InEncoding is latin1, + an error occurs whenever an integer > 255 is found + in the lists.

+

If InEncoding is of a Unicode type, + an error occurs whenever either of the following is found:

+ + +

An integer > 16#10FFFF + (the maximum Unicode character)

+ + +

An integer in the range 16#D800 to 16#DFFF (invalid range + reserved for UTF-16 surrogate pairs)

+ + + + +

Incorrect UTF encoding.

+

If InEncoding is one of the UTF types, + the bytes in any binaries must be valid in that encoding.

+

Errors can occur for various reasons, including the + following:

+ + +

"Pure" decoding errors + (like the upper bits of the bytes being wrong).

+ + +

The bytes are decoded to a too large number.

+ + +

The bytes are decoded to a code point in the invalid + Unicode range.

+ + +

Encoding is "overlong", meaning that a number + should have been encoded in fewer bytes.

+ + +

The case of a truncated UTF is handled specially, see the + paragraph about incomplete binaries below.

+

If InEncoding is latin1, binaries are + always valid as long as they contain whole bytes, + as each byte falls into the valid ISO Latin-1 range.

+ + +

A special type of error is when no actual invalid integers or + bytes are found, but a trailing binary() consists of too + few bytes to decode the last character. This error can occur + if bytes are read from a file in chunks or if binaries in other + ways are split on non-UTF character boundaries. An incomplete + tuple is then returned instead of the error tuple. + It consists of the same parts as the error tuple, but + the tag is incomplete instead of error and the + last element is always guaranteed to be a binary consisting of + the first part of a (so far) valid UTF character.

+

If one UTF character is split over two consecutive binaries in + the Data, the conversion succeeds. This means + that a character can be decoded from a range of binaries as long + as the whole range is specified as input without errors occurring.

+

Example:

+ +decode_data(Data) -> + case unicode:characters_to_list(Data,unicode) of + {incomplete,Encoded, Rest} -> + More = get_some_more_data(), + Encoded ++ decode_data([Rest, More]); + {error,Encoded,Rest} -> + handle_error(Encoded,Rest); + List -> + List + end. +

However, bit strings that are not whole bytes are not allowed, + so a UTF character must be split along 8-bit boundaries to + ever be decoded.

+

A badarg exception is thrown for the following cases:

+ + Any parameters are of the wrong type. + The list structure is invalid (a number as tail). + The binaries do not contain whole bytes (bit strings). + + Create a binary UTF byte order mark from encoding. @@ -298,20 +341,15 @@ A binary() such that byte_size(Bin) >= 4. - -

Create a UTF byte order mark (BOM) as a binary from the - supplied InEncoding. The BOM is, if supported at all, - expected to be placed first in UTF encoded files or - messages.

- -

The function returns <<>> for the - latin1 encoding as there is no BOM for ISO-latin-1.

- -

It can be noted that the BOM for UTF-8 is seldom used, and it - is really not a byte order mark. There are obviously no - byte order issues with UTF-8, so the BOM is only there to - differentiate UTF-8 encoding from other UTF formats.

- +

Creates a UTF Byte Order Mark (BOM) as a binary from the + supplied InEncoding. The BOM is, if supported at + all, expected to be placed first in UTF encoded files or messages.

+

The function returns <<>> for + latin1 encoding, as there is no BOM for ISO Latin-1.

+

Notice that the BOM for UTF-8 is seldom used, and it + is really not a byte order mark. There are obviously no + byte order issues with UTF-8, so the BOM is only there to + differentiate UTF-8 encoding from other UTF formats.

 diff --git a/lib/stdlib/doc/src/unicode_usage.xml b/lib/stdlib/doc/src/unicode_usage.xml index b4c9385e33..7f79ac88a1 100644 --- a/lib/stdlib/doc/src/unicode_usage.xml +++ b/lib/stdlib/doc/src/unicode_usage.xml @@ -33,427 +33,495 @@ PA1 unicode_usage.xml -
-Unicode Implementation -

Implementing support for Unicode character sets is an ongoing - process. The Erlang Enhancement Proposal (EEP) 10 outlined the - basics of Unicode support and also specified a default encoding in - binaries that all Unicode-aware modules should handle in the - future.

- -

The functionality described in EEP10 was implemented in Erlang/OTP - R13A, but that was by no means the end of it. In Erlang/OTP R14B01 support - for Unicode file names was added, although it was in no way complete - and was by default disabled on platforms where no guarantee was given - for the file name encoding. With Erlang/OTP R16A came support for UTF-8 encoded - source code, among with enhancements to many of the applications to - support both Unicode encoded file names as well as support for UTF-8 - encoded files in several circumstances. Most notable is the support - for UTF-8 in files read by file:consult/1, release handler support - for UTF-8 and more support for Unicode character sets in the - I/O-system. In Erlang/OTP 17.0, the encoding default for Erlang source files was - switched to UTF-8.

- -

This guide outlines the current Unicode support and gives a couple - of recipes for working with Unicode data.

-
-
-Understanding Unicode -

Experience with the Unicode support in Erlang has made it - painfully clear that understanding Unicode characters and encodings - is not as easy as one would expect. The complexity of the field as - well as the implications of the standard requires thorough - understanding of concepts rarely before thought of.

- -

Furthermore the Erlang implementation requires understanding of - concepts that never were an issue for many (Erlang) programmers. To - understand and use Unicode characters requires that you study the - subject thoroughly, even if you're an experienced programmer.

- -

As an example, one could contemplate the issue of converting - between upper and lower case letters. Reading the standard will make - you realize that, to begin with, there's not a simple one to one - mapping in all scripts. Take German as an example, where there's a - letter "ß" (Sharp s) in lower case, but the uppercase equivalent is - "SS". Or Greek, where "Σ" has two different lowercase forms: "ς" in - word-final position and "σ" elsewhere. Or Turkish where dotted and - dot-less "i" both exist in lower case and upper case forms, or - Cyrillic "I" which usually has no lowercase form. Or of course - languages that have no concept of upper case (or lower case). So, a - conversion function will need to know not only one character at a - time, but possibly the whole sentence, maybe the natural language - the translation should be in and also take into account differences - in input and output string length and so on. There is at the time of - writing no Unicode to_upper/to_lower functionality in Erlang/OTP, but - there are publicly available libraries that address these issues.

- -

Another example is the accented characters where the same glyph - has two different representations. Let's look at the Swedish - "ö". There's a code point for that in the Unicode standard, but you - can also write it as "o" followed by U+0308 (Combining Diaeresis, - with the simplified meaning that the last letter should have a "¨" - above). They have exactly the same glyph. They are for most - purposes the same, but they have completely different - representations. For example MacOS X converts all file names to use - Combining Diaeresis, while most other programs (including Erlang) - try to hide that by doing the opposite when for example listing - directories. However it's done, it's usually important to normalize - such characters to avoid utter confusion.

- -

The list of examples can be made as long as the Unicode standard, I - suspect. The point is that one need a kind of knowledge that was - never needed when programs only took one or two languages into - account. The complexity of human languages and scripts, certainly - has made this a challenge when constructing a universal - standard. Supporting Unicode properly in your program will require - effort.

- -
-
-What Unicode Is -

Unicode is a standard defining code points (numbers) for all - known, living or dead, scripts. In principle, every known symbol - used in any language has a Unicode code point.

-

Unicode code points are defined and published by the Unicode - Consortium, which is a non profit organization.

-

Support for Unicode is increasing throughout the world of - computing, as the benefits of one common character set are - overwhelming when programs are used in a global environment.

-

Along with the base of the standard: the code points for all the - scripts, there are a couple of encoding standards available.

-

It is vital to understand the difference between encodings and - Unicode characters. Unicode characters are code points according to - the Unicode standard, while the encodings are ways to represent such - code points. An encoding is just a standard for representation, - UTF-8 can for example be used to represent a very limited part of - the Unicode character set (e.g. ISO-Latin-1), or the full Unicode - range. It's just an encoding format.

-

As long as all character sets were limited to 256 characters, - each character could be stored in one single byte, so there was more - or less only one practical encoding for the characters. Encoding - each character in one byte was so common that the encoding wasn't - even named. When we now, with the Unicode system, have a lot more - than 256 characters, we need a common way to represent these. The - common ways of representing the code points are the encodings. This - means a whole new concept to the programmer, the concept of - character representation, which was before a non-issue.

- -

Different operating systems and tools support different - encodings. For example Linux and MacOS X has chosen the UTF-8 - encoding, which is backwards compatible with 7-bit ASCII and - therefore affects programs written in plain English the - least. Windows on the other hand supports a limited version of - UTF-16, namely all the code planes where the characters can be - stored in one single 16-bit entity, which includes most living - languages.

- -

The most widely spread encodings are:

- - Bytewise representation - This is not a proper Unicode representation, but the - representation used for characters before the Unicode standard. It - can still be used to represent character code points in the Unicode - standard that have numbers below 256, which corresponds exactly to - the ISO-Latin-1 character set. In Erlang, this is commonly denoted - latin1 encoding, which is slightly misleading as ISO-Latin-1 is - a character code range, not an encoding. - UTF-8 - Each character is stored in one to four bytes depending on - code point. The encoding is backwards compatible with bytewise - representation of 7-bit ASCII as all 7-bit characters are stored - in one single byte in UTF-8. The characters beyond code point 127 - are stored in more bytes, letting the most significant bit in the - first character indicate a multi-byte character. For details on - the encoding, the RFC is publicly available. Note that UTF-8 is - not compatible with bytewise representation for - code points between 128 and 255, so a ISO-Latin-1 bytewise - representation is not generally compatible with UTF-8. - UTF-16 - This encoding has many similarities to UTF-8, but the basic - unit is a 16-bit number. This means that all characters occupy at - least two bytes, some high numbers even four bytes. Some programs, - libraries and operating systems claiming to use UTF-16 only allows - for characters that can be stored in one 16-bit entity, which is - usually sufficient to handle living languages. As the basic unit - is more than one byte, byte-order issues occur, why UTF-16 exists - in both a big-endian and little-endian variant. In Erlang, the - full UTF-16 range is supported when applicable, like in the - unicode module and in the bit syntax. - UTF-32 - The most straight forward representation. Each character is - stored in one single 32-bit number. There is no need for escapes - or any variable amount of entities for one character, all Unicode - code points can be stored in one single 32-bit entity. As with - UTF-16, there are byte-order issues, UTF-32 can be both big- and - little-endian. - UCS-4 - Basically the same as UTF-32, but without some Unicode - semantics, defined by IEEE and has little use as a separate - encoding standard. For all normal (and possibly abnormal) usages, - UTF-32 and UCS-4 are interchangeable. - -

Certain ranges of numbers are left unused in the Unicode standard - and certain ranges are even deemed invalid. The most notable invalid - range is 16#D800 - 16#DFFF, as the UTF-16 encoding does not allow - for encoding of these numbers. It can be speculated that the UTF-16 - encoding standard was, from the beginning, expected to be able to - hold all Unicode characters in one 16-bit entity, but then had to be - extended, leaving a hole in the Unicode range to cope with backward - compatibility.

-

Additionally, the code point 16#FEFF is used for byte order marks - (BOM's) and use of that character is not encouraged in other - contexts than that. It actually is valid though, as the character - "ZWNBS" (Zero Width Non Breaking Space). BOM's are used to identify - encodings and byte order for programs where such parameters are not - known in advance. Byte order marks are more seldom used than one - could expect, but their use might become more widely spread as they - provide the means for programs to make educated guesses about the - Unicode format of a certain file.

-
-
- Areas of Unicode Support -

To support Unicode in Erlang, problems in several areas have been - addressed. Each area is described briefly in this section and more - thoroughly further down in this document:

- - Representation - To handle Unicode characters in Erlang, we have to have a - common representation both in lists and binaries. The EEP (10) and - the subsequent initial implementation in Erlang/OTP R13A settled a standard - representation of Unicode characters in Erlang. - Manipulation - The Unicode characters need to be processed by the Erlang - program, why library functions need to be able to handle them. In - some cases functionality was added to already existing interfaces - (as the string module now can handle lists with arbitrary code points), - in some cases new functionality or options need to be added (as in - the io-module, the file handling, the unicode module - and the bit syntax). Today most modules in kernel and STDLIB, as - well as the VM are Unicode aware. - File I/O - I/O is by far the most problematic area for Unicode. A file - is an entity where bytes are stored and the lore of programming - has been to treat characters and bytes as interchangeable. With - Unicode characters, you need to decide on an encoding as soon as - you want to store the data in a file. In Erlang you can open a - text file with an encoding option, so that you can read characters - from it rather than bytes, but you can also open a file for - bytewise I/O. The I/O-system of Erlang has been designed (or at - least used) in a way where you expect any I/O-server to be - able to cope with any string data, but that is no longer the case - when you work with Unicode characters. Handling the fact that you - need to know the capabilities of the device where your data ends - up is something new to the Erlang programmer. Furthermore, ports - in Erlang are byte oriented, so an arbitrary string of (Unicode) - characters can not be sent to a port without first converting it - to an encoding of choice. - Terminal I/O - Terminal I/O is slightly easier than file I/O. The output is - meant for human reading and is usually Erlang syntax (e.g. in the - shell). There exists syntactic representation of any Unicode - character without actually displaying the glyph (instead written - as \x{HHH}), so Unicode data can usually be displayed - even if the terminal as such do not support the whole Unicode - range. - File names - File names can be stored as Unicode strings, in different - ways depending on the underlying OS and file system. This can be - handled fairly easy by a program. The problems arise when the file - system is not consistent in it's encodings, like for example - Linux. Linux allows files to be named with any sequence of bytes, - leaving to each program to interpret those bytes. On systems where - these "transparent" file names are used, Erlang has to be informed - about the file name encoding by a startup flag. The default is - bytewise interpretation, which is actually usually wrong, but - allows for interpretation of all file names. The concept - of "raw file names" can be used to handle wrongly encoded - file names if one enables Unicode file name translation - (+fnu) on platforms where this is not the default. - Source code encoding - When it comes to the Erlang source code, there is support - for the UTF-8 encoding and bytewise encoding. The default in - Erlang/OTP R16B was bytewise (or latin1) encoding; in Erlang/OTP 17.0 - it was changed to UTF-8. You can control the encoding by a comment like: - -%% -*- coding: utf-8 -*- - - in the beginning of the file. This of course requires your editor to - support UTF-8 as well. The same comment is also interpreted by - functions like file:consult/1, the release handler etc, so that - you can have all text files in your source directories in UTF-8 - encoding. - - The language - Having the source code in UTF-8 also allows you to write - string literals containing Unicode characters with code points > - 255, although atoms, module names and function names are - restricted to the ISO-Latin-1 range. Binary - literals where you use the /utf8 type, can also be - expressed using Unicode characters > 255. Having module names - using characters other than 7-bit ASCII can cause trouble on - operating systems with inconsistent file naming schemes, and might - also hurt portability, so it's not really recommended. It is - suggested in EEP 40 that the language should also allow for - Unicode characters > 255 in variable names. Whether to - implement that EEP or not is yet to be decided. - -
-
- Standard Unicode Representation -

In Erlang, strings are actually lists of integers. A string was - up until Erlang/OTP R13 defined to be encoded in the ISO-latin-1 (ISO8859-1) - character set, which is, code point by code point, a sub-range of - the Unicode character set.

-

The standard list encoding for strings was therefore easily - extended to cope with the whole Unicode range: A Unicode string in - Erlang is simply a list containing integers, each integer being a - valid Unicode code point and representing one character in the - Unicode character set.

-

Erlang strings in ISO-latin-1 are a subset of Unicode - strings.

-

Only if a string contains code points < 256, can it be - directly converted to a binary by using - i.e. erlang:iolist_to_binary/1 or can be sent directly to a - port. If the string contains Unicode characters > 255, an - encoding has to be decided upon and the string should be converted - to a binary in the preferred encoding using - unicode:characters_to_binary/{1,2,3}. Strings are not - generally lists of bytes, as they were before Erlang/OTP R13. They are lists of - characters. Characters are not generally bytes, they are Unicode - code points.

- -

Binaries are more troublesome. For performance reasons, programs - often store textual data in binaries instead of lists, mainly - because they are more compact (one byte per character instead of two - words per character, as is the case with lists). Using - erlang:list_to_binary/1, an ISO-Latin-1 Erlang string could - be converted into a binary, effectively using bytewise encoding - - one byte per character. This was very convenient for those limited - Erlang strings, but cannot be done for arbitrary Unicode lists.

-

As the UTF-8 encoding is widely spread and provides some backward - compatibility in the 7-bit ASCII range, it is selected as the - standard encoding for Unicode characters in binaries for Erlang.

-

The standard binary encoding is used whenever a library function - in Erlang should cope with Unicode data in binaries, but is of - course not enforced when communicating externally. Functions and - bit-syntax exist to encode and decode both UTF-8, UTF-16 and UTF-32 - in binaries. Library functions dealing with binaries and Unicode in - general, however, only deal with the default encoding.

- -

Character data may be combined from several sources, sometimes - available in a mix of strings and binaries. Erlang has for long had - the concept of iodata or iolists, where binaries and - lists can be combined to represent a sequence of bytes. In the same - way, the Unicode aware modules often allow for combinations of - binaries and lists where the binaries have characters encoded in - UTF-8 and the lists contain such binaries or numbers representing - Unicode code points:

- +
+ Unicode Implementation +

Implementing support for Unicode character sets is an ongoing process. + The Erlang Enhancement Proposal (EEP) 10 outlined the basics of Unicode + support and specified a default encoding in binaries that all + Unicode-aware modules are to handle in the future.

+ +

Here is an overview what has been done so far:

+ + +

The functionality described in EEP10 was implemented + in Erlang/OTP R13A.

 + +

Erlang/OTP R14B01 added support for Unicode + filenames, but it was not complete and was by default + disabled on platforms where no guarantee was given for the + filename encoding.

 + +

With Erlang/OTP R16A came support for UTF-8 encoded + source code, with enhancements to many of the applications to + support both Unicode encoded filenames and support for UTF-8 + encoded files in many circumstances. Most notable is the + support for UTF-8 in files read by file:consult/1, + release handler support for UTF-8, and more support for + Unicode character sets in the I/O system.

 + +

In Erlang/OTP 17.0, the encoding default for Erlang + source files was switched to UTF-8.

 + + +

This section outlines the current Unicode support and gives some + recipes for working with Unicode data.

+
+ +
+ Understanding Unicode +

Experience with the Unicode support in Erlang has made it clear that + understanding Unicode characters and encodings is not as easy as one + would expect. The complexity of the field and the implications of the + standard require thorough understanding of concepts rarely before + thought of.

+ +

Also, the Erlang implementation requires understanding of + concepts that were never an issue for many (Erlang) programmers. To + understand and use Unicode characters requires that you study the + subject thoroughly, even if you are an experienced programmer.

+ +

As an example, contemplate the issue of converting between upper and + lower case letters. Reading the standard makes you realize that there is + not a simple one to one mapping in all scripts, for example:

+ + + +

In German, the letter "ß" (sharp s) is in lower case, but the + uppercase equivalent is "SS".

+ + +

In Greek, the letter "Σ" has two different lowercase forms, + "ς" in word-final position and "σ" elsewhere.

+ + +

In Turkish, both dotted and dotless "i" exist in lower case and + upper case forms.

+ + +

Cyrillic "I" has usually no lowercase form.

+ + +

Languages with no concept of upper case (or lower case).

+ + + +

So, a conversion function must know not only one character at a time, + but possibly the whole sentence, the natural language to translate to, + the differences in input and output string length, and so on. + Erlang/OTP has currently no Unicode to_upper/to_lower + functionality, but publicly available libraries address these issues.

+ +

Another example is the accented characters, where the same glyph has two + different representations. The Swedish letter "ö" is one example. + The Unicode standard has a code point for it, but you can also write it + as "o" followed by "U+0308" (Combining Diaeresis, with the simplified + meaning that the last letter is to have "¨" above). They have the same + glyph. They are for most purposes the same, but have different + representations. For example, MacOS X converts all filenames to use + Combining Diaeresis, while most other programs (including Erlang) try to + hide that by doing the opposite when, for example, listing directories. + However it is done, it is usually important to normalize such + characters to avoid confusion.

+ +

The list of examples can be made long. One need a kind of knowledge that + was not needed when programs only considered one or two languages. The + complexity of human languages and scripts has certainly made this a + challenge when constructing a universal standard. Supporting Unicode + properly in your program will require effort.

+
+ +
+ What Unicode Is +

Unicode is a standard defining code points (numbers) for all known, + living or dead, scripts. In principle, every symbol used in any + language has a Unicode code point. Unicode code points are defined and + published by the Unicode Consortium, which is a non-profit + organization.

+ +

Support for Unicode is increasing throughout the world of computing, as + the benefits of one common character set are overwhelming when programs + are used in a global environment. Along with the base of the standard, + the code points for all the scripts, some encoding standards are + available.

+ +

It is vital to understand the difference between encodings and Unicode + characters. Unicode characters are code points according to the Unicode + standard, while the encodings are ways to represent such code points. An + encoding is only a standard for representation. UTF-8 can, for example, + be used to represent a very limited part of the Unicode character set + (for example ISO-Latin-1) or the full Unicode range. It is only an + encoding format.

+ +

As long as all character sets were limited to 256 characters, each + character could be stored in one single byte, so there was more or less + only one practical encoding for the characters. Encoding each character + in one byte was so common that the encoding was not even named. With the + Unicode system there are much more than 256 characters, so a common way + is needed to represent these. The common ways of representing the code + points are the encodings. This means a whole new concept to the + programmer, the concept of character representation, which was a + non-issue earlier.

+ +

Different operating systems and tools support different encodings. For + example, Linux and MacOS X have chosen the UTF-8 encoding, which is + backward compatible with 7-bit ASCII and therefore affects programs + written in plain English the least. Windows supports a limited version + of UTF-16, namely all the code planes where the characters can be + stored in one single 16-bit entity, which includes most living + languages.

+ +

The following are the most widely spread encodings:

+ + + Bytewise representation + +

This is not a proper Unicode representation, but the representation + used for characters before the Unicode standard. It can still be used + to represent character code points in the Unicode standard with + numbers < 256, which exactly corresponds to the ISO Latin-1 + character set. In Erlang, this is commonly denoted latin1 + encoding, which is slightly misleading as ISO Latin-1 is a + character code range, not an encoding.

+ + UTF-8 + +

Each character is stored in one to four bytes depending on code + point. The encoding is backward compatible with bytewise + representation of 7-bit ASCII, as all 7-bit characters are stored in + one single byte in UTF-8. The characters beyond code point 127 are + stored in more bytes, letting the most significant bit in the first + character indicate a multi-byte character. For details on the + encoding, the RFC is publicly available.

+

Notice that UTF-8 is not compatible with bytewise + representation for code points from 128 through 255, so an ISO + Latin-1 bytewise representation is generally incompatible with + UTF-8.

+ + UTF-16 + +

This encoding has many similarities to UTF-8, but the basic + unit is a 16-bit number. This means that all characters occupy + at least two bytes, and some high numbers four bytes. Some + programs, libraries, and operating systems claiming to use + UTF-16 only allow for characters that can be stored in one + 16-bit entity, which is usually sufficient to handle living + languages. As the basic unit is more than one byte, byte-order + issues occur, which is why UTF-16 exists in both a big-endian + and a little-endian variant.

+

In Erlang, the full UTF-16 range is supported when applicable, like + in the unicode + module and in the bit syntax.

+ + UTF-32 + +

The most straightforward representation. Each character is stored in + one single 32-bit number. There is no need for escapes or any + variable number of entities for one character. All Unicode code + points can be stored in one single 32-bit entity. As with UTF-16, + there are byte-order issues. UTF-32 can be both big-endian and + little-endian.

+ + UCS-4 + +

Basically the same as UTF-32, but without some Unicode semantics, + defined by IEEE, and has little use as a separate encoding standard. + For all normal (and possibly abnormal) use, UTF-32 and UCS-4 are + interchangeable.

+ + + +

Certain number ranges are unused in the Unicode standard and certain + ranges are even deemed invalid. The most notable invalid range is + 16#D800-16#DFFF, as the UTF-16 encoding does not allow for encoding of + these numbers. This is possibly because the UTF-16 encoding standard, + from the beginning, was expected to be able to hold all Unicode + characters in one 16-bit entity, but was then extended, leaving a hole + in the Unicode range to handle backward compatibility.

+ +

Code point 16#FEFF is used for Byte Order Marks (BOMs) and use of that + character is not encouraged in other contexts. It is valid though, as + the character "ZWNBS" (Zero Width Non Breaking Space). BOMs are used to + identify encodings and byte order for programs where such parameters are + not known in advance. BOMs are more seldom used than expected, but can + become more widely spread as they provide the means for programs to make + educated guesses about the Unicode format of a certain file.

+
+ +
+ Areas of Unicode Support +

To support Unicode in Erlang, problems in various areas have been + addressed. This section describes each area briefly and more + thoroughly later in this User's Guide.

+ + + Representation + +

To handle Unicode characters in Erlang, a common representation + in both lists and binaries is needed. EEP (10) and the subsequent + initial implementation in Erlang/OTP R13A settled a standard + representation of Unicode characters in Erlang.

+ + Manipulation + +

The Unicode characters need to be processed by the Erlang + program, which is why library functions must be able to handle + them. In some cases functionality has been added to already + existing interfaces (as the string module now can + handle lists with any code points). In some cases new + functionality or options have been added (as in the io module, the file + handling, the unicode module, and + the bit syntax). Today most modules in Kernel and + STDLIB, as well as the VM are Unicode-aware.

+ + File I/O + +

I/O is by far the most problematic area for Unicode. A file is an + entity where bytes are stored, and the lore of programming has been + to treat characters and bytes as interchangeable. With Unicode + characters, you must decide on an encoding when you want to store + the data in a file. In Erlang, you can open a text file with an + encoding option, so that you can read characters from it rather than + bytes, but you can also open a file for bytewise I/O.

+

The Erlang I/O-system has been designed (or at least used) in a way + where you expect any I/O server to handle any string data. + That is, however, no longer the case when working with Unicode + characters. The Erlang programmer must now know the + capabilities of the device where the data ends up. Also, ports in + Erlang are byte-oriented, so an arbitrary string of (Unicode) + characters cannot be sent to a port without first converting it to an + encoding of choice.

+ + Terminal I/O + +

Terminal I/O is slightly easier than file I/O. The output is meant + for human reading and is usually Erlang syntax (for example, in the + shell). There exists syntactic representation of any Unicode + character without displaying the glyph (instead written as + \x{HHH}). Unicode data can therefore usually be + displayed even if the terminal as such does not support the whole + Unicode range.

+ + Filenames + +

Filenames can be stored as Unicode strings in different ways + depending on the underlying operating system and file system. This + can be handled fairly easy by a program. The problems arise when the + file system is inconsistent in its encodings. For example, Linux + allows files to be named with any sequence of bytes, leaving to each + program to interpret those bytes. On systems where these + "transparent" filenames are used, Erlang must be informed about the + filename encoding by a startup flag. The default is bytewise + interpretation, which is usually wrong, but allows for interpretation + of all filenames.

+

The concept of "raw filenames" can be used to handle wrongly encoded + filenames if one enables Unicode filename translation (+fnu) + on platforms where this is not the default.

+ + Source code encoding + +

The Erlang source code has support for the UTF-8 encoding + and bytewise encoding. The default in Erlang/OTP R16B was bytewise + (latin1) encoding. It was changed to UTF-8 in Erlang/OTP 17.0. + You can control the encoding by a comment like the following in the + beginning of the file:

+ +%% -*- coding: utf-8 -*- +

This of course requires your editor to support UTF-8 as well. The + same comment is also interpreted by functions like + file:consult/1, + the release handler, and so on, so that you can have all text files + in your source directories in UTF-8 encoding.

+ + The language + +

Having the source code in UTF-8 also allows you to write string + literals containing Unicode characters with code points > 255, + although atoms, module names, and function names are restricted to + the ISO Latin-1 range. Binary literals, where you use type + /utf8, can also be expressed using Unicode characters > 255. + Having module names using characters other than 7-bit ASCII can cause + trouble on operating systems with inconsistent file naming schemes, + and can hurt portability, so it is not recommended.

+

EEP 40 suggests that the language is also to allow for Unicode + characters > 255 in variable names. Whether to implement that EEP + is yet to be decided.

+ + +
+ +
+ Standard Unicode Representation +

In Erlang, strings are lists of integers. A string was until + Erlang/OTP R13 defined to be encoded in the ISO Latin-1 (ISO 8859-1) + character set, which is, code point by code point, a subrange of the + Unicode character set.

+ +

The standard list encoding for strings was therefore easily extended to + handle the whole Unicode range. A Unicode string in Erlang is a list + containing integers, where each integer is a valid Unicode code point and + represents one character in the Unicode character set.

+ +

Erlang strings in ISO Latin-1 are a subset of Unicode strings.

+ +

Only if a string contains code points < 256, can it be directly + converted to a binary by using, for example, + erlang:iolist_to_binary/1 + or can be sent directly to a port. If the string contains Unicode + characters > 255, an encoding must be decided upon and the string is to + be converted to a binary in the preferred encoding using + unicode:characters_to_binary/1,2,3. + Strings are not generally lists of bytes, as they were before + Erlang/OTP R13, they are lists of characters. Characters are not + generally bytes, they are Unicode code points.

+ +

Binaries are more troublesome. For performance reasons, programs often + store textual data in binaries instead of lists, mainly because they are + more compact (one byte per character instead of two words per character, + as is the case with lists). Using + erlang:list_to_binary/1, + an ISO Latin-1 Erlang string can be converted into a binary, effectively + using bytewise encoding: one byte per character. This was convenient for + those limited Erlang strings, but cannot be done for arbitrary Unicode + lists.

+ +

As the UTF-8 encoding is widely spread and provides some backward + compatibility in the 7-bit ASCII range, it is selected as the standard + encoding for Unicode characters in binaries for Erlang.

+ +

The standard binary encoding is used whenever a library function in + Erlang is to handle Unicode data in binaries, but is of course not + enforced when communicating externally. Functions and bit syntax exist to + encode and decode both UTF-8, UTF-16, and UTF-32 in binaries. However, + library functions dealing with binaries and Unicode in general only deal + with the default encoding.

+ +

Character data can be combined from many sources, sometimes available in + a mix of strings and binaries. Erlang has for long had the concept of + iodata or iolists, where binaries and lists can be combined + to represent a sequence of bytes. In the same way, the Unicode-aware + modules often allow for combinations of binaries and lists, where the + binaries have characters encoded in UTF-8 and the lists contain such + binaries or numbers representing Unicode code points:

+ + unicode_binary() = binary() with characters encoded in UTF-8 coding standard chardata() = charlist() | unicode_binary() charlist() = maybe_improper_list(char() | unicode_binary() | charlist(), - unicode_binary() | nil()) -

The module unicode in STDLIB even - supports similar mixes with binaries containing other encodings than - UTF-8, but that is a special case to allow for conversions to and - from external data:

- -external_unicode_binary() = binary() with characters coded in - a user specified Unicode encoding other than UTF-8 (UTF-16 or UTF-32) + unicode_binary() | nil()) + +

The module unicode + even supports similar mixes with binaries containing other encodings than + UTF-8, but that is a special case to allow for conversions to and from + external data:

+ + +external_unicode_binary() = binary() with characters coded in a user-specified + Unicode encoding other than UTF-8 (UTF-16 or UTF-32) external_chardata() = external_charlist() | external_unicode_binary() -external_charlist() = maybe_improper_list(char() | - external_unicode_binary() | - external_charlist(), - external_unicode_binary() | nil()) -
-
- Basic Language Support -

As of Erlang/OTP R16 Erlang - source files can be written in either UTF-8 or bytewise encoding - (a.k.a. latin1 encoding). The details on how to state the encoding - of an Erlang source file can be found in - epp(3). Strings and comments - can be written using Unicode, but functions still have to be named - using characters from the ISO-latin-1 character set and atoms are - restricted to the same ISO-latin-1 range. These restrictions in the - language are of course independent of the encoding of the source - file.

+external_charlist() = maybe_improper_list(char() | external_unicode_binary() | + external_charlist(), external_unicode_binary() | nil()) +
+
- Bit-syntax -

The bit-syntax contains types for coping with binary data in the - three main encodings. The types are named utf8, utf16 - and utf32 respectively. The utf16 and utf32 types - can be in a big- or little-endian variant:

- + Basic Language Support +

As from Erlang/OTP R16, Erlang source + files can be written in UTF-8 or bytewise (latin1) encoding. For + information about how to state the encoding of an Erlang source file, see + the epp(3) module. + Strings and comments can be written using Unicode, but functions must + still be named using characters from the ISO Latin-1 character set, and + atoms are restricted to the same ISO Latin-1 range. These restrictions in + the language are of course independent of the encoding of the source + file.

+ +
+ Bit Syntax +

The bit syntax contains types for handling binary data in the + three main encodings. The types are named utf8, utf16, + and utf32. The utf16 and utf32 types can be in a + big-endian or a little-endian variant:

+ + <<Ch/utf8,_/binary>> = Bin1, <<Ch/utf16-little,_/binary>> = Bin2, Bin3 = <<$H/utf32-little, $e/utf32-little, $l/utf32-little, $l/utf32-little, $o/utf32-little>>, -

For convenience, literal strings can be encoded with a Unicode - encoding in binaries using the following (or similar) syntax:

- + +

For convenience, literal strings can be encoded with a Unicode + encoding in binaries using the following (or similar) syntax:

+ + Bin4 = <<"Hello"/utf16>>, -
-
- String and Character Literals -

For source code, there is an extension to the \OOO - (backslash followed by three octal numbers) and \xHH - (backslash followed by x, followed by two hexadecimal - characters) syntax, namely \x{H ...} (a backslash - followed by an x, followed by left curly bracket, any - number of hexadecimal digits and a terminating right curly - bracket). This allows for entering characters of any code point - literally in a string even when the encoding of the source file is - bytewise (latin1).

-

In the shell, if using a Unicode input device, or in source - code stored in UTF-8, $ can be followed directly by a - Unicode character producing an integer. In the following example - the code point of a Cyrillic с is output:

- 
+
+ +
+ String and Character Literals +

For source code, there is an extension to syntax \OOO + (backslash followed by three octal numbers) and \xHH (backslash + followed by x, followed by two hexadecimal characters), namely + \x{H ...} (backslash followed by x, followed by + left curly bracket, any number of hexadecimal digits, and a terminating + right curly bracket). This allows for entering characters of any code + point literally in a string even when the encoding of the source file + is bytewise (latin1).

+ +

In the shell, if using a Unicode input device, or in source code + stored in UTF-8, $ can be followed directly by a Unicode + character producing an integer. In the following example, the code + point of a Cyrillic с is output:

+ + 
 7> $с.
 1089
-
-
- Heuristic String Detection -

In certain output functions and in the output of return values - in the shell, Erlang tries to heuristically detect string data in - lists and binaries. Typically you will see heuristic detection in - a situation like this:

- 
+
+ +
+ Heuristic String Detection +

In certain output functions and in the output of return values in + the shell, Erlang tries to detect string data in lists and binaries + heuristically. Typically you will see heuristic detection in a + situation like this:

+ + 
 1> [97,98,99].
 "abc"
 2> <<97,98,99>>.
 <<"abc">>    
 3> <<195,165,195,164,195,182>>.
 <<"åäö"/utf8>>
-

Here the shell will detect lists containing printable - characters or binaries containing printable characters either in - bytewise or UTF-8 encoding. The question here is: what is a - printable character? One view would be that anything the Unicode - standard thinks is printable, will also be printable according to - the heuristic detection. The result would be that almost any list - of integers will be deemed a string, resulting in all sorts of - characters being printed, maybe even characters your terminal does - not have in its font set (resulting in some generic output you - probably will not appreciate). Another way is to keep it backwards - compatible so that only the ISO-Latin-1 character set is used to - detect a string. A third way would be to let the user decide - exactly what Unicode ranges are to be viewed as characters. Since - Erlang/OTP R16B you can select either the whole Unicode range or the - ISO-Latin-1 range by supplying the startup flag +pc - Range, where Range is either latin1 or - unicode. For backwards compatibility, the default is - latin1. This only controls how heuristic string detection - is done. In the future, more ranges are expected to be added, so - that one can tailor the heuristics to the language and region - relevant to the user.

-

Lets look at an example with the two different startup options:

-
+
+      
Here the shell detects lists containing printable characters or
+        binaries containing printable characters in bytewise or UTF-8 encoding.
+        But what is a printable character? One view is that anything the Unicode
+        standard thinks is printable, is also printable according to the
+        heuristic detection. The result is then that almost any list of
+        integers are deemed a string, and all sorts of characters are printed,
+        maybe also characters that your terminal lacks in its font set
+        (resulting in some unappreciated generic output). 
+        Another way is to keep it backward compatible so that only the ISO
+        Latin-1 character set is used to detect a string. A third way is to let
+        the user decide exactly what Unicode ranges that are to be viewed as
+        characters.

+
+      
As from Erlang/OTP R16B you can select the ISO Latin-1 range or the
+        whole Unicode range by supplying startup flag +pc latin1 or
+        +pc unicode, respectively. For backward compatibility,
+        latin1 is default. This only controls how heuristic string
+        detection is done. More ranges are expected to be added in the future,
+        enabling tailoring of the heuristics to the language and region
+        relevant to the user.

+
+      
The following examples show the two startup options:

+
+      
 $ erl +pc latin1
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -467,9 +535,9 @@ Eshell V5.10.1  (abort with ^G)
 4> <<208,174,208,189,208,184,208,186,208,190,208,180>>.
 <<208,174,208,189,208,184,208,186,208,190,208,180>>
 5> <<229/utf8,228/utf8,246/utf8>>.
-<<"åäö"/utf8>>
-

-
+<<"åäö"/utf8>>

+
+      
 $ erl +pc unicode
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -483,78 +551,88 @@ Eshell V5.10.1  (abort with ^G)
 4> <<208,174,208,189,208,184,208,186,208,190,208,180>>.
 <<"Юникод"/utf8>>
 5> <<229/utf8,228/utf8,246/utf8>>.
-<<"åäö"/utf8>>
-

-    
In the examples, we can see that the default Erlang shell will
-    only interpret characters from the ISO-Latin1 range as printable
-    and will only detect lists or binaries with those "printable"
-    characters as containing string data. The valid UTF-8 binary
-    containing "Юникод", will not be printed as a string. When, on the
-    other hand, started with all Unicode characters printable (+pc
-    unicode), the shell will output anything containing printable
-    Unicode data (in binaries either UTF-8 or bytewise encoded) as
-    string data.

-
-    
These heuristics are also used by
-    io(_lib):format/2 and friends when the
-    t modifier is used in conjunction with ~p or
-    ~P:

-
+<<"åäö"/utf8>>

+
+      
In the examples, you can see that the default Erlang shell interprets
+        only characters from the ISO Latin1 range as printable and only detects
+        lists or binaries with those "printable" characters as containing
+        string data. The valid UTF-8 binary containing the Russian word
+        "Юникод", is not printed as a string. When started with all Unicode
+        characters printable (+pc unicode), the shell outputs anything
+        containing printable Unicode data (in binaries, either UTF-8 or
+        bytewise encoded) as string data.

+
+      
These heuristics are also used by
+        io:format/2,
+        io_lib:format/2,
+        and friends when modifier t is used with ~p or
+        ~P:

+
+      
 $ erl +pc latin1
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
 Eshell V5.10.1  (abort with ^G)  
 1> io:format("~tp~n",[{<<"åäö">>, <<"åäö"/utf8>>, <<208,174,208,189,208,184,208,186,208,190,208,180>>}]).
 {<<"åäö">>,<<"åäö"/utf8>>,<<208,174,208,189,208,184,208,186,208,190,208,180>>}
-ok
-

-
+ok

+
+      
 $ erl +pc unicode
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
 Eshell V5.10.1  (abort with ^G)  
 1> io:format("~tp~n",[{<<"åäö">>, <<"åäö"/utf8>>, <<208,174,208,189,208,184,208,186,208,190,208,180>>}]).
 {<<"åäö">>,<<"åäö"/utf8>>,<<"Юникод"/utf8>>}
-ok
-

-    
Please observe that this only affects heuristic interpretation
-    of lists and binaries on output. For example the ~ts format
-    sequence does always output a valid lists of characters,
-    regardless of the +pc setting, as the programmer has
-    explicitly requested string output.

+ok
+ +

Notice that this only affects heuristic interpretation of + lists and binaries on output. For example, the ~ts format + sequence always outputs a valid list of characters, regardless of the + +pc setting, as the programmer has explicitly requested string + output.

+
-
-
- The Interactive Shell -

The interactive Erlang shell, when started towards a terminal or - started using the werl command on windows, can support - Unicode input and output.

-

On Windows, proper operation requires that a suitable font - is installed and selected for the Erlang application to use. If no - suitable font is available on your system, try installing the DejaVu - fonts (dejavu-fonts.org), which are freely available and then - select that font in the Erlang shell application.

-

On Unix-like operating systems, the terminal should be able - to handle UTF-8 on input and output (modern versions of XTerm, KDE - konsole and the Gnome terminal do for example) and your locale - settings have to be proper. As an example, my LANG - environment variable is set as this:

- 
+
+  

+    The Interactive Shell
+    
The interactive Erlang shell, when started to a terminal or started
+      using command werl on Windows, can support Unicode input and
+      output.

+
+    
On Windows, proper operation requires that a suitable font is
+      installed and selected for the Erlang application to use. If no suitable
+      font is available on your system, try installing the
+      DejaVu fonts, which are freely
+      available, and then select that font in the Erlang shell application.

+
+    
On Unix-like operating systems, the terminal is to be able to handle
+      UTF-8 on input and output (this is done by, for example, modern versions
+      of XTerm, KDE Konsole, and the Gnome terminal)
+      and your locale settings must be proper. As
+      an example, a LANG environment variable can be set as follows:

+
+    
 $ echo $LANG
 en_US.UTF-8

-  
Actually, most systems handle the LC_CTYPE variable before
-  LANG, so if that is set, it has to be set to
-  UTF-8:

-  
+
+    
Most systems handle variable LC_CTYPE before LANG, so if
+      that is set, it must be set to UTF-8:

+
+    
 $ echo $LC_CTYPE
 en_US.UTF-8

-  
The LANG or LC_CTYPE setting should be consistent
-  with what the terminal is capable of, there is no portable way for
-  Erlang to ask the actual terminal about its UTF-8 capacity, we have
-  to rely on the language and character type settings.

-  
To investigate what Erlang thinks about the terminal, the
-  io:getopts() call can be used when the shell is started:

-  
+
+    
The LANG or LC_CTYPE setting are to be consistent with
+      what the terminal is capable of. There is no portable way for Erlang to
+      ask the terminal about its UTF-8 capacity, we have to rely on the
+      language and character type settings.

+
+    
To investigate what Erlang thinks about the terminal, the call
+      io:getopts()
+      can be used when the shell is started:

+
+    
 $ LC_CTYPE=en_US.ISO-8859-1 erl
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -571,27 +649,31 @@ Eshell V5.10.1  (abort with ^G)
 {encoding,unicode}
 2>

 
-  
When (finally?) everything is in order with the locale settings,
-  fonts and the terminal emulator, you probably also have discovered a
-  way to input characters in the script you desire. For testing, the
-  simplest way is to add some keyboard mappings for other languages,
-  usually done with some applet in your desktop environment. In my KDE
-  environment, I start the KDE Control Center (Personal Settings),
-  select "Regional and Accessibility" and then "Keyboard Layout". On
-  Windows XP, I start Control Panel->Regional and Language
-  Options, select the Language tab and click the Details... button in
-  the square named "Text services and input Languages". Your
-  environment probably provides similar means of changing the keyboard
-  layout. Make sure you have a way to easily switch back and forth
-  between keyboards if you are not used to this, entering commands
-  using a Cyrillic character set is, as an example, not easily done in
-  the Erlang shell.

-
-  
Now you are set up for some Unicode input and output. The
-  simplest thing to do is of course to enter a string in the
-  shell:

-
-  
+    
When (finally?) everything is in order with the locale settings, fonts.
+      and the terminal emulator, you have probably found a way to input
+      characters in the script you desire. For testing, the simplest way is to
+      add some keyboard mappings for other languages, usually done with some
+      applet in your desktop environment.

+
+    
In a KDE environment, select KDE Control Center (Personal
+      Settings) > Regional and Accessibility > Keyboard
+      Layout.

+
+    
On Windows XP, select Control Panel > Regional and Language
+      Options, select tab Language, and click button
+      Details... in the square named Text Services and Input
+      Languages.

+
+    
Your environment
+      probably provides similar means of changing the keyboard layout. Ensure
+      that you have a way to switch back and forth between keyboards easily if
+      you are not used to this. For example, entering commands using a Cyrillic
+      character set is not easily done in the Erlang shell.

+
+    
Now you are set up for some Unicode input and output. The simplest thing
+      to do is to enter a string in the shell:

+
+    
 $ erl
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -603,12 +685,13 @@ Eshell V5.10.1  (abort with ^G)
 3> io:format("~ts~n", [v(2)]).
 Юникод
 ok
-4> 

-  
While strings can be input as Unicode characters, the language
-  elements are still limited to the ISO-latin-1 character set. Only
-  character constants and strings are allowed to be beyond that
-  range:

-  
+4>

+
+    
While strings can be input as Unicode characters, the language elements
+      are still limited to the ISO Latin-1 character set. Only character
+      constants and strings are allowed to be beyond that range:

+
+    
 $ erl
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -618,371 +701,398 @@ Eshell V5.10.1  (abort with ^G)
 2> Юникод.
 * 1: illegal character
 2> 

-
 
-

-  Unicode File Names
-  
-  
Most modern operating systems support Unicode file names in some
-  way or another. There are several different ways to do this and
-  Erlang by default treats the different approaches differently:

-  
-    Mandatory Unicode file naming
-    
-      
Windows and, for most common uses, MacOS X enforces Unicode
-      support for file names. All files created in the file system have
-      names that can consistently be interpreted. In MacOS X, all file
-      names are retrieved in UTF-8 encoding, while Windows has
-      selected an approach where each system call handling file names
-      has a special Unicode aware variant, giving much the same
-      effect. There are no file names on these systems that are not
-      Unicode file names, why the default behavior of the Erlang VM is
-      to work in "Unicode file name translation mode",
-      meaning that a file name can be given as a Unicode list and that
-      will be automatically translated to the proper name encoding for
-      the underlying operating and file system.

-      
Doing i.e. a file:list_dir/1 on one of these systems
-      may return Unicode lists with code points beyond 255, depending
-      on the content of the actual file system.

-      
As the feature is fairly new, you may still stumble upon non
-      core applications that cannot handle being provided with file
-      names containing characters with code points larger than 255, but
-      the core Erlang system should have no problems with Unicode file
-      names.

-    
-    Transparent file naming
-    
-      
Most Unix operating systems have adopted a simpler approach,
-      namely that Unicode file naming is not enforced, but by
-      convention. Those systems usually use UTF-8 encoding for Unicode
-      file names, but do not enforce it. On such a system, a file name
-      containing characters having code points between 128 and 255 may
-      be named either as plain ISO-latin-1 or using UTF-8 encoding. As
-      no consistency is enforced, the Erlang VM can do no consistent
-      translation of all file names.

-
-      
By default on such systems, Erlang starts in utf8 file
-      name mode if the terminal supports UTF-8, otherwise in
-      latin1 mode.

-
-      
In the latin1 mode, file names are bytewise endcoded.
-      This allows for list representation of all file names in
-      the system, but, for example, a file named "Östersund.txt", will
-      appear in file:list_dir/1 as either "Östersund.txt" (if
-      the file name was encoded in bytewise ISO-Latin-1 by the program
-      creating the file, or more probably as
-      [195,150,115,116,101,114,115,117,110,100], which is a
-      list containing UTF-8 bytes - not what you would want... If you
-      on the other hand use Unicode file name translation on such a
-      system, non-UTF-8 file names will simply be ignored by functions
-      like file:list_dir/1. They can be retrieved with
-      file:list_dir_all/1, but wrongly encoded file names will
-      appear as "raw file names".

-
-    
-  
-
-  
The Unicode file naming support was introduced with Erlang/OTP
-  R14B01. A VM operating in Unicode file name translation mode can
-  work with files having names in any language or character set (as
-  long as it is supported by the underlying OS and file system). The
-  Unicode character list is used to denote file or directory names and
-  if the file system content is listed, you will also get
-  Unicode lists as return value. The support lies in the Kernel and
-  STDLIB modules, why most applications (that does not explicitly
-  require the file names to be in the ISO-latin-1 range) will benefit
-  from the Unicode support without change.

-
-  
On operating systems with mandatory Unicode file names, this
-  means that you more easily conform to the file names of other (non
-  Erlang) applications, and you can also process file names that, at
-  least on Windows, were completely inaccessible (due to having names
-  that could not be represented in ISO-latin-1). Also you will avoid
-  creating incomprehensible file names on MacOS X as the vfs layer of
-  the OS will accept all your file names as UTF-8 and will not rewrite
-  them.

-
-  
For most systems, turning on Unicode file name translation is no
-  problem even if it uses transparent file naming. Very few systems
-  have mixed file name encodings. A consistent UTF-8 named system will
-  work perfectly in Unicode file name mode. It was still however
-  considered experimental in Erlang/OTP R14B01 and is still not the default on
-  such systems. Unicode file name translation is turned on with the
-  +fnu switch to the On Linux, a VM started without explicitly
-  stating the file name translation mode will default to latin1
-  as the native file name encoding. On Windows and MacOS X, the
-  default behavior is that of Unicode file name translation, why the
-  file:native_name_encoding/0 by default returns utf8 on
-  those systems (the fact that Windows actually does not use UTF-8 on
-  the file system level can safely be ignored by the Erlang
-  programmer). The default behavior can, as stated before, be
-  changed using the +fnu or +fnl options to the VM, see
-  the erl program. If the
-  VM is started in Unicode file name translation mode,
-  file:native_name_encoding/0 will return the atom
-  utf8. The +fnu switch can be followed by w,
-  i or e, to control how wrongly encoded file names are
-  to be reported. w means that a warning is sent to the
-  error_logger whenever a wrongly encoded file name is
-  "skipped" in directory listings, i means that those wrongly
-  encoded file names are silently ignored and e means that the
-  API function will return an error whenever a wrongly encoded file
-  (or directory) name is encountered. w is the default. Note
-  that file:read_link/1 will always return an error if the link
-  points to an invalid file name.

-
-  
In Unicode file name mode, file names given to the BIF
-  open_port/2 with the option {spawn_executable,...} are
-  also interpreted as Unicode. So is the parameter list given in the
-  args option available when using spawn_executable. The
-  UTF-8 translation of arguments can be avoided using binaries, see
-  the discussion about raw file names below.

-
-  
It is worth noting that the file encoding options given
-  when opening a file has nothing to do with the file name
-  encoding convention. You can very well open files containing data
-  encoded in UTF-8 but having file names in bytewise (latin1) encoding
-  or vice versa.

-
-  
Erlang drivers and NIF shared objects still can not be
-  named with names containing code points beyond 127. This is a known
-  limitation to be removed in a future release. Erlang modules however
-  can, but it is definitely not a good idea and is still considered
-  experimental.

-
-

-  Notes About Raw File Names
-  
-  
Raw file names were introduced together with Unicode file name
-  support in erts-5.8.2 (Erlang/OTP R14B01). The reason "raw file
-  names" was introduced in the system was to be able to
-  consistently represent file names given in different encodings on
-  the same system. Having the VM automatically translate a file name
-  that is not in UTF-8 to a list of Unicode characters might seem
-  practical, but this would open up for both duplicate file names and
-  other inconsistent behavior. Consider a directory containing a file
-  named "björn" in ISO-latin-1, while the Erlang VM is
-  operating in Unicode file name mode (and therefore expecting UTF-8
-  file naming). The ISO-latin-1 name is not valid UTF-8 and one could
-  be tempted to think that automatic conversion in for example
-  file:list_dir/1 is a good idea. But what would happen if we
-  later tried to open the file and have the name as a Unicode list
-  (magically converted from the ISO-latin-1 file name)? The VM will
-  convert the file name given to UTF-8, as this is the encoding
-  expected. Effectively this means trying to open the file named
-  <<"björn"/utf8>>. This file does not exist,
-  and even if it existed it would not be the same file as the one that
-  was listed. We could even create two files named "björn",
-  one named in the UTF-8 encoding and one not. If
-  file:list_dir/1 would automatically convert the ISO-latin-1
-  file name to a list, we would get two identical file names as the
-  result. To avoid this, we need to differentiate between file names
-  being properly encoded according to the Unicode file naming
-  convention (i.e. UTF-8) and file names being invalid under the
-  encoding. By the common file:list_dir/1 function, the wrongly
-  encoded file names are simply ignored in Unicode file name
-  translation mode, but by the file:list_dir_all/1 function,
-  the file names with invalid encoding are returned as "raw"
-  file names, i.e. as binaries.
 
-
-  
The Erlang file module accepts raw file names as
-  input. open_port({spawn_executable, ...} ...) also accepts
-  them. As mentioned earlier, the arguments given in the option list
-  to open_port({spawn_executable, ...}  ...) undergo the same
-  conversion as the file names, meaning that the executable will be
-  provided with arguments in UTF-8 as well. This translation is
-  avoided consistently with how the file names are treated, by giving
-  the argument as a binary.

-
-  
To force Unicode file name translation mode on systems where this
-  is not the default was considered experimental in Erlang/OTP R14B01 due to
-  the fact that the initial implementation did not ignore wrongly
-  encoded file names, so that raw file names could spread unexpectedly
-  throughout the system. Beginning with Erlang/OTP R16B, the wrongly encoded file
-  names are only retrieved by special functions
-  (e.g. file:list_dir_all/1), so the impact on existing code is
-  much lower, why it is now supported. Unicode file name translation
-  is expected to be default in future releases.

-
-  
Even if you are operating without Unicode file naming translation
-  automatically done by the VM, you can access and create files with
-  names in UTF-8 encoding by using raw file names encoded as
-  UTF-8. Enforcing the UTF-8 encoding regardless of the mode the
-  Erlang VM is started in might, in some circumstances be a good idea,
-  as the convention of using UTF-8 file names is spreading.

-

-

-  Notes About MacOS X
-  
MacOS X's vfs layer enforces UTF-8 file names in a quite
-  aggressive way. Older versions did this by simply refusing to create
-  non UTF-8 conforming file names, while newer versions replace
-  offending bytes with the sequence "%HH", where HH is the
-  original character in hexadecimal notation. As Unicode translation
-  is enabled by default on MacOS X, the only way to come up against
-  this is to either start the VM with the +fnl flag or to use a
-  raw file name in bytewise (latin1) encoding. If using a raw
-  filename, with a bytewise encoding containing characters between 127
-  and 255, to create a file, the file can not be opened using the same
-  name as the one used to create it. There is no remedy for this
-  behaviour, other than keeping the file names in the right
-  encoding.

-
-  
MacOS X also reorganizes the names of files so that the
-  representation of accents etc is using the "combining characters",
-  i.e. the character ö is represented as the code points
-  [111,776], where 111 is the character o and 776 is the
-  special accent character "combining diaeresis". This way of
-  normalizing Unicode is otherwise very seldom used and Erlang
-  normalizes those file names in the opposite way upon retrieval, so
-  that file names using combining accents are not passed up to the
-  Erlang application. In Erlang the file name "björn" is
-  retrieved as [98,106,246,114,110], not as [98,106,117,776,114,110],
-  even though the file system might think differently. The
-  normalization into combining accents are redone when actually
-  accessing files, so this can usually be ignored by the Erlang
-  programmer.

-

-

-

-  Unicode in Environment and Parameters
-  
-  
Environment variables and their interpretation is handled much in
-  the same way as file names. If Unicode file names are enabled,
-  environment variables as well as parameters to the Erlang VM are
-  expected to be in Unicode.

-  
If Unicode file names are enabled, the calls to 
-  os:getenv/0, 
-  os:getenv/1,
-  os:putenv/2 and
-  os:unsetenv/1
-  will handle Unicode strings. On Unix-like platforms, the built-in
-  functions will translate environment variables in UTF-8 to/from
-  Unicode strings, possibly with code points > 255. On Windows the
-  Unicode versions of the environment system API will be used, also
-  allowing for code points > 255.

-  
On Unix-like operating systems, parameters are expected to be
-  UTF-8 without translation if Unicode file names are enabled.

-

-

-  Unicode-aware Modules
-  
Most of the modules in Erlang/OTP are of course Unicode-unaware
-  in the sense that they have no notion of Unicode and really should
-  not have. Typically they handle non-textual or byte-oriented data
-  (like gen_tcp etc).

-  
Modules that actually handle textual data (like io_lib,
-  string etc) are sometimes subject to conversion or extension
-  to be able to handle Unicode characters.

-  
Fortunately, most textual data has been stored in lists and range
-  checking has been sparse, why modules like string works well
-  for Unicode lists with little need for conversion or extension.

-  
Some modules are however changed to be explicitly
-  Unicode-aware. These modules include:

-  
-    unicode
-    
-      
The module unicode
-      is obviously Unicode-aware. It contains functions for conversion
-      between different Unicode formats as well as some utilities for
-      identifying byte order marks. Few programs handling Unicode data
-      will survive without this module.

-    
-    io
-    
-      
The io module has been
-      extended along with the actual I/O-protocol to handle Unicode
-      data. This means that several functions require binaries to be
-      in UTF-8 and there are modifiers to formatting control sequences
-      to allow for outputting of Unicode strings.

-    
-    file, group, user
-    
-      
I/O-servers throughout the system are able to handle
-      Unicode data and has options for converting data upon actual
-      output or input to/from the device. As shown earlier, the
-      shell has support for
-      Unicode terminals and the file module allows for
-      translation to and from various Unicode formats on disk.

-      
The actual reading and writing of files with Unicode data is
-      however not best done with the file module as its
-      interface is byte oriented. A file opened with a Unicode
-      encoding (like UTF-8), is then best read or written using the
-      io module.

-    
-    re
-    
-      
The re module allows
-      for matching Unicode strings as a special option. As the library
-      is actually centered on matching in binaries, the Unicode
-      support is UTF-8-centered.

-    
-    wx
-    
-      
The wx graphical library
-      has extensive support for Unicode text

-    
-  
-  
The module string works perfectly for
-  Unicode strings as well as for ISO-latin-1 strings with the
-  exception of the language-dependent to_upper and
-  to_lower
-  functions, which are only correct for the ISO-latin-1 character
-  set. Actually they can never function correctly for Unicode
-  characters in their current form, as there are language and locale
-  issues as well as multi-character mappings to consider when
-  converting text between cases. Converting case in an international
-  environment is a big subject not yet addressed in OTP.

-

-

-  Unicode Data in Files
-  
The fact that Erlang as such can handle Unicode data in many forms
-  does not automatically mean that the content of any file can be
-  Unicode text. The external entities such as ports or I/O-servers are
-  not generally Unicode capable.

-  
Ports are always byte oriented, so before sending data that you
-  are not sure is bytewise encoded to a port, make sure to encode it
-  in a proper Unicode encoding. Sometimes this will mean that only
-  part of the data shall be encoded as e.g. UTF-8, some parts may be
-  binary data (like a length indicator) or something else that shall
-  not undergo character encoding, so no automatic translation is
-  present.

-  
I/O-servers behave a little differently. The I/O-servers connected
-  to terminals (or stdout) can usually cope with Unicode data
-  regardless of the encoding option. This is convenient when
-  one expects a modern environment but do not want to crash when
-  writing to a archaic terminal or pipe. Files on the other hand are
-  more picky. A file can have an encoding option which makes it
-  generally usable by the io-module (e.g. {encoding,utf8}), but
-  is by default opened as a byte oriented file. The file module is byte oriented, why only
-  ISO-Latin-1 characters can be written using that module. The
-  io module is the one to use if
-  Unicode data is to be output to a file with other encoding
-  than latin1 (a.k.a. bytewise encoding). It is slightly
-  confusing that a file opened with
-  e.g. file:open(Name,[read,{encoding,utf8}]), cannot be
-  properly read using file:read(File,N) but you have to use the
-  io module to retrieve the Unicode data from it. The reason is
-  that file:read and file:write (and friends) are purely
-  byte oriented, and should so be, as that is the way to access
-  files other than text files - byte by byte. Just as with ports, you
-  can of course write encoded data into a file by "manually" converting
-  the data to the encoding of choice (using the unicode module or the bit syntax)
-  and then output it on a bytewise encoded (latin1) file.

-  
The rule of thumb is that the file module should be used for files
-  opened for bytewise access ({encoding,latin1}) and the
-  io module should be used when
-  accessing files with any other encoding
-  (e.g. {encoding,uf8}).

-
-  
Functions reading Erlang syntax from files generally recognize
-  the coding: comment and can therefore handle Unicode data on
-  input. When writing Erlang Terms to a file, you should insert
-  such comments when applicable:

-  
+  
 
+
+  

+    Unicode Filenames
+    
+    
Most modern operating systems support Unicode filenames in some way.
+      There are many different ways to do this and Erlang by default treats the
+      different approaches differently:

+
+    
+      Mandatory Unicode file naming
+      
+        
Windows and, for most common uses, MacOS X enforce Unicode support
+          for filenames. All files created in the file system have names that
+          can consistently be interpreted. In MacOS X, all filenames are
+          retrieved in UTF-8 encoding. In Windows, each system call handling
+          filenames has a special Unicode-aware variant, giving much the same
+          effect. There are no filenames on these systems that are not Unicode
+          filenames. So, the default behavior of the Erlang VM is to work in
+          "Unicode filename translation mode". This means that a
+          filename can be specified as a Unicode list, which is automatically
+          translated to the proper name encoding for the underlying operating
+          system and file system.

+        
Doing, for example, a
+          file:list_dir/1
+          on one of these systems can return Unicode lists with code points
+          > 255, depending on the content of the file system.

+      
+      Transparent file naming
+      
+        
Most Unix operating systems have adopted a simpler approach, namely
+          that Unicode file naming is not enforced, but by convention. Those
+          systems usually use UTF-8 encoding for Unicode filenames, but do not
+          enforce it. On such a system, a filename containing characters with
+          code points from 128 through 255 can be named as plain ISO Latin-1 or
+          use UTF-8 encoding. As no consistency is enforced, the Erlang VM
+          cannot do consistent translation of all filenames.

+        
By default on such systems, Erlang starts in utf8 filename
+          mode if the terminal supports UTF-8, otherwise in latin1
+          mode.

+        
In latin1 mode, filenames are bytewise encoded. This allows
+          for list representation of all filenames in the system. However, a
+          a file named "Östersund.txt", appears in
+          file:list_dir/1
+          either as "Östersund.txt" (if the filename was encoded in bytewise
+          ISO Latin-1 by the program creating the file) or more probably as
+          [195,150,115,116,101,114,115,117,110,100], which is a list
+          containing UTF-8 bytes (not what you want). If you use Unicode
+          filename translation on such a system, non-UTF-8 filenames are
+          ignored by functions like file:list_dir/1. They can be
+          retrieved with function
+          file:list_dir_all/1,
+          but wrongly encoded filenames appear as "raw filenames".
+        

+      
+    
+
+    
The Unicode file naming support was introduced in Erlang/OTP
+    R14B01.  A VM operating in Unicode filename translation mode can
+    work with files having names in any language or character set (as
+    long as it is supported by the underlying operating system and
+    file system). The Unicode character list is used to denote
+    filenames or directory names. If the file system content is
+    listed, you also get Unicode lists as return value. The support
+    lies in the Kernel and STDLIB modules, which is why
+    most applications (that does not explicitly require the filenames
+    to be in the ISO Latin-1 range) benefit from the Unicode support
+    without change.

+
+    
On operating systems with mandatory Unicode filenames, this means that
+      you more easily conform to the filenames of other (non-Erlang)
+      applications. You can also process filenames that, at least on Windows,
+      were inaccessible (because of having names that could not be represented
+      in ISO Latin-1). Also, you avoid creating incomprehensible filenames
+      on MacOS X, as the vfs layer of the operating system accepts all
+      your filenames as UTF-8 does not rewrite them.

+
+    
For most systems, turning on Unicode filename translation is no problem
+      even if it uses transparent file naming. Very few systems have mixed
+      filename encodings. A consistent UTF-8 named system works perfectly in
+      Unicode filename mode. It was still, however, considered experimental in
+      Erlang/OTP R14B01 and is still not the default on such systems.

+
+    
Unicode filename translation is turned on with switch +fnu. On
+      Linux, a VM started without explicitly stating the filename translation
+      mode defaults to latin1 as the native filename encoding. On
+      Windows and MacOS X, the default behavior is that of Unicode filename
+      translation. Therefore
+      file:native_name_encoding/0
+      by default returns utf8 on those systems (Windows does not use
+      UTF-8 on the file system level, but this can safely be ignored by the
+      Erlang programmer). The default behavior can, as stated earlier, be
+      changed using option +fnu or +fnl to the VM, see the
+      erl program. If the VM is
+      started in Unicode filename translation mode,
+      file:native_name_encoding/0 returns atom utf8. Switch
+      +fnu can be followed by w, i, or e to control
+      how wrongly encoded filenames are to be reported.

+
+    
+      
+        
w means that a warning is sent to the error_logger
+          whenever a wrongly encoded filename is "skipped" in directory
+          listings. w is the default.

+      
+      
+        
i means that wrongly encoded filenames are silently ignored.
+        

+      
+      
+        
e means that the API function returns an error whenever a
+          wrongly encoded filename (or directory name) is encountered.

+      
+    
+
+    
Notice that
+      file:read_link/1
+      always returns an error if the link points to an invalid filename.

+
+    
In Unicode filename mode, filenames given to BIF open_port/2 with
+      option {spawn_executable,...} are also interpreted as Unicode. So
+      is the parameter list specified in option args available when
+      using spawn_executable. The UTF-8 translation of arguments can be
+      avoided using binaries, see section
+      Notes About Raw Filenames.
+    

+
+    
Notice that the file encoding options specified when opening a file has
+      nothing to do with the filename encoding convention. You can very well
+      open files containing data encoded in UTF-8, but having filenames in
+      bytewise (latin1) encoding or conversely.

+
+    
Erlang drivers and NIF-shared objects still cannot be named with
+      names containing code points > 127. This limitation will be removed in
+      a future release. However, Erlang modules can, but it is definitely not a
+      good idea and is still considered experimental.

+    
+
+    

+      Notes About Raw Filenames
+      
+      
Raw filenames were introduced together with Unicode filename support
+        in ERTS 5.8.2 (Erlang/OTP R14B01). The reason "raw
+        filenames" were introduced in the system was
+	to be able to represent
+        filenames, specified in different encodings on the same system,
+        consistently. It can seem practical to have the VM automatically
+        translate a filename that is not in UTF-8 to a list of Unicode
+        characters, but this would open up for both duplicate filenames and
+        other inconsistent behavior.

+
+      
Consider a directory containing a file named "björn" in ISO
+        Latin-1, while the Erlang VM is operating in Unicode filename mode (and
+        therefore expects UTF-8 file naming). The ISO Latin-1 name is not valid
+        UTF-8 and one can be tempted to think that automatic conversion in, for
+        example,
+        file:list_dir/1
+        is a good idea. But what would happen if we later tried to open the file
+        and have the name as a Unicode list (magically converted from the ISO
+        Latin-1 filename)? The VM converts the filename to UTF-8, as this is
+        the encoding expected. Effectively this means trying to open the file
+        named <<"björn"/utf8>>. This file does not exist,
+        and even if it existed it would not be the same file as the one that was
+        listed. We could even create two files named "björn", one
+        named in UTF-8 encoding and one not. If file:list_dir/1 would
+        automatically convert the ISO Latin-1 filename to a list, we would get
+        two identical filenames as the result. To avoid this, we must
+        differentiate between filenames that are properly encoded according to
+        the Unicode file naming convention (that is, UTF-8) and filenames that
+        are invalid under the encoding. By the common function
+        file:list_dir/1, the wrongly encoded filenames are ignored in
+        Unicode filename translation mode, but by function
+        file:list_dir_all/1
+        the filenames with invalid encoding are returned as "raw"
+        filenames, that is, as binaries.
 
+
+      
The file module accepts raw filenames as input.
+        open_port({spawn_executable, ...} ...) also accepts them. As
+        mentioned earlier, the arguments specified in the option list to
+        open_port({spawn_executable, ...}  ...) undergo the same
+        conversion as the filenames, meaning that the executable is provided
+        with arguments in UTF-8 as well. This translation is avoided
+        consistently with how the filenames are treated, by giving the argument
+        as a binary.

+
+      
To force Unicode filename translation mode on systems where this is not
+        the default was considered experimental in Erlang/OTP R14B01. This was
+        because the initial implementation did not ignore wrongly encoded
+        filenames, so that raw filenames could spread unexpectedly throughout
+        the system. As from Erlang/OTP R16B, the wrongly encoded
+        filenames are only retrieved by special functions (such as
+        file:list_dir_all/1). Since the impact on existing code is
+	therefore much lower it is now supported.
+	Unicode filename translation is
+        expected to be default in future releases.

+
+      
Even if you are operating without Unicode file naming translation
+        automatically done by the VM, you can access and create files with
+        names in UTF-8 encoding by using raw filenames encoded as UTF-8.
+        Enforcing the UTF-8 encoding regardless of the mode the Erlang VM is
+        started in can in some circumstances be a good idea, as the convention
+        of using UTF-8 filenames is spreading.

+    

+
+    

+      Notes About MacOS X
+      
The vfs layer of MacOS X enforces UTF-8 filenames in an
+        aggressive way. Older versions did this by refusing to create non-UTF-8
+        conforming filenames, while newer versions replace offending bytes with
+        the sequence "%HH", where HH is the original character in
+        hexadecimal notation. As Unicode translation is enabled by default on
+        MacOS X, the only way to come up against this is to either start the VM
+        with flag +fnl or to use a raw filename in bytewise
+        (latin1) encoding. If using a raw filename, with a bytewise
+        encoding containing characters from 127 through 255, to create a file,
+        the file cannot be opened using the same name as the one used to create
+        it. There is no remedy for this behavior, except keeping the filenames
+        in the correct encoding.

+
+      
MacOS X reorganizes the filenames so that the representation of
+        accents, and so on, uses the "combining characters". For example,
+        character ö is represented as code points [111,776],
+        where 111 is character o and 776 is the special
+        accent character "Combining Diaeresis". This way of normalizing Unicode
+        is otherwise very seldom used. Erlang normalizes those filenames in the
+        opposite way upon retrieval, so that filenames using combining accents
+        are not passed up to the Erlang application. In Erlang, filename
+        "björn" is retrieved as [98,106,246,114,110], not as
+        [98,106,117,776,114,110], although the file system can think
+        differently. The normalization into combining accents is redone when
+        accessing files, so this can usually be ignored by the Erlang
+        programmer.

+    

+  

+
+  

+    Unicode in Environment and Parameters
+    
+    
Environment variables and their interpretation are handled much in the
+      same way as filenames. If Unicode filenames are enabled, environment
+      variables as well as parameters to the Erlang VM are expected to be in
+      Unicode.

+
+    
If Unicode filenames are enabled, the calls to
+      os:getenv/0,1,
+      os:putenv/2, and
+      os:unsetenv/1
+      handle Unicode strings. On Unix-like platforms, the built-in functions
+      translate environment variables in UTF-8 to/from Unicode strings, possibly
+      with code points > 255. On Windows, the Unicode versions of the
+      environment system API are used, and code points > 255 are allowed.

+    
On Unix-like operating systems, parameters are expected to be UTF-8
+      without translation if Unicode filenames are enabled.

+  

+
+  

+    Unicode-Aware Modules
+    
Most of the modules in Erlang/OTP are Unicode-unaware in the sense that
+      they have no notion of Unicode and should not have. Typically they handle
+      non-textual or byte-oriented data (such as gen_tcp).

+
+    
Modules handling textual data (such as
+      io_lib and
+      string are sometimes
+      subject to conversion or extension to be able to handle Unicode
+      characters.

+
+    
Fortunately, most textual data has been stored in lists and range
+      checking has been sparse, so modules like string work well for
+      Unicode lists with little need for conversion or extension.

+
+    
Some modules are, however, changed to be explicitly Unicode-aware. These
+      modules include:

+
+    
+      unicode
+      
+        
The unicode
+          module is clearly Unicode-aware. It contains functions for conversion
+          between different Unicode formats and some utilities for identifying
+          byte order marks. Few programs handling Unicode data survive without
+          this module.

+      
+      io
+      
+        
The io module has been
+          extended along with the actual I/O protocol to handle Unicode data.
+          This means that many functions require binaries to be in UTF-8, and
+          there are modifiers to format control sequences to allow for output
+          of Unicode strings.

+      
+      file, group, user
+      
+        
I/O-servers throughout the system can handle Unicode data and have
+          options for converting data upon output or input to/from the device.
+          As shown earlier, the
+          shell module has
+          support for Unicode terminals and the
+          file module
+           allows for translation to and from various Unicode formats on
+           disk.

+         
Reading and writing of files with Unicode data is, however, not best
+           done with the file module, as its interface is
+           byte-oriented. A file opened with a Unicode encoding (like UTF-8) is
+           best read or written using the
+           io module.

+      
+      re
+      
+        
The re module allows
+          for matching Unicode strings as a special option. As the library is
+          centered on matching in binaries, the Unicode support is
+          UTF-8-centered.

+      
+      wx
+      
+        
The graphical library wx
+          has extensive support for Unicode text.

+    
+
+    
The string module works
+      perfectly for Unicode strings and ISO Latin-1 strings, except the
+      language-dependent functions
+      string:to_upper/1
+      and
+      string:to_lower/1,
+      which are only correct for the ISO Latin-1 character set. These two
+      functions can never function correctly for Unicode characters in their
+      current form, as there are language and locale issues as well as
+      multi-character mappings to consider when converting text between cases.
+      Converting case in an international environment is a large subject not
+      yet addressed in OTP.

+  

+
+  

+    Unicode Data in Files
+    
Although Erlang can handle Unicode data in many forms does not
+      automatically mean that the content of any file can be Unicode text. The
+      external entities, such as ports and I/O servers, are not generally
+      Unicode capable.

+
+    
Ports are always byte-oriented, so before sending data that you are not
+      sure is bytewise-encoded to a port, ensure to encode it in a proper
+      Unicode encoding. Sometimes this means that only part of the data must
+      be encoded as, for example, UTF-8. Some parts can be binary data (like a
+      length indicator) or something else that must not undergo character
+      encoding, so no automatic translation is present.

+
+    
I/O servers behave a little differently. The I/O servers connected to
+      terminals (or stdout) can usually cope with Unicode data
+      regardless of the encoding option. This is convenient when one expects
+      a modern environment but do not want to crash when writing to an archaic
+      terminal or pipe.

+
+    
A file can have an encoding option that makes it generally usable by the
+      io module (for example
+      {encoding,utf8}), but is by default opened as a byte-oriented file.
+      The file module is
+      byte-oriented, so only ISO Latin-1 characters can be written using that
+      module. Use the io module if Unicode data is to be output to a
+      file with other encoding than latin1 (bytewise encoding).
+      It is slightly confusing that a file opened with, for example,
+      file:open(Name,[read,{encoding,utf8}]) cannot be properly read
+      using file:read(File,N), but using the io module to retrieve
+      the Unicode data from it. The reason is that file:read and
+      file:write (and friends) are purely byte-oriented, and should be,
+      as that is the way to access files other than text files, byte by byte.
+      As with ports, you can write encoded data into a file by "manually"
+      converting the data to the encoding of choice (using the
+      unicode module or the
+      bit syntax) and then output it on a bytewise (latin1) encoded
+      file.

+
+    
Recommendations:

+
+    
+      
Use the
+        file module for
+        files opened for bytewise access ({encoding,latin1}).

+      
+      
Use the io module
+        when accessing files with any other encoding (for example
+        {encoding,uf8}).

+      
+    
+
+    
Functions reading Erlang syntax from files recognize the coding:
+      comment and can therefore handle Unicode data on input. When writing
+      Erlang terms to a file, you are advised to insert such comments when
+      applicable:

+
+    
 $ erl +fna +pc unicode
 Erlang R16B (erts-5.10.1) [source]  [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -990,202 +1100,224 @@ Eshell V5.10.1  (abort with ^G)
 1> file:write_file("test.term",<<"%% coding: utf-8\n[{\"Юникод\",4711}].\n"/utf8>>).
 ok
 2> file:consult("test.term").   
-{ok,[[{"Юникод",4711}]]}
-  

-

-

-  Summary of Options
-  
-  
The Unicode support is controlled by both command line switches,
-  some standard environment variables and the version of OTP you are
-  using. Most options affect mainly the way Unicode data is displayed,
-  not the actual functionality of the API's in the standard
-  libraries. This means that Erlang programs usually do not
-  need to concern themselves with these options, they are more for the
-  development environment. An Erlang program can be written so that it
-  works well regardless of the type of system or the Unicode options
-  that are in effect.

-
-  
Here follows a summary of the settings affecting Unicode:

-  
-    The LANG and LC_CTYPE environment variables
-    
-      
The language setting in the OS mainly affects the shell. The
-      terminal (i.e. the group leader) will operate with {encoding,
-      unicode} only if the environment tells it that UTF-8 is
-      allowed. This setting should correspond to the actual terminal
-      you are using.

-      
The environment can also affect file name interpretation, if
-      Erlang is started with the +fna flag (which is default from
-      Erlang/OTP 17.0).

-      
You can check the setting of this by calling
-      io:getopts(), which will give you an option list
-      containing {encoding,unicode} or
-      {encoding,latin1}.

-    
-    The +pc {unicode|latin1} flag to 
-    erl(1)
-    
-      
This flag affects what is interpreted as string data when
-      doing heuristic string detection in the shell and in
-      io/io_lib:format with the "~tp" and
-      ~tP formatting instructions, as described above.

-      
You can check this option by calling io:printable_range/0,
-      which will return unicode or latin1. To be
-      compatible with future (expected) extensions to the settings,
-      one should rather use io_lib:printable_list/1 to check if
-      a list is printable according to the setting. That function will
-      take into account new possible settings returned from
-      io:printable_range/0.

-    
-    The +fn{l|a|u}
-    [{w|i|e}] 
-    flag to erl(1)
-    
-      
This flag affects how the file names are to be interpreted. On
-      operating systems with transparent file naming, this has to be
-      specified to allow for file naming in Unicode characters (and
-      for correct interpretation of file names containing characters
-      > 255.

-      
+fnl means bytewise interpretation of file names, which
-      was the usual way to represent ISO-Latin-1 file names before
-      UTF-8 file naming got widespread.

-      
+fnu means that file names are encoded in UTF-8, which
-      is nowadays the common scheme (although not enforced).

-      
+fna means that you automatically select between
-      +fnl and +fnu, based on the LANG and
-      LC_CTYPE environment variables. This is optimistic
-      heuristics indeed, nothing enforces a user to have a terminal
-      with the same encoding as the file system, but usually, this is
-      the case.  This is the default on all Unix-like operating
-      systems except MacOS X.

-
-      
The file name translation mode can be read with the
-      file:native_name_encoding/0 function, which returns
-      latin1 (meaning bytewise encoding) or utf8.

-    
-    
-    epp:default_encoding/0
-    
-      
This function returns the default encoding for Erlang source
-      files (if no encoding comment is present) in the currently
-      running release. In Erlang/OTP R16B latin1 was returned (meaning
-      bytewise encoding). In Erlang/OTP 17.0 and forward it returns
-      utf8.

-      
The encoding of each file can be specified using comments as
-      described in 
-      epp(3).

-    
-    io:setopts/{1,2} and the -oldshell/-noshell flags.
-    
-      
When Erlang is started with -oldshell or
-      -noshell, the I/O-server for standard_io is default
-      set to bytewise encoding, while an interactive shell defaults to
-      what the environment variables says.

-      
With the io:setopts/2 function you can set the
-      encoding of a file or other I/O-server. This can also be set when
-      opening a file. Setting the terminal (or other
-      standard_io server) unconditionally to the option
-      {encoding,utf8} will for example make UTF-8 encoded characters
-      being written to the device regardless of how Erlang was started or
-      the users environment.

-      
Opening files with encoding option is convenient when
-      writing or reading text files in a known encoding.

-      
You can retrieve the encoding setting for an I/O-server
-      using io:getopts().

-    
-  
-

-

-  Recipes
-  
When starting with Unicode, one often stumbles over some common
-  issues. I try to outline some methods of dealing with Unicode data
-  in this section.

+{ok,[[{"Юникод",4711}]]}
+
+ +
+ Summary of Options + +

The Unicode support is controlled by both command-line switches, some + standard environment variables, and the OTP version you are using. Most + options affect mainly how Unicode data is displayed, not the + functionality of the APIs in the standard libraries. This means that + Erlang programs usually do not need to concern themselves with these + options, they are more for the development environment. An Erlang program + can be written so that it works well regardless of the type of system or + the Unicode options that are in effect.

+ +

Here follows a summary of the settings affecting Unicode:

+ + + The LANG and LC_CTYPE environment variables + +

The language setting in the operating system mainly affects the + shell. The terminal (that is, the group leader) operates with + {encoding, unicode} only if the environment tells it that + UTF-8 is allowed. This setting is to correspond to the terminal you + are using.

+

The environment can also affect filename interpretation, if Erlang + is started with flag +fna (which is default from + Erlang/OTP 17.0).

+

You can check the setting of this by calling + io:getopts(), + which gives you an option list containing {encoding,unicode} + or {encoding,latin1}.

+ + The +pc {unicode|latin1} flag to + erl(1) + +

This flag affects what is interpreted as string data when doing + heuristic string detection in the shell and in + io/ + io_lib:format + with the "~tp" and ~tP formatting instructions, as + described earlier.

+

You can check this option by calling + io:printable_range/0, + which returns unicode or latin1. To be compatible with + future (expected) extensions to the settings, rather use + io_lib:printable_list/1 + to check if a list is printable according to the setting. That + function takes into account new possible settings returned from + io:printable_range/0.

+ + The +fn{l|u|a} + [{w|i|e}] flag to + erl(1) + +

This flag affects how the filenames are to be interpreted. On + operating systems with transparent file naming, this must be + specified to allow for file naming in Unicode characters (and for + correct interpretation of filenames containing characters > 255). +

+ + +

+fnl means bytewise interpretation of filenames, which was + the usual way to represent ISO Latin-1 filenames before UTF-8 + file naming got widespread.

+ + +

+fnu means that filenames are encoded in UTF-8, which is + nowadays the common scheme (although not enforced).

+ + +

+fna means that you automatically select between + +fnl and +fnu, based on environment variables + LANG and LC_CTYPE. This is optimistic + heuristics indeed, nothing enforces a user to have a terminal with + the same encoding as the file system, but this is usually the + case. This is the default on all Unix-like operating systems, + except MacOS X.

+ + +

The filename translation mode can be read with function + file:native_name_encoding/0, + which returns latin1 (bytewise encoding) or utf8.

+ + epp:default_encoding/0 + +

This function returns the default encoding for Erlang source files + (if no encoding comment is present) in the currently running release. + In Erlang/OTP R16B, latin1 (bytewise encoding) was returned. + As from Erlang/OTP 17.0, utf8 is returned.

+

The encoding of each file can be specified using comments as + described in the + epp(3) module. +

+ + io:setopts/1,2 + and flags -oldshell/-noshell + +

When Erlang is started with -oldshell or -noshell, the + I/O server for standard_io is by default set to bytewise + encoding, while an interactive shell defaults to what the + environment variables says.

+

You can set the encoding of a file or other I/O server with function + io:setopts/2. + This can also be set when opening a file. Setting the terminal (or + other standard_io server) unconditionally to option + {encoding,utf8} implies that UTF-8 encoded characters are + written to the device, regardless of how Erlang was started or the + user's environment.

+

Opening files with option encoding is convenient when + writing or reading text files in a known encoding.

+

You can retrieve the encoding setting for an I/O server with + function + io:getopts(). +

+ + +
+
- Byte Order Marks -

A common method of identifying encoding in text-files is to put - a byte order mark (BOM) first in the file. The BOM is the - code point 16#FEFF encoded in the same way as the rest of the - file. If such a file is to be read, the first few bytes (depending - on encoding) is not part of the actual text. This code outlines - how to open a file which is believed to have a BOM and set the - files encoding and position for further sequential reading - (preferably using the io - module). Note that error handling is omitted from the code:

- + Recipes +

When starting with Unicode, one often stumbles over some common issues. + This section describes some methods of dealing with Unicode data.

+ +
+ Byte Order Marks +

A common method of identifying encoding in text files is to put a Byte + Order Mark (BOM) first in the file. The BOM is the code point 16#FEFF + encoded in the same way as the remaining file. If such a file is to be + read, the first few bytes (depending on encoding) are not part of the + text. This code outlines how to open a file that is believed to + have a BOM, and sets the files encoding and position for further + sequential reading (preferably using the + io module).

+ +

Notice that error handling is omitted from the code:

+ + open_bom_file_for_reading(File) -> {ok,F} = file:open(File,[read,binary]), {ok,Bin} = file:read(F,4), {Type,Bytes} = unicode:bom_to_encoding(Bin), file:position(F,Bytes), io:setopts(F,[{encoding,Type}]), - {ok,F}. - -

The unicode:bom_to_encoding/1 function identifies the - encoding from a binary of at least four bytes. It returns, along - with an term suitable for setting the encoding of the file, the - actual length of the BOM, so that the file position can be set - accordingly. Note that file:position/2 always works on - byte-offsets, so that the actual byte-length of the BOM is - needed.

-

To open a file for writing and putting the BOM first is even - simpler:

- + {ok,F}. + +

Function + unicode:bom_to_encoding/1 + identifies the encoding from a binary of at least four bytes. It + returns, along with a term suitable for setting the encoding of the + file, the byte length of the BOM, so that the file position can be set + accordingly. Notice that function + file:position/2 + always works on byte-offsets, so that the byte length of the BOM is + needed.

+ +

To open a file for writing and place the BOM first is even simpler:

+ + open_bom_file_for_writing(File,Encoding) -> {ok,F} = file:open(File,[write,binary]), ok = file:write(File,unicode:encoding_to_bom(Encoding)), io:setopts(F,[{encoding,Encoding}]), - {ok,F}. - -

In both cases the file is then best processed using the - io module, as the functions in io can handle code - points beyond the ISO-latin-1 range.

-
-
- Formatted I/O -

When reading and writing to Unicode-aware entities, like the - User or a file opened for Unicode translation, you will probably - want to format text strings using the functions in io or io_lib. For backward - compatibility reasons, these functions do not accept just any list - as a string, but require a special translation modifier - when working with Unicode texts. The modifier is t. When - applied to the s control character in a formatting string, - it accepts all Unicode code points and expect binaries to be in - UTF-8:

- 
+    {ok,F}.
+
+      
The file is in both these cases then best processed using the
+        io module, as the functions
+        in that module can handle code points beyond the ISO Latin-1 range.

+
+ +
+ Formatted I/O +

When reading and writing to Unicode-aware entities, like a + file opened for Unicode translation, you probably want to format text + strings using the functions in the + io module or the + io_lib module. For + backward compatibility reasons, these functions do not accept any list + as a string, but require a special translation modifier when + working with Unicode texts. The modifier is t. When applied to + control character s in a formatting string, it accepts all + Unicode code points and expects binaries to be in UTF-8:

+ + 
 1> io:format("~ts~n",[<<"åäö"/utf8>>]).
 åäö
 ok
 2> io:format("~s~n",[<<"åäö"/utf8>>]).
 åäö
 ok
-

Obviously the second io:format/2 gives undesired output - because the UTF-8 binary is not in latin1. For backward - compatibility, the non prefixed s control character expects - bytewise encoded ISO-latin-1 characters in binaries and lists - containing only code points < 256.

-

As long as the data is always lists, the t modifier can - be used for any string, but when binary data is involved, care - must be taken to make the right choice of formatting characters. A - bytewise encoded binary will also be interpreted as a string and - printed even when using ~ts, but it might be mistaken for a - valid UTF-8 string and one should therefore avoid using the - ~ts control if the binary contains bytewise encoded - characters and not UTF-8.

-

The function format/2 in io_lib behaves - similarly. This function is defined to return a deep list of - characters and the output could easily be converted to binary data - for outputting on a device of any kind by a simple - erlang:list_to_binary/1. When the translation modifier is - used, the list can however contain characters that cannot be - stored in one byte. The call to erlang:list_to_binary/1 - will in that case fail. However, if the I/O server you want to - communicate with is Unicode-aware, the list returned can still be - used directly:

-
+
+      
Clearly, the second io:format/2 gives undesired output, as the
+        UTF-8 binary is not in latin1. For backward compatibility, the
+        non-prefixed control character s expects bytewise-encoded ISO
+        Latin-1 characters in binaries and lists containing only code points
+        < 256.

+
+      
As long as the data is always lists, modifier t can be used for
+        any string, but when binary data is involved, care must be taken to
+        make the correct choice of formatting characters. A bytewise-encoded
+        binary is also interpreted as a string, and printed even when using
+        ~ts, but it can be mistaken for a valid UTF-8 string. Avoid
+        therefore using the ~ts control if the binary contains
+        bytewise-encoded characters and not UTF-8.

+
+      
Function
+        io_lib:format/2
+        behaves similarly. It is defined to return a deep list of characters
+        and the output can easily be converted to binary data for outputting on
+        any device by a simple
+        erlang:list_to_binary/1.
+        When the translation modifier is used, the list can, however, contain
+        characters that cannot be stored in one byte. The call to
+        erlang:list_to_binary/1 then fails. However, if the I/O server
+        you want to communicate with is Unicode-aware, the returned list can
+        still be used directly:

+
+      
 $ erl +pc unicode
 Erlang R16B (erts-5.10.1) [source] [async-threads:0] [hipe] [kernel-poll:false]
 
@@ -1195,55 +1327,56 @@ Eshell V5.10.1 (abort with ^G)
 2> io:put_chars(io_lib:format("~ts~n", ["Γιούνικοντ"])).
 Γιούνικοντ
 ok

-    
The Unicode string is returned as a Unicode list, which is
-    recognized as such since the Erlang shell uses the Unicode
-    encoding (and is started with all Unicode characters considered
-    printable). The Unicode list is valid input to the io:put_chars/2 function,
-    so data can be output on any Unicode capable device. If the device
-    is a terminal, characters will be output in the \x{H
-    ...} format if encoding is latin1 otherwise in UTF-8
-    (for the non-interactive terminal - "oldshell" or "noshell") or
-    whatever is suitable to show the character properly (for an
-    interactive terminal - the regular shell). The bottom line is that
-    you can always send Unicode data to the standard_io
-    device. Files will however only accept Unicode code points beyond
-    ISO-latin-1 if encoding is set to something else than
-    latin1.

-
-
- Heuristic Identification of UTF-8 -

While it is - strongly encouraged that the actual encoding of characters in - binary data is known prior to processing, that is not always - possible. On a typical Linux system, there is a mix of UTF-8 - and ISO-latin-1 text files and there are seldom any BOM's in the - files to identify them.

-

UTF-8 is designed in such a way that ISO-latin-1 characters - with numbers beyond the 7-bit ASCII range are seldom considered - valid when decoded as UTF-8. Therefore one can usually use - heuristics to determine if a file is in UTF-8 or if it is encoded - in ISO-latin-1 (one byte per character) encoding. The - unicode module can be used to determine if data can be - interpreted as UTF-8:

- + +

The Unicode string is returned as a Unicode list, which is recognized + as such, as the Erlang shell uses the Unicode encoding (and is started + with all Unicode characters considered printable). The Unicode list is + valid input to function + io:put_chars/2, + so data can be output on any Unicode-capable device. If the device is a + terminal, characters are output in format \x{H...} if + encoding is latin1. Otherwise in UTF-8 (for the non-interactive + terminal: "oldshell" or "noshell") or whatever is suitable to show the + character properly (for an interactive terminal: the regular shell).

+ +

So, you can always send Unicode data to the standard_io device. + Files, however, accept only Unicode code points beyond ISO Latin-1 if + encoding is set to something else than latin1.

+
+ +
+ Heuristic Identification of UTF-8 +

While it is strongly encouraged that the encoding of characters + in binary data is known before processing, that is not always possible. + On a typical Linux system, there is a mix of UTF-8 and ISO Latin-1 text + files, and there are seldom any BOMs in the files to identify them.

+ +

UTF-8 is designed so that ISO Latin-1 characters with numbers beyond + the 7-bit ASCII range are seldom considered valid when decoded as UTF-8. + Therefore one can usually use heuristics to determine if a file is in + UTF-8 or if it is encoded in ISO Latin-1 (one byte per character). + The unicode + module can be used to determine if data can be interpreted as UTF-8:

+ + heuristic_encoding_bin(Bin) when is_binary(Bin) -> case unicode:characters_to_binary(Bin,utf8,utf8) of Bin -> utf8; _ -> latin1 - end. - -

If one does not have a complete binary of the file content, one - could instead chunk through the file and check part by part. The - return-tuple {incomplete,Decoded,Rest} from - unicode:characters_to_binary/{1,2,3} comes in handy. The - incomplete rest from one chunk of data read from the file is - prepended to the next chunk and we therefore circumvent the - problem of character boundaries when reading chunks of bytes in - UTF-8 encoding:

- + end. + +

If you do not have a complete binary of the file content, you can + instead chunk through the file and check part by part. The return-tuple + {incomplete,Decoded,Rest} from function + unicode:characters_to_binary/1,2,3 + comes in handy. The incomplete rest from one chunk of data read from the + file is prepended to the next chunk and we therefore avoid the problem + of character boundaries when reading chunks of bytes in UTF-8 + encoding:

+ + heuristic_encoding_file(FileName) -> {ok,F} = file:open(FileName,[read,binary]), loop_through_file(F,<<>>,file:read(F,1024)). @@ -1260,13 +1393,14 @@ loop_through_file(F,Acc,{ok,Bin}) when is_binary(Bin) -> loop_through_file(F,Rest,file:read(F,1024)); Res when is_binary(Res) -> loop_through_file(F,<<>>,file:read(F,1024)) - end. - -

Another option is to try to read the whole file in UTF-8 - encoding and see if it fails. Here we need to read the file using - io:get_chars/3, as we have to succeed in reading characters - with a code point over 255:

- + end. + +

Another option is to try to read the whole file in UTF-8 encoding and + see if it fails. Here we need to read the file using function + io:get_chars/3, + as we have to read characters with a code point > 255:

+ + heuristic_encoding_file2(FileName) -> {ok,F} = file:open(FileName,[read,binary,{encoding,utf8}]), loop_through_file2(F,io:get_chars(F,'',1024)). @@ -1276,69 +1410,71 @@ loop_through_file2(_,eof) -> loop_through_file2(_,{error,_Err}) -> latin1; loop_through_file2(F,Bin) when is_binary(Bin) -> - loop_through_file2(F,io:get_chars(F,'',1024)). - -
-
- Lists of UTF-8 Bytes -

For various reasons, you may find yourself having a list of - UTF-8 bytes. This is not a regular string of Unicode characters as - each element in the list does not contain one character. Instead - you get the "raw" UTF-8 encoding that you have in binaries. This - is easily converted to a proper Unicode string by first converting - byte per byte into a binary and then converting the binary of - UTF-8 encoded characters back to a Unicode string:

- - utf8_list_to_string(StrangeList) -> - unicode:characters_to_list(list_to_binary(StrangeList)). - -
-
- Double UTF-8 Encoding -

When working with binaries, you may get the horrible "double - UTF-8 encoding", where strange characters are encoded in your - binaries or files that you did not expect. What you may have got, - is a UTF-8 encoded binary that is for the second time encoded as - UTF-8. A common situation is where you read a file, byte by byte, - but the actual content is already UTF-8. If you then convert the - bytes to UTF-8, using i.e. the unicode module or by - writing to a file opened with the {encoding,utf8} - option. You will have each byte in the in the input file - encoded as UTF-8, not each character of the original text (one - character may have been encoded in several bytes). There is no - real remedy for this other than being very sure of which data is - actually encoded in which format, and never convert UTF-8 data - (possibly read byte by byte from a file) into UTF-8 again.

-

The by far most common situation where this happens, is when - you get lists of UTF-8 instead of proper Unicode strings, and then - convert them to UTF-8 in a binary or on a file:

- - wrong_thing_to_do() -> - {ok,Bin} = file:read_file("an_utf8_encoded_file.txt"), - MyList = binary_to_list(Bin), %% Wrong! It is an utf8 binary! - {ok,C} = file:open("catastrophe.txt",[write,{encoding,utf8}]), - io:put_chars(C,MyList), %% Expects a Unicode string, but get UTF-8 - %% bytes in a list! - file:close(C). %% The file catastrophe.txt contains more or less unreadable - %% garbage! - -

Make very sure you know what a binary contains before - converting it to a string. If no other option exists, try - heuristics:

- - if_you_can_not_know() -> - {ok,Bin} = file:read_file("maybe_utf8_encoded_file.txt"), - MyList = case unicode:characters_to_list(Bin) of - L when is_list(L) -> - L; - _ -> - binary_to_list(Bin) %% The file was bytewise encoded - end, - %% Now we know that the list is a Unicode string, not a list of UTF-8 bytes - {ok,G} = file:open("greatness.txt",[write,{encoding,utf8}]), - io:put_chars(G,MyList), %% Expects a Unicode string, which is what it gets! - file:close(G). %% The file contains valid UTF-8 encoded Unicode characters! - + loop_through_file2(F,io:get_chars(F,'',1024)). +
+ +
+ Lists of UTF-8 Bytes +

For various reasons, you can sometimes have a list of UTF-8 + bytes. This is not a regular string of Unicode characters, as each list + element does not contain one character. Instead you get the "raw" UTF-8 + encoding that you have in binaries. This is easily converted to a proper + Unicode string by first converting byte per byte into a binary, and then + converting the binary of UTF-8 encoded characters back to a Unicode + string:

+ + +utf8_list_to_string(StrangeList) -> + unicode:characters_to_list(list_to_binary(StrangeList)). +
+ +
+ Double UTF-8 Encoding +

When working with binaries, you can get the horrible "double UTF-8 + encoding", where strange characters are encoded in your binaries or + files. In other words, you can get a UTF-8 encoded binary that for the + second time is encoded as UTF-8. A common situation is where you read a + file, byte by byte, but the content is already UTF-8. If you then + convert the bytes to UTF-8, using, for example, the + unicode module, or by + writing to a file opened with option {encoding,utf8}, you have + each byte in the input file encoded as UTF-8, not each + character of the original text (one character can have been encoded in + many bytes). There is no real remedy for this other than to be sure of + which data is encoded in which format, and never convert UTF-8 data + (possibly read byte by byte from a file) into UTF-8 again.

+ +

By far the most common situation where this occurs, is when you get + lists of UTF-8 instead of proper Unicode strings, and then convert them + to UTF-8 in a binary or on a file:

+ + +wrong_thing_to_do() -> + {ok,Bin} = file:read_file("an_utf8_encoded_file.txt"), + MyList = binary_to_list(Bin), %% Wrong! It is an utf8 binary! + {ok,C} = file:open("catastrophe.txt",[write,{encoding,utf8}]), + io:put_chars(C,MyList), %% Expects a Unicode string, but get UTF-8 + %% bytes in a list! + file:close(C). %% The file catastrophe.txt contains more or less unreadable + %% garbage! + +

Ensure you know what a binary contains before converting it to a + string. If no other option exists, try heuristics:

+ + +if_you_can_not_know() -> + {ok,Bin} = file:read_file("maybe_utf8_encoded_file.txt"), + MyList = case unicode:characters_to_list(Bin) of + L when is_list(L) -> + L; + _ -> + binary_to_list(Bin) %% The file was bytewise encoded + end, + %% Now we know that the list is a Unicode string, not a list of UTF-8 bytes + {ok,G} = file:open("greatness.txt",[write,{encoding,utf8}]), + io:put_chars(G,MyList), %% Expects a Unicode string, which is what it gets! + file:close(G). %% The file contains valid UTF-8 encoded Unicode characters! +
- + diff --git a/lib/stdlib/doc/src/win32reg.xml b/lib/stdlib/doc/src/win32reg.xml index 52a8942c59..f4a4fa1626 100644 --- a/lib/stdlib/doc/src/win32reg.xml +++ b/lib/stdlib/doc/src/win32reg.xml @@ -24,38 +24,39 @@ win32reg Bjorn Gustavsson - NN + - nobody - no + + 2000-08-10 PA1 - win32reg.sgml + win32reg.xml win32reg - win32reg provides access to the registry on Windows + Provides access to the registry on Windows. -

win32reg provides read and write access to the +

This module provides read and write access to the registry on Windows. It is essentially a port driver wrapped around the Win32 API calls for accessing the registry.

The registry is a hierarchical database, used to store various system - and software information in Windows. It is available in Windows 95 and - Windows NT. It contains installation data, and is updated by installers + and software information in Windows. + It contains installation data, and is updated by installers and system programs. The Erlang installer updates the registry by adding data that Erlang needs.

The registry contains keys and values. Keys are like the directories in a file system, they form a hierarchy. Values are like files, they have a name and a value, and also a type.

-

Paths to keys are left to right, with sub-keys to the right and backslash - between keys. (Remember that backslashes must be doubled in Erlang strings.) - Case is preserved but not significant. - Example: "\\hkey_local_machine\\software\\Ericsson\\Erlang\\5.0" is the key +

Paths to keys are left to right, with subkeys to the right and backslash + between keys. (Remember that backslashes must be doubled in Erlang + strings.) Case is preserved but not significant.

+

For example, + "\\hkey_local_machine\\software\\Ericsson\\Erlang\\5.0" is the key for the installation data for the latest Erlang release.

-

There are six entry points in the Windows registry, top level keys. They can be - abbreviated in the win32reg module as:

+

There are six entry points in the Windows registry, top-level keys. + They can be abbreviated in this module as follows:

-Abbrev.          Registry key
-=======          ============      
+Abbreviation     Registry key
+============     ============
 hkcr             HKEY_CLASSES_ROOT
 current_user     HKEY_CURRENT_USER
 hkcu             HKEY_CURRENT_USER
@@ -67,29 +68,39 @@ current_config   HKEY_CURRENT_CONFIG
 hkcc             HKEY_CURRENT_CONFIG
 dyn_data         HKEY_DYN_DATA
 hkdd             HKEY_DYN_DATA
-

The key above could be written as "\\hklm\\software\\ericsson\\erlang\\5.0".

-

The win32reg module uses a current key. It works much like the - current directory. From the current key, values can be fetched, sub-keys +

The key above can be written as + "\\hklm\\software\\ericsson\\erlang\\5.0".

+

This module uses a current key. It works much like the + current directory. From the current key, values can be fetched, subkeys can be listed, and so on.

-

Under a key, any number of named values can be stored. They have name, and +

Under a key, any number of named values can be stored. They have names, types, and data.

-

Currently, the win32reg module supports storing only the following - types: REG_DWORD, which is an - integer, REG_SZ which is a string and REG_BINARY which is a binary. - Other types can be read, and will be returned as binaries.

-

There is also a "default" value, which has the empty string as name. It is read and - written with the atom default instead of the name.

-

Some registry values are stored as strings with references to environment variables, - e.g. "%SystemRoot%Windows". SystemRoot is an environment variable, and should be - replaced with its value. A function expand/1 is provided, so that environment - variables surrounded in % can be expanded to their values.

-

For additional information on the Windows registry consult the Win32 +

win32reg supports storing of the following types:

+ + REG_DWORD, which is an integer + REG_SZ, which is a string + REG_BINARY, which is a binary + +

Other types can be read, and are returned as binaries.

+

There is also a "default" value, which has the empty string as name. It + is read and written with the atom default instead of the name.

+

Some registry values are stored as strings with references to environment + variables, for example, %SystemRoot%Windows. SystemRoot is + an environment variable, and is to be replaced with its value. Function + expand/1 is provided so that + environment variables surrounded by % can be expanded to their + values.

+

For more information on the Windows registry, see consult the Win32 Programmer's Reference.

 + -

As returned by open/1.

 + +

As returned by + open/1.

+ @@ -98,136 +109,164 @@ hkdd HKEY_DYN_DATA + - Move to a key in the registry + Move to a key in the registry. -

Changes the current key to another key. Works like cd. +

Changes the current key to another key. Works like cd. The key can be specified as a relative path or as an - absolute path, starting with \.

+ absolute path, starting with \.

 + - Move to a key, create it if it is not there + Move to a key, create it if it is not there.

Creates a key, or just changes to it, if it is already there. Works - like a combination of mkdir and cd. Calls the Win32 API function - RegCreateKeyEx().

-

The registry must have been opened in write-mode.

+ like a combination of mkdir and cd. + Calls the Win32 API function RegCreateKeyEx().

+

The registry must have been opened in write mode.

 + Close the registry. -

Closes the registry. After that, the RegHandle cannot - be used.

+

Closes the registry. After that, the RegHandle + cannot be used.

 + Return the path to the current key. -

Returns the path to the current key. This is the equivalent of pwd.

-

Note that the current key is stored in the driver, and might be - invalid (e.g. if the key has been removed).

+

Returns the path to the current key. This is the equivalent of + pwd.

+

Notice that the current key is stored in the driver, and can be + invalid (for example, if the key has been removed).

 + - Delete the current key + Delete the current key.

Deletes the current key, if it is valid. Calls the Win32 API - function RegDeleteKey(). Note that this call does not change the current key, - (unlike change_key_create/2.) This means that after the call, the - current key is invalid.

+ function RegDeleteKey(). Notice that this call does not change + the current key (unlike + + change_key_create/2). + This means that after the call, the current key is invalid.

 + Delete the named value on the current key.

Deletes a named value on the current key. The atom default is - used for the the default value.

-

The registry must have been opened in write-mode.

+ used for the default value.

+

The registry must have been opened in write mode.

 + - Expand a string with environment variables + Expand a string with environment variables.

Expands a string containing environment variables between percent - characters. Anything between two % is taken for a environment - variable, and is replaced by the value. Two consecutive % is replaced - by one %.

-

A variable name that is not in the environment, will result in an error.

+ characters. Anything between two % is taken for an environment + variable, and is replaced by the value. Two consecutive % are + replaced by one %.

+

A variable name that is not in the environment results in an + error.

 + - Convert an POSIX errorcode to a string + Convert a POSIX error code to a string. -

Convert an POSIX errorcode to a string (by calling erl_posix_msg:message).

+

Converts a POSIX error code to a string + (by calling erl_posix_msg:message/1).

 + - Open the registry for reading or writing + Open the registry for reading or writing. -

Opens the registry for reading or writing. The current key will be the root - (HKEY_CLASSES_ROOT). The read flag in the mode list can be omitted.

-

Use change_key/2 with an absolute path after open.

+

Opens the registry for reading or writing. The current key is the + root (HKEY_CLASSES_ROOT). Flag read in the mode list + can be omitted.

+

Use change_key/2 + with an absolute path after + open.

 + - Set value at the current registry key with specified name. + Set value at the current registry key with specified name. + -

Sets the named (or default) value to value. Calls the Win32 - API function RegSetValueEx(). The value can be of three types, and - the corresponding registry type will be used. Currently the types supported - are: REG_DWORD for integers, REG_SZ for strings and - REG_BINARY for binaries. Other types cannot currently be added - or changed.

-

The registry must have been opened in write-mode.

+

Sets the named (or default) value to value. Calls the Win32 + API function RegSetValueEx(). The value can be of three types, + and the corresponding registry type is used. The supported types + are the following:

+ + REG_DWORD for integers + REG_SZ for strings + REG_BINARY for binaries + +

Other types cannot be added or changed.

+

The registry must have been opened in write mode.

 + Get subkeys to the current key.

Returns a list of subkeys to the current key. Calls the Win32 API function EnumRegKeysEx().

-

Avoid calling this on the root keys, it can be slow.

+

Avoid calling this on the root keys, as it can be slow.

 + Get the named value on the current key.

Retrieves the named value (or default) on the current key. - Registry values of type REG_SZ, are returned as strings. Type REG_DWORD - values are returned as integers. All other types are returned as binaries.

+ Registry values of type REG_SZ are returned as strings. + Type REG_DWORD values are returned as integers. All other + types are returned as binaries.

 + Get all values on the current key.

Retrieves a list of all values on the current key. The values - have types corresponding to the registry types, see value. + have types corresponding to the registry types, see + value/2. Calls the Win32 API function EnumRegValuesEx().
- SEE ALSO -

Win32 Programmer's Reference (from Microsoft)

-

erl_posix_msg

-

The Windows 95 Registry (book from O'Reilly)

+ See Also +

erl_posix_msg, + The Windows 95 Registry (book from O'Reilly), + Win32 Programmer's Reference (from Microsoft)

diff --git a/lib/stdlib/doc/src/zip.xml b/lib/stdlib/doc/src/zip.xml index 09a6587583..de23608046 100644 --- a/lib/stdlib/doc/src/zip.xml +++ b/lib/stdlib/doc/src/zip.xml @@ -28,98 +28,130 @@ 1 - 05-11-02 + 2005-11-02 PA1 - zip.sgml + zip.xml zip - Utility for reading and creating 'zip' archives. + Utility for reading and creating 'zip' archives. + -

The zip module archives and extracts files to and from a zip - archive. The zip format is specified by the "ZIP Appnote.txt" file - available on PKWare's website www.pkware.com.

+

This module archives and extracts files to and from a zip + archive. The zip format is specified by the "ZIP Appnote.txt" file, + available on the PKWARE web site + www.pkware.com.

The zip module supports zip archive versions up to 6.1. However, password-protection and Zip64 are not supported.

-

By convention, the name of a zip file should end in ".zip". - To abide to the convention, you'll need to add ".zip" yourself - to the name.

-

Zip archives are created with the - zip/2 or the - zip/3 function. (They are - also available as create, to resemble the erl_tar - module.)

-

To extract files from a zip archive, use the - unzip/1 or the - unzip/2 function. (They are - also available as extract.)

-

To fold a function over all files in a zip archive, use the - foldl_3 function.

-

To return a list of the files in a zip archive, use the - list_dir/1 or the - list_dir/2 function. (They - are also available as table.)

-

To print a list of files to the Erlang shell, - use either the t/1 or - tt/1 function.

-

In some cases, it is desirable to open a zip archive, and to - unzip files from it file by file, without having to reopen the - archive. The functions - zip_open, - zip_get, - zip_list_dir and - zip_close do this.

+

By convention, the name of a zip file is to end with .zip. + To abide to the convention, add .zip to the filename.

+ + +

To create zip archives, use function + zip/2 or + zip/3. They are + also available as create/2,3, to resemble the + erl_tar module.

+ + +

To extract files from a zip archive, use function + unzip/1 or + unzip/2. They are + also available as extract/1,2, to resemble the + erl_tar module.

+ + +

To fold a function over all files in a zip archive, use function + foldl/3.

+ + +

To return a list of the files in a zip archive, use function + list_dir/1 or + list_dir/2. They are + also available as table/1,2, to resemble the + erl_tar module.

+ + +

To print a list of files to the Erlang shell, use function + t/1 or + tt/1.

+ + +

Sometimes it is desirable to open a zip archive, and to + unzip files from it file by file, without having to reopen the + archive. This can be done by functions + zip_open/1,2, + zip_get/1,2, + zip_list_dir/1, and + zip_close/1.

+ +
- LIMITATIONS -

Zip64 archives are not currently supported.

-

Password-protected and encrypted archives are not currently - supported

-

Only the DEFLATE (zlib-compression) and the STORE (uncompressed - data) zip methods are supported.

-

The size of the archive is limited to 2 G-byte (32 bits).

-

Comments for individual files is not supported when creating zip - archives. The zip archive comment for the whole zip archive is - supported.

-

There is currently no support for altering an existing zip archive. - To add or remove a file from an archive, the whole archive must be - recreated.

+ Limitations + + +

Zip64 archives are not supported.

+ + +

Password-protected and encrypted archives are not supported.

+ + +

Only the DEFLATE (zlib-compression) and the STORE (uncompressed + data) zip methods are supported.

+ + +

The archive size is limited to 2 GB (32 bits).

+ + +

Comments for individual files are not supported when creating zip + archives. The zip archive comment for the whole zip archive is + supported.

+ + +

Changing a zip archive is not supported. + To add or remove a file from an archive, the whole archive must be + recreated.

+ +
-

The record zip_comment just contains the archive comment for - a zip archive

+

The record zip_comment only contains the archive comment for + a zip archive.

 -

The record zip_file contains the following fields.

+

The record zip_file contains the following fields:

name -

the name of the file

+

The filename

 info -

file info as in - file:read_file_info/1

+

File information as in + + file:read_file_info/1 + in Kernel

 comment -

the comment for the file in the zip archive

+

The comment for the file in the zip archive

 offset -

the offset of the file in the zip archive (used internally)

+

The file offset in the zip archive (used internally)

 comp_size -

the compressed size of the file (the uncompressed size is found - in info)

+

The size of the compressed file (the size of the uncompressed + file is found in info)

 @@ -133,224 +165,44 @@ -

These options are described in create/3.

+

These options are described in + create/3.

 - + -

As returned by zip_open/2.

+

As returned by + zip_open/2.

 + - - - - - - Create a zip archive with options - -

The zip function creates a - zip archive containing the files specified in FileList.

-

As synonyms, the functions create/2 and create/3 - are provided, to make it resemble the erl_tar module.

-

The file-list is a list of files, with paths relative to the - current directory, they will be stored with this path in the - archive. Files may also be specified with data in binaries, - to create an archive directly from data.

-

Files will be compressed using the DEFLATE compression, as - described in the Appnote.txt file. However, files will be - stored without compression if they already are compressed. - The zip/2 and zip/3 functions check the file extension - to see whether the file should be stored without compression. - Files with the following extensions are not compressed: - .Z, .zip, .zoo, .arc, .lzh, - .arj.

-

It is possible to override the default behavior and - explicitly control what types of files that should be - compressed by using the {compress, What} and - {uncompress, What} options. It is possible to have - several compress and uncompress options. In - order to trigger compression of a file, its extension must - match with the - compress condition and must not match the - uncompress condition. For example if compress is - set to ["gif", "jpg"] and uncompress is set to - ["jpg"], only files with "gif" as extension will - be compressed. No other files will be compressed.

- -

The following options are available:

- - cooked - -

By default, the open/2 function will open the - zip file in raw mode, which is faster but does not allow - a remote (erlang) file server to be used. Adding cooked - to the mode list will override the default and open the zip file - without the raw option. The same goes for the files - added.

- - verbose - -

Print an informational message about each file - being added.

- - memory - -

The output will not be to a file, but instead as a tuple - {FileName, binary()}. The binary will be a full zip - archive with header, and can be extracted with for instance - unzip/2.

- - {comment, Comment} - -

Add a comment to the zip-archive.

- - {cwd, CWD} - -

Use the given directory as current directory, it will be - prepended to file names when adding them, although it will not - be in the zip-archive. (Acting like a file:set_cwd/1, but - without changing the global cwd property.)

- - {compress, What} - -

Controls what types of files will be - compressed. It is by default set to all. The - following values of What are allowed:

- - all -

means that all files will be compressed (as long - as they pass the uncompress condition).

 - [Extension] -

means that only files with exactly these extensions - will be compressed.

 - {add,[Extension]} -

adds these extensions to the list of compress - extensions.

 - {del,[Extension]} -

deletes these extensions from the list of compress - extensions.

 - - - {uncompress, What} - -

Controls what types of files will be uncompressed. It is by - default set to [".Z", ".zip", ".zoo", ".arc", ".lzh", ".arj"]. - The following values of What are allowed:

- - all -

means that no files will be compressed.

 - [Extension] -

means that files with these extensions will be - uncompressed.

 - {add,[Extension]} -

adds these extensions to the list of uncompress - extensions.

 - {del,[Extension]} -

deletes these extensions from the list of uncompress - extensions.

 - - - - - - - - - - - Extract files from a zip archive - -

The unzip/1 function extracts - all files from a zip archive. - The unzip/2 function provides - options to extract some files, and more.

-

If the Archive argument is given as a binary, - the contents of the binary is assumed to be a zip archive, - otherwise it should be a filename.

-

The following options are available:

- - {file_list, FileList} - -

By default, all files will be extracted from the zip - archive. With the {file_list, FileList} option, - the unzip/2 function will only extract the files - whose names are included in FileList. The full - paths, including the names of all sub directories within - the zip archive, must be specified.

- - cooked - -

By default, the open/2 function will open the - zip file in raw mode, which is faster but does not allow - a remote (erlang) file server to be used. Adding cooked - to the mode list will override the default and open the zip file - without the raw option. The same goes for the files - extracted.

- - keep_old_files - -

By default, all existing files with the same name as file in - the zip archive will be overwritten. With the keep_old_files - option, the unzip/2 function will not overwrite any existing - files. Note that even with the memory option given, which - means that no files will be overwritten, files existing will be - excluded from the result.

- - verbose - -

Print an informational message as each file is being - extracted.

- - memory - -

Instead of extracting to the current directory, the - memory option will give the result as a list of tuples - {Filename, Binary}, where Binary is a binary - containing the extracted data of the file named Filename - in the zip archive.

- - {cwd, CWD} - -

Use the given directory as current directory, it will be - prepended to file names when extracting them from the - zip-archive. (Acting like a file:set_cwd/1, but without - changing the global cwd property.)

- - - - - Fold a function over all files in a zip archive + Fold a function over all files in a zip archive. -

The foldl/3 function - calls Fun(FileInArchive, GetInfo - , GetBin, AccIn) on - successive files in the Archive, starting with - AccIn - == Acc0. FileInArchive is - the name that the file - has in the archive. GetInfo is a fun that - returns info - about the the file. GetBin returns the contents - of the - file. Both GetInfo and GetBin - must be called - within the Fun. Their behavior is undefined if - they are - called outside the context of the Fun. - The Fun - must return a new accumulator which is passed to the next - call. foldl/3 returns the final value of the - accumulator. Acc0 is returned if the archive is - empty. It is not necessary to iterate over all files in the - archive. The iteration may be ended prematurely in a - controlled manner by throwing an exception.

- -

For example:

+

Calls Fun(FileInArchive, GetInfo + , GetBin, AccIn) on + successive files in the Archive, starting with + AccIn == Acc0.

+

FileInArchive is the name that the file + has in the archive.

+

GetInfo is a fun that returns information + about the file.

+

GetBin returns the file contents.

+

Both GetInfo and GetBin + must be called within the Fun. Their behavior is + undefined if they are called outside the context of + Fun.

+

The Fun must return a new accumulator, which is + passed to the next call. foldl/3 returns the final accumulator + value. Acc0 is returned if the archive is + empty. It is not necessary to iterate over all files in the archive. + The iteration can be ended prematurely in a controlled manner + by throwing an exception.

+

Example:

 > Name = "dummy.zip".
 "dummy.zip"
@@ -380,97 +232,300 @@
+ - Retrieve the name of all files in a zip archive + Retrieve the name of all files in a zip archive. -

The list_dir/1 - function retrieves the names of all files in the zip archive - Archive. The - list_dir/2 function provides options.

-

As synonyms, the functions table/2 and table/3 - are provided, to make it resemble the erl_tar module.

+

list_dir/1 retrieves all filenames in the zip archive + Archive.

+

list_dir/2 provides options.

+

table/1 and table/2 are provided as synonyms + to resemble the + erl_tar module.

The result value is the tuple {ok, List}, where List contains the zip archive comment as the first element.

-

The following options are available:

+

One option is available:

cooked -

By default, the open/2 function will open the - zip file in raw mode, which is faster but does not allow - a remote (erlang) file server to be used. Adding cooked - to the mode list will override the default and open the zip file - without the raw option.

+

By default, this function opens the zip file in + raw mode, which is faster but does not allow a remote + (Erlang) file server to be used. Adding cooked to the + mode list overrides the default + and opens the zip file without option raw.

 + - Print the name of each file in a zip archive + Print the name of each file in a zip archive. -

The t/1 function prints the names - of all files in the zip archive Archive to the Erlang shell. - (Similar to "tar t".)

+

Prints all filenames in the zip archive Archive + to the Erlang shell. (Similar to tar t.)

 + - Print name and information for each file in a zip archive + Print name and information for each file in a zip archive. + -

The tt/1 function prints names and - information about all files in the zip archive Archive to - the Erlang shell. (Similar to "tar tv".)

+

Prints filenames and information about all files in the zip archive + Archive to the Erlang shell. + (Similar to tar tv.)

 + - - - Open an archive and return a handle to it + + + + + Extract files from a zip archive. -

The zip_open function - opens a - zip archive, and reads and saves its directory. This - means that subsequently reading files from the archive will be - faster than unzipping files one at a time with unzip.

-

The archive must be closed with zip_close/1.

-

The ZipHandle will be closed if the - process which originally opened the archive dies.

+

unzip/1 extracts all files from a zip archive.

+

unzip/2 provides options to extract some files, and more.

+

extract/1 and extract/2 are provided as synonyms + to resemble module + erl_tar.

+

If argument Archive is specified as a binary, + the contents of the binary is assumed to be a zip archive, + otherwise a filename.

+

Options:

+ + {file_list, FileList} + +

By default, all files are extracted from the zip + archive. With option {file_list, FileList}, + function unzip/2 only extracts the files + whose names are included in FileList. The full + paths, including the names of all subdirectories within + the zip archive, must be specified.

+ + cooked + +

By default, this function opens the + zip file in raw mode, which is faster but does not allow + a remote (Erlang) file server to be used. Adding cooked + to the mode list overrides the default and opens the zip file + without option raw. The same applies for the files + extracted.

+ + keep_old_files + +

By default, all files with the same name as files in + the zip archive are overwritten. With option keep_old_files + set, function unzip/2 does not overwrite existing files. + Notice that + even with option memory specified, which + means that no files are overwritten, existing files are + excluded from the result.

+ + verbose + +

Prints an informational message for each extracted file.

+ + memory + +

Instead of extracting to the current directory, + the result is given as a list of tuples + {Filename, Binary}, where Binary is a binary + containing the extracted data of file Filename + in the zip archive.

+ + {cwd, CWD} + +

Uses the specified directory as current directory. It is + prepended to filenames when extracting them from the + zip archive. (Acting like + + file:set_cwd/1 in Kernel, + but without changing the global cwd property.)

+ + + - - Return a table of files in open zip archive + + + + + Create a zip archive with options. -

The - zip_list_dir/1 function - returns the file list of an open zip archive. The first returned - element is the zip archive comment.

+

Creates a zip archive containing the files specified in + FileList.

+

create/2 and create/3 are provided as synonyms + to resemble module + erl_tar.

+

FileList is a list of files, with paths relative + to the current directory, which are stored with this path in the + archive. Files can also be specified with data in binaries + to create an archive directly from data.

+

Files are compressed using the DEFLATE compression, as + described in the "Appnote.txt" file. However, files are + stored without compression if they are already compressed. + zip/2 and zip/3 check the file extension + to determine if the file is to be stored without compression. + Files with the following extensions are not compressed: + .Z, .zip, .zoo, .arc, .lzh, + .arj.

+

It is possible to override the default behavior and control + what types of files that are to be compressed by using options + {compress, What} and + {uncompress, What}. It is also possible to use + many compress and uncompress options.

+

To trigger file compression, its extension must match with the + compress condition and must not match the + uncompress condition. For example, if compress is + set to ["gif", "jpg"] and uncompress is set to + ["jpg"], only files with extension "gif" are + compressed.

+ +

Options:

+ + cooked + +

By default, this function opens the + zip file in mode raw, which is faster but does not allow + a remote (Erlang) file server to be used. Adding cooked + to the mode list overrides the default and opens the zip file + without the raw option. The same applies for the files + added.

+ + verbose + +

Prints an informational message about each added file.

+ + memory + +

The output is not to a file, but instead as a tuple + {FileName, binary()}. The binary is a full zip + archive with header and can be extracted with, for example, + unzip/2.

+ + {comment, Comment} + +

Adds a comment to the zip archive.

+ + {cwd, CWD} + +

Uses the specified directory as current work directory + (cwd). This is prepended to filenames when adding them, + although not in the zip archive (acting like + + file:set_cwd/1 in Kernel, but without + changing the global cwd property.).

+ + {compress, What} + +

Controls what types of files to be compressed. Defaults to + all. The following values of What are allowed:

+ + all + +

All files are compressed (as long + as they pass the uncompress condition).

+ + [Extension] + +

Only files with exactly these extensions + are compressed.

+ + {add,[Extension]} + +

Adds these extensions to the list of compress + extensions.

+ + {del,[Extension]} + +

Deletes these extensions from the list of compress + extensions.

+ + + + {uncompress, What} + +

Controls what types of files to be uncompressed. Defaults to + [".Z", ".zip", ".zoo", ".arc", ".lzh", ".arj"]. + The following values of What are allowed:

+ + all + +

No files are compressed.

+ + [Extension] + +

Files with these extensions are uncompressed.

+ + {add,[Extension]} + +

Adds these extensions to the list of uncompress + extensions.

+ + {del,[Extension]} + +

Deletes these extensions from the list of uncompress + extensions.

+ + + + + + + + Close an open archive. + +

Closes a zip archive, previously opened with + zip_open/1,2. + All resources are closed, and the handle is not to be used after + closing.

+ + + - Extract files from an open archive + Extract files from an open archive. -

The zip_get function extracts - one or all files from an open archive.

-

The files will be unzipped to memory or to file, depending on - the options given to the zip_open function when the - archive was opened.

+

Extracts one or all files from an open archive.

+

The files are unzipped to memory or to file, depending on + the options specified to function + zip_open/1,2 + when opening the archive.

 + - - Close an open archive + + Return a table of files in open zip archive. -

The zip_close/1 function - closes a zip archive, previously opened with zip_open. All - resources are closed, and the handle should not be used after - closing.

+

Returns the file list of an open zip archive. The first returned + element is the zip archive comment.

+ + + + + + + Open an archive and return a handle to it. + +

Opens a zip archive, and reads and saves its directory. This + means that later reading files from the archive is + faster than unzipping files one at a time with + unzip/1,2.

+

The archive must be closed with + zip_close/1.

+

The ZipHandle is closed if the + process that originally opened the archive dies.

 -- cgit v1.2.3 From 6e51c6d19612d03abc81b86bb70b8d7da678ce5d Mon Sep 17 00:00:00 2001 From: Erlang/OTP Date: Tue, 21 Jun 2016 15:12:41 +0200 Subject: Prepare release --- lib/stdlib/doc/src/notes.xml | 314 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 314 insertions(+) (limited to 'lib/stdlib/doc') diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml index 87f5335723..ad2599c5a0 100644 --- a/lib/stdlib/doc/src/notes.xml +++ b/lib/stdlib/doc/src/notes.xml @@ -31,6 +31,320 @@

This document describes the changes made to the STDLIB application.

+
STDLIB 3.0 + +
Fixed Bugs and Malfunctions + + +

Fix a race bug affecting dets:open_file/2. +

+

+ Own Id: OTP-13260 Aux Id: seq13002

+ + +

Don't search for non-existing Map keys twice

+

For maps:get/2,3 and maps:find/2, + searching for an immediate key, e.g. an atom, in a small + map, the search was performed twice if the key did not + exist.

+

+ Own Id: OTP-13459

+ + +

+ Avoid stray corner-case math errors on Solaris, e.g. an + error is thrown on underflows in exp() and pow() when it + shouldn't be.

+

+ Own Id: OTP-13531

+ + +

Fix linting of map key variables

+

Map keys cannot be unbound and then used in parallel + matching.

+

Example: #{ K := V } = #{ k := K } = M. This + is illegal if 'K' is not bound.

+

+ Own Id: OTP-13534 Aux Id: ERL-135

+ + +

+ Fixed a bug in re on openbsd where sometimes re:run would + return an incorrect result.

+

+ Own Id: OTP-13602

+ + +

+ To avoid potential timer bottleneck on supervisor + restart, timer server is no longer used when the + supervisor is unable to restart a child.

+

+ Own Id: OTP-13618 Aux Id: PR-1001

+ + +

The Erlang code preprocessor (epp) can handle + file names spanning over many tokens. Example: + -include("a" "file" "name")..

+

+ Own Id: OTP-13662 Aux Id: seq13136

+ + +
+ + +
Improvements and New Features + + +

The types of The Abstract Format in the + erl_parse module have been refined.

+

+ Own Id: OTP-10292

+ + +

Undocumented syntax for function specifications, + -spec F/A :: Domain -> Range, has been removed + (without deprecation).

Using the + is_subtype(V, T) syntax for constraints (in + function specifications) is no longer documented, and the + newer syntax V :: T should be used instead. The + Erlang Parser still recognizes the is_subtype + syntax, and will continue to do so for some time.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-11879

+ + +

The 'random' module has been deprecated. Use + the 'rand' module instead.

+

+ Own Id: OTP-12502 Aux Id: OTP-12501

+ + +

Background: In record fields with a type declaration + but without an initializer, the Erlang parser inserted + automatically the singleton type 'undefined' to + the list of declared types, if that value was not present + there. That is, the record declaration:

+

+ -record(rec, {f1 :: float(), f2 = 42 :: integer(), f3 :: + some_mod:some_typ()}).

+

was translated by the parser to:

+

+ -record(rec, {f1 :: float() | 'undefined', f2 = 42 :: + integer(), f3 :: some_mod:some_typ() | 'undefined'}).

+

The rationale for this was that creation of a "dummy" + #rec{} record should not result in a warning from + dialyzer that, for example, the implicit initialization + of the #rec.f1 field violates its type + declaration.

+

Problems: This seemingly innocent action has some + unforeseen consequences.

+

For starters, there is no way for programmers to + declare that e.g. only floats make sense for the + f1 field of #rec{} records when there is no + "obvious" default initializer for this field. (This also + affects tools like PropEr that use these declarations + produced by the Erlang parser to generate random + instances of records for testing purposes.)

+

It also means that dialyzer does not warn if e.g. an + is_atom/1 test or something more exotic like an + atom_to_list/1 call is performed on the value of + the f1 field.

+

Similarly, there is no way to extend dialyzer to warn + if it finds record constructions where f1 is not + initialized to some float.

+

Last but not least, it is semantically problematic + when the type of the field is an opaque type: creating a + union of an opaque and a structured type is very + problematic for analysis because it fundamentally breaks + the opacity of the term at that point.

+

Change: To solve these problems the parser will not + automatically insert the 'undefined' value + anymore; instead the user has the option to choose the + places where this value makes sense (for the field) and + where it does not and insert the | 'undefined' + there manually.

+

Consequences of this change: This change means that + dialyzer will issue a warning for all places where + records with uninitialized fields are created and those + fields have a declared type that is incompatible with + 'undefined' (e.g. float()). This warning + can be suppressed easily by adding | 'undefined' + to the type of this field. This also adds documentation + that the user really intends to create records where this + field is uninitialized.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-12719

+ + +

Remove deprecated functions in the modules + erl_scan and erl_parse.

+

+ Own Id: OTP-12861

+ + +

The pre-processor can now expand the ?FUNCTION_NAME + and ?FUNCTION_ARITY macros.

+

+ Own Id: OTP-13059

+ + +

A new behaviour gen_statem has been + implemented. It has been thoroughly reviewed, is stable + enough to be used by at least two heavy OTP applications, + and is here to stay. But depending on user feedback, we + do not expect but might find it necessary to make minor + not backwards compatible changes into OTP-20.0, so its + state can be designated as "not quite experimental"... +

The gen_statem behaviour is intended to + replace gen_fsm for new code. It has the same + features and add some really useful:

State code is gathered + The state can be any term Events can + be postponed Events can be self + generated A reply can be sent from a later + state There can be multiple sys traceable + replies

The callback model(s) for + gen_statem differs from the one for + gen_fsm, but it is still fairly easy to rewrite + from gen_fsm to gen_statem.

+

+ Own Id: OTP-13065 Aux Id: PR-960

+ + +

+ Optimize binary:split/2 and binary:split/3 with native + BIF implementation.

+

+ Own Id: OTP-13082

+ + +

Background: The types of record fields have since R12B + been put in a separate form by epp:parse_file(), + leaving the record declaration form untyped. The separate + form, however, does not follow the syntax of type + declarations, and parse transforms inspecting + -type() attributes need to know about the special + syntax. Since the compiler stores the return value of + epp:parse_file() as debug information in the + abstract code chunk ("Abst" or + abstract_code), tools too need to know about the + special syntax, if they inspect -type() attributes + in abstract code.

+

Change: No separate type form is created by + epp:parse_file(), but the type information is kept + in the record fields. This means that all parse + transforms and all tools inspecting -record() + declarations need to recognize {typed_record_field, + Field, Type}.

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-13148

+ + +

+ Unsized fields of the type bytes in binary + generators are now forbidden. (The other ways of writing + unsized fields, such as binary, are already + forbidden.)

+

+ Own Id: OTP-13152

+ + +

The type map() is built-in, and cannot be + redefined.

+

+ Own Id: OTP-13153

+ + +

Let dets:open_file() exit with a badarg + message if given a raw file name (a binary).

+

+ Own Id: OTP-13229 Aux Id: ERL-55

+ + +

Add filename:basedir/2,3

basedir + returns suitable path(s) for 'user_cache', 'user_config', + 'user_data', 'user_log', 'site_config' and 'site_data'. + On linux and linux like systems the paths will respect + the XDG environment variables.

+

+ Own Id: OTP-13392

+ + +

There are new preprocessor directives + -error(Term) and -warning(Term) to cause a + compilation error or a compilation warning, + respectively.

+

+ Own Id: OTP-13476

+ + +

+ Optimize '++' operator and lists:append/2 + by using a single pass to build a new list while checking + for properness.

+

+ Own Id: OTP-13487

+ + +

+ Add maps:update_with/3,4 and maps:take/2

+

+ Own Id: OTP-13522 Aux Id: PR-1025

+ + +

lists:join/2 has been added. Similar to + string:join/2 but works with arbitrary lists.

+

+ Own Id: OTP-13523

+ + +

Obfuscate asserts to make Dialyzer shut up.

+

+ Own Id: OTP-13524 Aux Id: PR-1002

+ + +

+ Supervisors now explicitly add their callback module in + the return from sys:get_status/1,2. This is to simplify + custom supervisor implementations. The Misc part of the + return value from sys:get_status/1,2 for a supervisor is + now:

+

+ [{data, [{"State", + State}]},{supervisor,[{"Callback",Module}]}]

+

+ *** POTENTIAL INCOMPATIBILITY ***

+

+ Own Id: OTP-13619 Aux Id: PR-1000

+ + +

+ Relax translation of initial calls in proc_lib, + i.e. remove the restriction to only do the translation + for gen_server and gen_fsm. This enables + user defined gen based generic callback modules to + be displayed nicely in c:i() and observer.

+

+ Own Id: OTP-13623

+ + +

The function queue:lait/1 (misspelling of + liat/1) is now deprecated.

+

+ Own Id: OTP-13658

+ + +
+ +
+
STDLIB 2.8
Fixed Bugs and Malfunctions -- cgit v1.2.3