aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-03-27 14:34:55 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-04-01 11:21:22 +0200
commit59ddad4368adfe8992f3bb5c7a1c9a06204ca7fe (patch)
tree61bdcd34a1bf7dcc82655d4c38fbd4f34c4cef1f
parentf140825e037714166501615864d5e5efd4557bd3 (diff)
downloadotp-59ddad4368adfe8992f3bb5c7a1c9a06204ca7fe.tar.gz
otp-59ddad4368adfe8992f3bb5c7a1c9a06204ca7fe.tar.bz2
otp-59ddad4368adfe8992f3bb5c7a1c9a06204ca7fe.zip
doc: Mention map expressions and map guards
-rw-r--r--system/doc/reference_manual/expressions.xml8
1 files changed, 7 insertions, 1 deletions
diff --git a/system/doc/reference_manual/expressions.xml b/system/doc/reference_manual/expressions.xml
index e9de3e006e..37208710fe 100644
--- a/system/doc/reference_manual/expressions.xml
+++ b/system/doc/reference_manual/expressions.xml
@@ -56,7 +56,7 @@ Expr1 + Expr2</code>
<marker id="term"></marker>
<title>Terms</title>
<p>The simplest form of expression is a term, that is an integer,
- float, atom, string, list or tuple.
+ float, atom, string, list, map or tuple.
The return value is the term itself.</p>
</section>
@@ -1348,6 +1348,9 @@ end</pre>
<cell align="left" valign="middle"><c>is_list/1</c></cell>
</row>
<row>
+ <cell align="left" valign="middle"><c>is_map/1</c></cell>
+ </row>
+ <row>
<cell align="left" valign="middle"><c>is_number/1</c></cell>
</row>
<row>
@@ -1398,6 +1401,9 @@ end</pre>
<cell align="left" valign="middle"><c>length(List)</c></cell>
</row>
<row>
+ <cell align="left" valign="middle"><c>map_size(Map)</c></cell>
+ </row>
+ <row>
<cell align="left" valign="middle"><c>node()</c></cell>
</row>
<row>