aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2012-04-11 16:58:31 +0200
committerPatrik Nyblom <[email protected]>2012-04-17 16:13:10 +0200
commitce019aeedbe35ad9081ba7c6d0a0ffd1b035c572 (patch)
treed68e787b1949bfdb3a3001fac752224ce73e35b8 /lib
parent3985e56bfa82083b23978e06809b8ab0cf9d52d8 (diff)
downloadotp-ce019aeedbe35ad9081ba7c6d0a0ffd1b035c572.tar.gz
otp-ce019aeedbe35ad9081ba7c6d0a0ffd1b035c572.tar.bz2
otp-ce019aeedbe35ad9081ba7c6d0a0ffd1b035c572.zip
Correct documentation, erl_bif_types and dialyzer tests
Diffstat (limited to 'lib')
-rw-r--r--lib/dialyzer/test/small_SUITE_data/results/port_info_test2
-rw-r--r--lib/hipe/cerl/erl_bif_types.erl1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/dialyzer/test/small_SUITE_data/results/port_info_test b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
index 8a4ce0fc66..863a3d61df 100644
--- a/lib/dialyzer/test/small_SUITE_data/results/port_info_test
+++ b/lib/dialyzer/test/small_SUITE_data/results/port_info_test
@@ -4,4 +4,4 @@ port_info_test.erl:14: The pattern {'registered_name', "42"} can never match the
port_info_test.erl:19: The pattern {'output', 42} can never match the type 'undefined' | {'connected',pid()}
port_info_test.erl:24: Guard test 'links' =:= Atom::'connected' can never succeed
port_info_test.erl:28: The pattern {'gazonk', _} can never match the type 'undefined' | {'connected' | 'id' | 'input' | 'links' | 'name' | 'os_pid' | 'output' | 'registered_name',atom() | pid() | [pid() | char()] | integer()}
-port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid',integer()}
+port_info_test.erl:32: The pattern {'os_pid', "42"} can never match the type 'undefined' | {'os_pid','undefined' | non_neg_integer()}
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index c443b911d6..5033cef8c5 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -1186,6 +1186,7 @@ type(erlang, port_info, 2, Xs) ->
['links'] -> t_tuple([Item, t_list(t_pid())]);
['name'] -> t_tuple([Item, t_string()]);
['output'] -> t_tuple([Item, t_integer()]);
+ ['os_pid'] -> t_tuple([Item, t_sup(t_non_neg_integer(),t_atom('undefined'))]);
['registered_name'] -> t_tuple([Item, t_atom()]);
List when is_list(List) ->
t_tuple([t_sup([t_atom(A) || A <- List]),