diff options
| author | Hans Bolinder <[email protected]> | 2014-04-28 12:05:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2014-04-28 12:05:38 +0200 |
| commit | 683a293321b42ff6159637b2e0171c397db9a872 (patch) | |
| tree | b7414677fed503f2db33adbc47b1cb44a8e6f23b /lib/stdlib/test/erl_pp_SUITE.erl | |
| parent | 3be1dc100140139b2542cd327cf4f8453d43aca1 (diff) | |
| parent | eafe7f889a4ff60d9e3155518bda095740efe143 (diff) | |
| download | otp-683a293321b42ff6159637b2e0171c397db9a872.tar.gz otp-683a293321b42ff6159637b2e0171c397db9a872.tar.bz2 otp-683a293321b42ff6159637b2e0171c397db9a872.zip | |
Merge branch 'hb/optional_callbacks/OTP-11861'
* hb/optional_callbacks/OTP-11861:
[edoc] Handle optional behaviour callbacks
[syntax_tools] Let erl_syntax:concrete() accept the F/A syntax
Introduce the attribute -optional_callbacks in the context of behaviours
Diffstat (limited to 'lib/stdlib/test/erl_pp_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/erl_pp_SUITE.erl | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/stdlib/test/erl_pp_SUITE.erl b/lib/stdlib/test/erl_pp_SUITE.erl index babf3a49eb..d0892c6d79 100644 --- a/lib/stdlib/test/erl_pp_SUITE.erl +++ b/lib/stdlib/test/erl_pp_SUITE.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2013. All Rights Reserved. +%% Copyright Ericsson AB 2006-2014. 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 @@ -50,7 +50,7 @@ otp_6321/1, otp_6911/1, otp_6914/1, otp_8150/1, otp_8238/1, otp_8473/1, otp_8522/1, otp_8567/1, otp_8664/1, otp_9147/1, - otp_10302/1, otp_10820/1, otp_11100/1]). + otp_10302/1, otp_10820/1, otp_11100/1, otp_11861/1]). %% Internal export. -export([ehook/6]). @@ -83,7 +83,7 @@ groups() -> {tickets, [], [otp_6321, otp_6911, otp_6914, otp_8150, otp_8238, otp_8473, otp_8522, otp_8567, otp_8664, otp_9147, - otp_10302, otp_10820, otp_11100]}]. + otp_10302, otp_10820, otp_11100, otp_11861]}]. init_per_suite(Config) -> Config. @@ -1204,8 +1204,18 @@ otp_11100(Config) when is_list(Config) -> []}}), ok. +otp_11861(doc) -> + "OTP-11861. behaviour_info() and -callback."; +otp_11861(suite) -> []; +otp_11861(Config) when is_list(Config) -> + "-optional_callbacks([bar/0]).\n" = + pf({attribute,3,optional_callbacks,[{bar,0}]}), + "-optional_callbacks([{bar,1,bad}]).\n" = + pf({attribute,4,optional_callbacks,[{bar,1,bad}]}), + ok. + pf(Form) -> - lists:flatten(erl_pp:form(Form,none)). + lists:flatten(erl_pp:form(Form, none)). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |