diff options
author | Micael Karlberg <[email protected]> | 2011-04-18 15:14:36 +0200 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-04-18 15:14:36 +0200 |
commit | 5af51d9dcb60487e4fcc87353fe0e150c0ba9eed (patch) | |
tree | 95eb7adb0edba96eb3fc362a519fb1508cb477ec /lib/stdlib/src/erl_pp.erl | |
parent | d621b2cdd09adcc38bd6d482ae6c4f87e22cb1e8 (diff) | |
parent | 23906a01725f4494b8816c242926d08aeca0ef67 (diff) | |
download | otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.tar.gz otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.tar.bz2 otp-5af51d9dcb60487e4fcc87353fe0e150c0ba9eed.zip |
Merge branch 'dev' into bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119
Diffstat (limited to 'lib/stdlib/src/erl_pp.erl')
-rw-r--r-- | lib/stdlib/src/erl_pp.erl | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/stdlib/src/erl_pp.erl b/lib/stdlib/src/erl_pp.erl index df4a20b833..66c80a45cb 100644 --- a/lib/stdlib/src/erl_pp.erl +++ b/lib/stdlib/src/erl_pp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2010. All Rights Reserved. +%% Copyright Ericsson AB 1996-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -558,17 +558,11 @@ record_field({typed_record_field,{record_field,_,F,Val},Type}, Hook) -> Fl = lexpr(F, L, Hook), Vl = typed(lexpr(Val, R, Hook), Type), {list,[{cstep,[Fl,' ='],Vl}]}; -record_field({typed_record_field,Field,Type0}, Hook) -> - Type = remove_undefined(Type0), +record_field({typed_record_field,Field,Type}, Hook) -> typed(record_field(Field, Hook), Type); record_field({record_field,_,F}, Hook) -> lexpr(F, 0, Hook). -remove_undefined({type,L,union,[{atom,_,undefined}|T]}) -> - {type,L,union,T}; -remove_undefined(T) -> % cannot happen - T. - list({cons,_,H,T}, Es, Hook) -> list(T, [H|Es], Hook); list({nil,_}, Es, Hook) -> |