diff options
| author | Hans Bolinder <[email protected]> | 2019-01-16 09:55:08 +0100 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2019-01-16 09:55:08 +0100 |
| commit | 08fe72c08b3c715e09a12b1d288b5f502933e391 (patch) | |
| tree | fc8095a262a795feb3ad892b8868b2b1523f51ef /lib/stdlib/src | |
| parent | 100a2821a9c81e43eff47719330148771f9cd6e5 (diff) | |
| parent | 7000e101745cc028e4656eaaae3ea5a1a4498747 (diff) | |
| download | otp-08fe72c08b3c715e09a12b1d288b5f502933e391.tar.gz otp-08fe72c08b3c715e09a12b1d288b5f502933e391.tar.bz2 otp-08fe72c08b3c715e09a12b1d288b5f502933e391.zip | |
Merge branch 'maint'
* maint:
Fix erl_parse:af_constraint()
Fix erl_parse:af_fun_type()
Add literal character to erl_parse:abstract_type/0 type
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/erl_parse.yrl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl index 824a5dd3ce..4ad94f2507 100644 --- a/lib/stdlib/src/erl_parse.yrl +++ b/lib/stdlib/src/erl_parse.yrl @@ -872,7 +872,7 @@ Erlang code. -type af_fun_type() :: {'type', anno(), 'fun', []} | {'type', anno(), 'fun', [{'type', anno(), 'any'} | abstract_type()]} - | {'type', anno(), 'fun', af_function_type()}. + | af_function_type(). -type af_integer_range_type() :: {'type', anno(), 'range', [af_singleton_integer_type()]}. @@ -924,10 +924,11 @@ Erlang code. -type af_function_constraint() :: [af_constraint()]. -type af_constraint() :: {'type', anno(), 'constraint', - af_lit_atom('is_subtype'), - [af_type_variable() | abstract_type()]}. % [V, T] + [af_lit_atom('is_subtype') | + [af_type_variable() | abstract_type()]]}. % [IsSubtype, [V, T]] -type af_singleton_integer_type() :: af_integer() + | af_character() | af_unary_op(af_singleton_integer_type()) | af_binary_op(af_singleton_integer_type()). |