From 36e6c9613c0d438c5a32d7add1d29a32ce1804c5 Mon Sep 17 00:00:00 2001 From: Ivan Glushkov Date: Thu, 25 Apr 2013 22:36:18 +0400 Subject: [PATCH 1/2] node type supported --- src/proper_types.erl | 6 +++++- src/proper_typeserver.erl | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/proper_types.erl b/src/proper_types.erl index 828219d3..98d18f2f 100644 --- a/src/proper_types.erl +++ b/src/proper_types.erl @@ -142,7 +142,7 @@ loose_tuple/1, exactly/1, fixed_list/1, function/2, any/0, shrink_list/1, safe_union/1, safe_weighted_union/1]). -export([integer/0, non_neg_integer/0, pos_integer/0, neg_integer/0, range/2, - float/0, non_neg_float/0, number/0, boolean/0, byte/0, char/0, + float/0, node/0, non_neg_float/0, number/0, boolean/0, byte/0, char/0, list/0, tuple/0, string/0, wunion/1, term/0, timeout/0, arity/0]). -export([int/0, nat/0, largeint/0, real/0, bool/0, choose/2, elements/1, oneof/1, frequency/1, return/1, default/2, orderedlist/1, function0/1, @@ -1214,6 +1214,10 @@ real() -> float(). -spec bool() -> proper_types:type(). bool() -> boolean(). +%% @equiv atom() +-spec node() -> proper_types:type(). +node() -> atom(). + %% @equiv integer(Low, High) -spec choose(extint(), extint()) -> proper_types:type(). choose(Low, High) -> integer(Low, High). diff --git a/src/proper_typeserver.erl b/src/proper_typeserver.erl index f39a89c8..32e4834e 100644 --- a/src/proper_typeserver.erl +++ b/src/proper_typeserver.erl @@ -181,7 +181,7 @@ %% CAUTION: all these must be sorted -define(STD_TYPES_0, [any,arity,atom,binary,bitstring,bool,boolean,byte,char,float,integer, - list,neg_integer,non_neg_integer,number,pos_integer,string,term, + list,neg_integer,node,non_neg_integer,number,pos_integer,string,term, timeout]). -define(HARD_ADTS, %% gb_trees:iterator and gb_sets:iterator are NOT hardcoded @@ -552,7 +552,7 @@ get_type_repr(Mod, TypeRef, false, #state{types = Types} = State) -> {ok,TypeRepr} -> {ok, TypeRepr, State}; error -> - {error, {missing_type,Mod,TypeRef}} + {error, {missing_typy,Mod,TypeRef}} end. -spec prepare_for_remote(mod_name(), type_name(), arity(), state()) -> From 0e3c2777dda7310971f5165251bf946449a7e45a Mon Sep 17 00:00:00 2001 From: Ivan Glushkov Date: Fri, 26 Apr 2013 08:51:13 +0400 Subject: [PATCH 2/2] typo --- src/proper_typeserver.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/proper_typeserver.erl b/src/proper_typeserver.erl index 32e4834e..0e8a9df5 100644 --- a/src/proper_typeserver.erl +++ b/src/proper_typeserver.erl @@ -552,7 +552,7 @@ get_type_repr(Mod, TypeRef, false, #state{types = Types} = State) -> {ok,TypeRepr} -> {ok, TypeRepr, State}; error -> - {error, {missing_typy,Mod,TypeRef}} + {error, {missing_type,Mod,TypeRef}} end. -spec prepare_for_remote(mod_name(), type_name(), arity(), state()) ->