diff options
| author | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2012-02-09 13:29:24 +0100 |
| commit | 0b45f106f19756bcef0ee51a8f5d4147dc253bcb (patch) | |
| tree | 442a24fe05a9d2e998bd68e0060c7db77afb2d82 /lib/stdlib/doc/src | |
| parent | 4408f9f30a48fca6d51ecef6ba92ef2978f59e92 (diff) | |
| parent | 8ddf2aa53544e01b26d7fd55ef68f80f4af6307d (diff) | |
| download | otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.gz otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.tar.bz2 otp-0b45f106f19756bcef0ee51a8f5d4147dc253bcb.zip | |
Merge branch 'maint'
* maint:
Update primary bootstrap
HiPE: Remove support for is_constant/1
erl_lint: Remove handling of constant/1
erl_bif_types: Remove type for is_constant/1
erl_eval: Remove support for is_constant/1
Remove support for is_constant/1 in ms_transform
Remove references to is_constant/1 from the match spec documentation
Conflicts:
lib/hipe/cerl/erl_bif_types.erl
Also re-instate the type for erlang:is_boolean/1 which was
accidentally omitted in the master branch.
Diffstat (limited to 'lib/stdlib/doc/src')
| -rw-r--r-- | lib/stdlib/doc/src/ms_transform.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/stdlib/doc/src/ms_transform.xml b/lib/stdlib/doc/src/ms_transform.xml index f81f8bda96..ad5f8bd5ac 100644 --- a/lib/stdlib/doc/src/ms_transform.xml +++ b/lib/stdlib/doc/src/ms_transform.xml @@ -308,7 +308,7 @@ ets:select(emp_tab, ets:fun2ms( Erlang code. Also arithmetics is allowed, as well as ordinary guard bif's. Here's a list of bif's and expressions:</p> <list type="bulleted"> - <item>The type tests: is_atom, is_constant, is_float, is_integer, + <item>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</item> <item>The boolean operators: not, and, or, andalso, orelse </item> @@ -318,7 +318,7 @@ ets:select(emp_tab, ets:fun2ms( <item>The guard bif's: abs, element, hd, length, node, round, size, tl, trunc, self</item> <item>The obsolete type test (only in guards): - atom, constant, float, integer, + atom, float, integer, list, number, pid, port, reference, tuple, binary, function, record</item> </list> |