diff options
| author | Erlang/OTP <[email protected]> | 2010-06-04 08:37:43 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-06-04 08:37:43 +0000 |
| commit | 02a3667376af950bb75523e32d2a974c4939261b (patch) | |
| tree | 26cfed89729c549e576035c2d7b3557183a4c20a /lib/compiler/src/rec_env.erl | |
| parent | 5c1f9b342c3569b37b674b8671fb243782af4aa0 (diff) | |
| parent | 169507cb9238ff527d13df0fe945838a2169aa0d (diff) | |
| download | otp-02a3667376af950bb75523e32d2a974c4939261b.tar.gz otp-02a3667376af950bb75523e32d2a974c4939261b.tar.bz2 otp-02a3667376af950bb75523e32d2a974c4939261b.zip | |
Merge branch 'ks/dialyzer' into dev
* ks/dialyzer:
dialyzer: Build the PLT even if there are unresolved remote types
proplists: Export the type property()
erl_lint: Issue warnings for undefined exported types
Minor fix in a print message
Add handling of unknown types
Add declaration for exported types
Add types and specs; performed some cleanups also
erl_scan: Add declarations for exported types
stdlib: Add declarations for exported types
hipe: Add declarations for exported types
compiler: Add declarations for exported types
syntax_tools: Add declarations for exported types
kernel: Add declaration for exported types
Support -export_type() in dialyzer and erl_types
Add infrastructure for the -export_type() attribute
OTP-8678 ks/dialyzer
Diffstat (limited to 'lib/compiler/src/rec_env.erl')
| -rw-r--r-- | lib/compiler/src/rec_env.erl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/compiler/src/rec_env.erl b/lib/compiler/src/rec_env.erl index 9b73e08ad8..77005a6f9d 100644 --- a/lib/compiler/src/rec_env.erl +++ b/lib/compiler/src/rec_env.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2001-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2001-2010. 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 %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% %% @author Richard Carlsson <[email protected]> @@ -32,6 +32,8 @@ get/2, is_defined/2, is_empty/1, keys/1, lookup/2, new_key/1, new_key/2, new_keys/2, new_keys/3, size/1, to_list/1]). +-export_type([environment/0]). + -import(erlang, [max/2]). -ifdef(DEBUG). |