aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiclas Axelsson <[email protected]>2010-12-21 15:37:22 +0100
committerNiclas Axelsson <[email protected]>2010-12-21 15:37:22 +0100
commit609e7ade98cb278f890e1d53a65356b4d9f12422 (patch)
tree9bb9356634d2451cde7c40fc98f48429e08247fb
parent4721cdba76cfa5d830413895a766394389712868 (diff)
parent67dd153f6aff8dab6dc8d938664696675b152c20 (diff)
downloadotp-609e7ade98cb278f890e1d53a65356b4d9f12422.tar.gz
otp-609e7ade98cb278f890e1d53a65356b4d9f12422.tar.bz2
otp-609e7ade98cb278f890e1d53a65356b4d9f12422.zip
Merge branch 'ja/fix-hipe-spec-ets-new' into dev
-rw-r--r--lib/hipe/cerl/erl_bif_types.erl11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/hipe/cerl/erl_bif_types.erl b/lib/hipe/cerl/erl_bif_types.erl
index f00821e450..fc80dde5b5 100644
--- a/lib/hipe/cerl/erl_bif_types.erl
+++ b/lib/hipe/cerl/erl_bif_types.erl
@@ -4942,10 +4942,11 @@ t_matchres() ->
%% From the 'ets' documentation
%%-----------------------------
%% Option = Type | Access | named_table | {keypos,Pos}
-%% | {heir,pid(),HeirData} | {heir,none}
-%% | {write_concurrency,boolean()}
+%% | {heir,pid(),HeirData} | {heir,none} | Tweaks
%% Type = set | ordered_set | bag | duplicate_bag
%% Access = public | protected | private
+%% Tweaks = {write_concurrency,boolean()}
+%% | {read_concurrency,boolean()} | compressed
%% Pos = integer()
%% HeirData = term()
t_ets_new_options() ->
@@ -4957,10 +4958,12 @@ t_ets_new_options() ->
t_atom('protected'),
t_atom('private'),
t_atom('named_table'),
+ t_tuple([t_atom('keypos'), t_integer()]),
t_tuple([t_atom('heir'), t_pid(), t_any()]),
t_tuple([t_atom('heir'), t_atom('none')]),
- t_tuple([t_atom('keypos'), t_integer()]),
- t_tuple([t_atom('write_concurrency'), t_boolean()])])).
+ t_tuple([t_atom('write_concurrency'), t_boolean()]),
+ t_tuple([t_atom('read_concurrency'), t_boolean()]),
+ t_atom('compressed')])).
t_ets_info_items() ->
t_sup([t_atom('fixed'),