Merge pull request #124 from manopapad/prepare19

Code changes in preparation for Erlang/OTP 19.0

Author: kostis

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # --------------------------------------------------------------------
-# Copyright 2010-2013 Manolis Papadakis <[email protected]>,
+# Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 #                     Eirini Arvaniti <[email protected]>
 #                 and Kostis Sagonas <[email protected]>
 #
@@ -43,7 +43,7 @@ DONE
 
 random()
 {
-    echo "Using Erlang's random module"
+    echo "Using Erlang's 'random' ('rand' in 19.0 and later) module"
     grep -q USE_SFMT rebar.config && \
         sed -i "s/debug_info, {d, 'USE_SFMT'}/debug_info/" rebar.config
     grep -q sfmt rebar.config && sed -i '/^{deps/,$d' rebar.config

include/proper_internal.hrl

@@ -1,4 +1,4 @@
-%%% Copyright 2010-2013 Manolis Papadakis <[email protected]>,
+%%% Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 %%%                     Eirini Arvaniti <[email protected]>
 %%%                 and Kostis Sagonas <[email protected]>
 %%%
@@ -17,7 +17,7 @@
 %%% You should have received a copy of the GNU General Public License
 %%% along with PropEr.  If not, see <http://www.gnu.org/licenses/>.
 
-%%% @copyright 2010-2013 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @copyright 2010-2016 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
 %%% @version {@version}
 %%% @author Manolis Papadakis
 %%% @doc Internal header file: This header is included in all PropEr source
@@ -35,17 +35,37 @@
 -compile({parse_transform, strip_types}).
 -endif.
 
+
 %%------------------------------------------------------------------------------
 %% Random generator selection
 %%------------------------------------------------------------------------------
 
 -ifdef(USE_SFMT).
 -define(RANDOM_MOD, sfmt).
 -define(SEED_NAME, sfmt_seed).
+
+-else.
+
+-ifdef(AT_LEAST_19).
+-define(RANDOM_MOD, rand).   %% for 19.x use the 'rand' module
+-define(SEED_NAME, rand_seed).
 -else.
 -define(RANDOM_MOD, random).
 -define(SEED_NAME, random_seed).
 -endif.
+-endif.
+
+
+%%------------------------------------------------------------------------------
+%% Line annotations
+%%------------------------------------------------------------------------------
+
+-ifdef(AT_LEAST_19).
+-define(anno(L), erl_anno:new(L)).
+-else.
+-define(anno(L), L).
+-endif.
+
 
 %%------------------------------------------------------------------------------
 %% Macros
@@ -84,9 +104,13 @@
 -type abs_expr()   :: erl_parse:abstract_expr().
 -type abs_clause() :: erl_parse:abstract_clause().
 
-%% TODO: Replace these with the appropriate types from stdlib.
+-ifdef(AT_LEAST_19).
+-type abs_type() :: erl_parse:abstract_type().
+-else.
 -type abs_type() :: term().
--type abs_rec_field() :: term().
+-endif.
+%% TODO: Replace abs_rec_field with its proper type once it is exported.
+-type abs_rec_field() :: term().	% erl_parse:af_field_decl().
 
 -type loose_tuple(T) :: {} | {T} | {T,T} | {T,T,T} | {T,T,T,T} | {T,T,T,T,T}
 		      | {T,T,T,T,T,T} | {T,T,T,T,T,T,T} | {T,T,T,T,T,T,T,T}

src/proper_arith.erl

@@ -1,4 +1,4 @@
-%%% Copyright 2010-2015 Manolis Papadakis <[email protected]>,
+%%% Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 %%%                     Eirini Arvaniti <[email protected]>
 %%%                 and Kostis Sagonas <[email protected]>
 %%%
@@ -17,7 +17,7 @@
 %%% You should have received a copy of the GNU General Public License
 %%% along with PropEr.  If not, see <http://www.gnu.org/licenses/>.
 
-%%% @copyright 2010-2015 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @copyright 2010-2016 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
 %%% @version {@version}
 %%% @author Manolis Papadakis
 %%% @doc This module contains helper arithmetic, list handling and random
@@ -37,7 +37,6 @@
 
 -include("proper_internal.hrl").
 
-
 %%-----------------------------------------------------------------------------
 %% List handling functions
 %%-----------------------------------------------------------------------------
@@ -212,13 +211,19 @@ remove_n(N, {List,Acc}) ->
 %% @doc Seeds the random number generator. This function should be run before
 %% calling any random function from this module.
 -spec rand_start(seed()) -> 'ok'.
+-ifdef(AT_LEAST_19).
+rand_start(Seed) ->
+    _ = rand:seed(exsplus, Seed),
+    ok.
+-else.
 rand_start(Seed) ->
     _ = ?RANDOM_MOD:seed(Seed),
     %% TODO: read option for RNG bijections here
     ok.
+-endif.
 
-%% @doc Conditionally seeds the random number generator. This function should be run before
-%% calling any random function from this module.
+%% @doc Conditionally seeds the random number generator. This function should
+%% be run before calling any random function from this module.
 -spec rand_restart(seed()) -> 'ok'.
 rand_restart(Seed) ->
     case get(?SEED_NAME) of
@@ -229,11 +234,17 @@ rand_restart(Seed) ->
     end.
 
 -spec rand_reseed() -> 'ok'.
+-ifdef(AT_LEAST_19).
+rand_reseed() ->
+    _ = rand:seed(exsplus, os:timestamp()),
+    ok.
+-else.
 rand_reseed() ->
     %% TODO: This should use the pid of the process somehow, in case two
     %%       spawned functions call it simultaneously?
     _ = ?RANDOM_MOD:seed(os:timestamp()),
     ok.
+-endif.
 
 -spec rand_stop() -> 'ok'.
 rand_stop() ->

src/proper_gen.erl

@@ -1,4 +1,4 @@
-%%% Copyright 2010-2015 Manolis Papadakis <[email protected]>,
+%%% Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 %%%                     Eirini Arvaniti <[email protected]>
 %%%                 and Kostis Sagonas <[email protected]>
 %%%
@@ -17,7 +17,7 @@
 %%% You should have received a copy of the GNU General Public License
 %%% along with PropEr.  If not, see <http://www.gnu.org/licenses/>.
 
-%%% @copyright 2010-2015 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @copyright 2010-2016 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
 %%% @version {@version}
 %%% @author Manolis Papadakis
 
@@ -631,8 +631,15 @@ function_body(Args, RetType, {Seed1,Seed2}) ->
 
 -ifdef(USE_SFMT).
 update_seed(Seed) ->
-    sfmt:seed(Seed).
+    _ = sfmt:seed(Seed),
+    ok.
 -else.
+-ifdef(AT_LEAST_19).
 update_seed(Seed) ->
-    put(random_seed, Seed).
+    _ = rand:seed(exsplus, Seed),
+    ok.
+-else.
+update_seed(Seed) ->
+    put(?SEED_NAME, Seed).
+-endif.
 -endif.

src/proper_queue.erl

@@ -163,8 +163,8 @@ liat(Queue) ->
     queue:liat(Queue).
 
 -spec lait(queue(T)) -> queue(T).
-lait(Queue) ->
-    queue:lait(Queue).
+lait(Queue) ->		%% XXX: deprecated in 19.0
+    queue:liat(Queue).
 
 -spec init(queue(T)) -> queue(T).
 init(Queue) ->

src/proper_symb.erl

@@ -1,4 +1,4 @@
-%%% Copyright 2010-2013 Manolis Papadakis <[email protected]>,
+%%% Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 %%%                     Eirini Arvaniti <[email protected]>
 %%%                 and Kostis Sagonas <[email protected]>
 %%%
@@ -17,7 +17,7 @@
 %%% You should have received a copy of the GNU General Public License
 %%% along with PropEr.  If not, see <http://www.gnu.org/licenses/>.
 
-%%% @copyright 2010-2013 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @copyright 2010-2016 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
 %%% @version {@version}
 %%% @author Manolis Papadakis
 
@@ -244,7 +244,8 @@ pretty_print(VarValues, SymbTerm) ->
 
 -spec parse_fun(mod_name(), fun_name(), [abs_expr()]) -> abs_expr().
 parse_fun(Module, Function, ArgTreeList) ->
-    {call,0,{remote,0,{atom,0,Module},{atom,0,Function}},ArgTreeList}.
+    L = ?anno(0),
+    {call,L,{remote,L,{atom,L,Module},{atom,L,Function}},ArgTreeList}.
 
 -spec parse_term(term()) -> abs_expr().
 parse_term(TreeList) when is_list(TreeList) ->

src/proper_transformer.erl

@@ -1,4 +1,4 @@
-%%% Copyright 2010-2015 Manolis Papadakis <[email protected]>,
+%%% Copyright 2010-2016 Manolis Papadakis <[email protected]>,
 %%%                     Eirini Arvaniti <[email protected]>
 %%%                 and Kostis Sagonas <[email protected]>
 %%%
@@ -17,7 +17,7 @@
 %%% You should have received a copy of the GNU General Public License
 %%% along with PropEr.  If not, see <http://www.gnu.org/licenses/>.
 
-%%% @copyright 2010-2015 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
+%%% @copyright 2010-2016 Manolis Papadakis, Eirini Arvaniti and Kostis Sagonas
 %%% @version {@version}
 %%% @author Manolis Papadakis
 
@@ -222,6 +222,8 @@ rewrite_form(Form, _ModInfo) ->
     Form.
 
 -spec rewrite_field_init(abs_rec_field(), mod_info()) -> abs_rec_field().
+rewrite_field_init({typed_record_field,RecField,Type}, ModInfo) ->
+    {typed_record_field,rewrite_field_init(RecField, ModInfo),Type};
 rewrite_field_init({record_field,_Line,_FieldName} = FieldInit, _ModInfo) ->
     FieldInit;
 rewrite_field_init({record_field,Line,FieldName,InitExpr}, ModInfo) ->
@@ -386,7 +388,8 @@ rewrite_type(Expr, _ModInfo) ->
 
 -spec native_type_call(mod_name(), abs_expr()) -> abs_expr().
 native_type_call(ModName, Expr) ->
-    AbsModName = {atom,0,ModName},
-    AbsTypeStr = {string,0,lists:flatten(erl_pp:expr(Expr))},
-    FunRef = {remote,0,{atom,0,proper_types},{atom,0,native_type}},
-    {call,0,FunRef,[AbsModName,AbsTypeStr]}.
+    L = ?anno(0),
+    AbsModName = {atom,L,ModName},
+    AbsTypeStr = {string,L,lists:flatten(erl_pp:expr(Expr))},
+    FunRef = {remote,L,{atom,L,proper_types},{atom,L,native_type}},
+    {call,L,FunRef,[AbsModName,AbsTypeStr]}.