diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-04-01 11:49:56 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-04-01 11:49:56 +0200 |
| commit | ac1f6ffb557c5e702722e8b74f616c55cee2cee3 (patch) | |
| tree | 1ece5d726543c0cd49d005fdb16d36b11481c5e4 /lib/edoc | |
| parent | 3ccf4a77ee8ff4ca86ec2c46c2645607c094e800 (diff) | |
| parent | fbb05239aeccc400aa4e4a359a3fb81ef555e441 (diff) | |
| download | otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.tar.gz otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.tar.bz2 otp-ac1f6ffb557c5e702722e8b74f616c55cee2cee3.zip | |
Merge branch 'egil/maps-doc'
* egil/maps-doc:
doc: Add Maps example for sequential programming
doc: Mention map expressions and map guards
doc: Add maps to reference manual
edoc: Add map/0 as a new predefined type
doc: Descripe Maps type syntax
doc: Clearify language of user-defined attributes
doc: Document Maps datatype in reference manual
erts: Document map guard functions
erts: Fix is_map/1 spec
Diffstat (limited to 'lib/edoc')
| -rw-r--r-- | lib/edoc/src/edoc_types.erl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/edoc/src/edoc_types.erl b/lib/edoc/src/edoc_types.erl index af8f1230fb..d4e00d3ecd 100644 --- a/lib/edoc/src/edoc_types.erl +++ b/lib/edoc/src/edoc_types.erl @@ -66,6 +66,7 @@ is_new_predefined(boolean, 0) -> true; is_new_predefined(byte, 0) -> true; is_new_predefined(iodata, 0) -> true; is_new_predefined(iolist, 0) -> true; +is_new_predefined(map, 0) -> true; is_new_predefined(maybe_improper_list, 0) -> true; is_new_predefined(maybe_improper_list, 2) -> true; is_new_predefined(mfa, 0) -> true; |