diff options
author | Hans Bolinder <[email protected]> | 2012-08-23 09:27:05 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2012-08-23 09:27:05 +0200 |
commit | f842a1dd3c7860be793a2bbc6c4d530b4dbb410e (patch) | |
tree | fb9638b48a83a1d0a731c564102a6479e33b69ce /lib | |
parent | 5048fe4687356a0478f1e8b2254d4f0675b79087 (diff) | |
parent | b429cb093819836bbeb2c071898b6dfdb2dcdada (diff) | |
download | otp-f842a1dd3c7860be793a2bbc6c4d530b4dbb410e.tar.gz otp-f842a1dd3c7860be793a2bbc6c4d530b4dbb410e.tar.bz2 otp-f842a1dd3c7860be793a2bbc6c4d530b4dbb410e.zip |
Merge branch 'hb/edoc/union_paren/OTP-10195'
* hb/edoc/union_paren/OTP-10195:
Fix an issue with parentheses and separate values of union types
Diffstat (limited to 'lib')
-rw-r--r-- | lib/edoc/src/edoc_parser.yrl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/edoc/src/edoc_parser.yrl b/lib/edoc/src/edoc_parser.yrl index 4d6428f75b..d7c1b1c045 100644 --- a/lib/edoc/src/edoc_parser.yrl +++ b/lib/edoc/src/edoc_parser.yrl @@ -100,9 +100,7 @@ ptype -> '[' utype ',' '...' ']' : #t_nonempty_list{type = '$2'}. ptype -> utype_list: if length(element(1, '$1')) == 1 -> %% there must be exactly one utype in the list - hd(element(1, '$1')); - %% Replace last line when releasing next major release: - %% #t_paren{type = hd(element(1, '$1'))}; + #t_paren{type = hd(element(1, '$1'))}; length(element(1, '$1')) == 0 -> return_error(element(2, '$1'), "syntax error before: ')'"); true -> |