diff options
| author | Hans Bolinder <[email protected]> | 2010-05-31 11:48:19 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-05-31 11:48:19 +0000 |
| commit | 61ed122ce262cbaaf39738f4381b01de54fe86ca (patch) | |
| tree | a69f6f8d57c6c847ae1d9d166874ba7ca8c8b0f9 /lib/stdlib/src/erl_parse.yrl | |
| parent | ed3c6a7c5103424af34528f83fee2ac9ecc14c1b (diff) | |
| download | otp-61ed122ce262cbaaf39738f4381b01de54fe86ca.tar.gz otp-61ed122ce262cbaaf39738f4381b01de54fe86ca.tar.bz2 otp-61ed122ce262cbaaf39738f4381b01de54fe86ca.zip | |
OTP-8657 New Erlang scanner tokens: '..' and '...'
The Erlang scanner has been augmented with two new tokens: .. and ....
Diffstat (limited to 'lib/stdlib/src/erl_parse.yrl')
| -rw-r--r-- | lib/stdlib/src/erl_parse.yrl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl index 5287f55e59..141ee18afd 100644 --- a/lib/stdlib/src/erl_parse.yrl +++ b/lib/stdlib/src/erl_parse.yrl @@ -61,7 +61,7 @@ char integer float atom string var '++' '--' '==' '/=' '=<' '<' '>=' '>' '=:=' '=/=' '<=' '<<' '>>' -'!' '=' '::' +'!' '=' '::' '..' '...' 'spec' % helper dot. @@ -135,7 +135,7 @@ type -> atom ':' atom '(' top_types ')' : {remote_type, ?line('$1'), ['$1', '$3', '$5']}. type -> '[' ']' : {type, ?line('$1'), nil, []}. type -> '[' top_type ']' : {type, ?line('$1'), list, ['$2']}. -type -> '[' top_type ',' '.' '.' '.' ']' : {type, ?line('$1'), +type -> '[' top_type ',' '...' ']' : {type, ?line('$1'), nonempty_list, ['$2']}. type -> '{' '}' : {type, ?line('$1'), tuple, []}. type -> '{' top_types '}' : {type, ?line('$1'), tuple, '$2'}. @@ -144,8 +144,8 @@ type -> '#' atom '{' field_types '}' : {type, ?line('$1'), record, ['$2'|'$4']}. type -> binary_type : '$1'. type -> int_type : '$1'. -type -> int_type '.' '.' int_type : {type, ?line('$1'), range, - ['$1', '$4']}. +type -> int_type '..' int_type : {type, ?line('$1'), range, + ['$1', '$3']}. type -> 'fun' '(' ')' : {type, ?line('$1'), 'fun', []}. type -> 'fun' '(' fun_type_100 ')' : '$3'. @@ -153,9 +153,9 @@ int_type -> integer : '$1'. int_type -> '-' integer : abstract(-normalise('$2'), ?line('$2')). -fun_type_100 -> '(' '.' '.' '.' ')' '->' top_type +fun_type_100 -> '(' '...' ')' '->' top_type : {type, ?line('$1'), 'fun', - [{type, ?line('$1'), any}, '$7']}. + [{type, ?line('$1'), any}, '$5']}. fun_type_100 -> fun_type : '$1'. fun_type -> '(' ')' '->' top_type : {type, ?line('$1'), 'fun', |