diff options
| author | Hans Bolinder <[email protected]> | 2018-08-27 15:59:23 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2018-08-27 15:59:23 +0200 |
| commit | 0960ef90d717f5851037903b81e364fae1a43cdf (patch) | |
| tree | 237be5fd214d254b874db84841c38ab554bb8aa5 /system | |
| parent | 4d1422e1d5423725bd5e72e1b1ac1d8c0804ea3a (diff) | |
| parent | b47fa83ff514feafa3debe841f2697c29fa2ca49 (diff) | |
| download | otp-0960ef90d717f5851037903b81e364fae1a43cdf.tar.gz otp-0960ef90d717f5851037903b81e364fae1a43cdf.tar.bz2 otp-0960ef90d717f5851037903b81e364fae1a43cdf.zip | |
Merge branch 'maint'
* maint:
Document allowed integer ops in types
stdlib: Fix specs of filename:basedir/2,2
Diffstat (limited to 'system')
| -rw-r--r-- | system/doc/reference_manual/typespec.xml | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/system/doc/reference_manual/typespec.xml b/system/doc/reference_manual/typespec.xml index f6a19397c3..a8b7393cc8 100644 --- a/system/doc/reference_manual/typespec.xml +++ b/system/doc/reference_manual/typespec.xml @@ -113,8 +113,8 @@ | Erlang_Atom %% 'foo', 'bar', ... Bitstring :: <<>> - | <<_:M>> %% M is a positive integer - | <<_:_*N>> %% N is a positive integer + | <<_:M>> %% M is an Integer_Value that evaluates to a positive integer + | <<_:_*N>> %% N is an Integer_Value that evaluates to a positive integer | <<_:M, _:_*N>> Fun :: fun() %% any function @@ -123,8 +123,17 @@ | fun((TList) -> Type) Integer :: integer() - | Erlang_Integer %% ..., -1, 0, 1, ... 42 ... - | Erlang_Integer..Erlang_Integer %% specifies an integer range + | Integer_Value + | Integer_Value..Integer_Value %% specifies an integer range + + Integer_Value :: Erlang_Integer %% ..., -1, 0, 1, ... 42 ... + | Erlang_Character %% $a, $b ... + | Integer_Value BinaryOp Integer_Value + | UnaryOp Integer_Value + + BinaryOp :: '*' | 'div' | 'rem' | 'band' | '+' | '-' | 'bor' | 'bxor' | 'bsl' | 'bsr' + + UnaryOp :: '+' | '-' | 'bnot' List :: list(Type) %% Proper list ([]-terminated) | maybe_improper_list(Type1, Type2) %% Type1=contents, Type2=termination @@ -151,8 +160,13 @@ Union :: Type1 | Type2 ]]></pre> <p> + Integer values are either integer or character literals or expressions + consisting of possibily nested unary or binary operations that evaluate to + an integer. Such expressions can also be used in bit strings and ranges. + </p> + <p> The general form of bit strings is <c><<_:M, _:_*N>></c>, - where <c>M</c> and <c>N</c> are positive integers. It denotes a + where <c>M</c> and <c>N</c> must evaluate to positive integers. It denotes a bit string that is <c>M + (k*N)</c> bits long (that is, a bit string that starts with <c>M</c> bits and continues with <c>k</c> segments of <c>N</c> bits each, where <c>k</c> is also a positive integer). |