diff options
| author | Hans Bolinder <[email protected]> | 2015-12-07 10:10:20 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2015-12-07 10:10:20 +0100 |
| commit | 6436c0d210b46b949f5e2de7ad328d3081eb3fa4 (patch) | |
| tree | f505e62aac5bdc06455c5562c6336ec9b0e37540 /system | |
| parent | 4dd436b2d887517d50386372946a495aed698663 (diff) | |
| parent | 572bea9807504670b1eec4aab6b8ac833cd42b26 (diff) | |
| download | otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.gz otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.tar.bz2 otp-6436c0d210b46b949f5e2de7ad328d3081eb3fa4.zip | |
Merge branch 'maint'
* maint:
doc: Fix some minor issues in Types and Function Specifications
erts: Remove CDATA from The Abstract Format document
erts: Correct the types section in The Abstract Format document
stdlib: Correct pretty-printing of map types
stdlib: Pretty-print constraints as 'V :: T'
Conflicts:
erts/doc/src/absform.xml
Diffstat (limited to 'system')
| -rw-r--r-- | system/doc/reference_manual/typespec.xml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml index 7891f3a6b9..22627058c1 100644 --- a/system/doc/reference_manual/typespec.xml +++ b/system/doc/reference_manual/typespec.xml @@ -197,6 +197,9 @@ <cell><c>char()</c></cell><cell><c>0..16#10ffff</c></cell> </row> <row> + <cell><c>nil()</c></cell><cell><c>[]</c></cell> + </row> + <row> <cell><c>number()</c></cell><cell><c>integer() | float()</c></cell> </row> <row> @@ -312,7 +315,7 @@ <p> As seen, the basic syntax of a type is an atom followed by closed parentheses. New types are declared using <c>-type</c> and <c>-opaque</c> - compiler attributes as in the following: + attributes as in the following: </p> <pre> -type my_struct_type() :: Type. @@ -435,8 +438,8 @@ <section> <title>Specifications for Functions</title> <p> - A specification (or contract) for a function is given using the new - compiler attribute <c>-spec</c>. The general format is as follows: + A specification (or contract) for a function is given using the + <c>-spec</c> attribute. The general format is as follows: </p> <pre> -spec Module:Function(ArgType1, ..., ArgTypeN) -> ReturnType.</pre> @@ -451,7 +454,7 @@ explicitly) import these functions. </p> <p> - Within a given module, the following shorthand suffice in most cases: + Within a given module, the following shorthand suffices in most cases: </p> <pre> -spec Function(ArgType1, ..., ArgTypeN) -> ReturnType.</pre> |