QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Fix some issues pointed out by dialyzer

Browse Source
This commit is contained in:
Ulf Norell 2019-02-05 08:58:27 +01:00
parent e6f01481bf
commit 8262d7780f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/aeso_ast_infer_types.erl
View File

@ -68,7 +68,7 @@
-type access() :: public | private | internal. -type access() :: public | private | internal.
-type typedef() :: {[aeso_syntax:tvar()], aeso_syntax:type_def() | {contract_t, [aeso_syntax:field_t()]}} -type typedef() :: {[aeso_syntax:tvar()], aeso_syntax:typedef() | {contract_t, [aeso_syntax:field_t()]}}
| {builtin, non_neg_integer()}. | {builtin, non_neg_integer()}.
-type type() :: aeso_syntax:type(). -type type() :: aeso_syntax:type().
@ -227,10 +227,11 @@ bind_contract({contract, Ann, Id, Contents}, Env) ->
|| {fun_decl, AnnF, Entrypoint, Type} <- Contents ] ++ || {fun_decl, AnnF, Entrypoint, Type} <- Contents ] ++
%% Predefined fields %% Predefined fields
[ {field_t, Sys, {id, Sys, "address"}, {id, Sys, "address"}} ], [ {field_t, Sys, {id, Sys, "address"}, {id, Sys, "address"}} ],
FieldInfo = [ {Entrypoint, #field_info{ kind = contract, FieldInfo = [ {Entrypoint, #field_info{ ann = FieldAnn,
kind = contract,
field_t = Type, field_t = Type,
record_t = Id }} record_t = Id }}
|| {field_t, _, {id, _, Entrypoint}, Type} <- Fields ], || {field_t, _, {id, FieldAnn, Entrypoint}, Type} <- Fields ],
bind_type(Key, Ann, {[], {contract_t, Fields}}, bind_type(Key, Ann, {[], {contract_t, Fields}},
bind_fields(FieldInfo, Env)). bind_fields(FieldInfo, Env)).
@ -296,7 +297,7 @@ lookup_record_field(Env, FieldName) ->
maps:get(FieldName, Env#env.fields, []). maps:get(FieldName, Env#env.fields, []).
%% For 'create' or 'update' constraints we don't consider contract types. %% For 'create' or 'update' constraints we don't consider contract types.
-spec lookup_record_field(env(), name(), contract | record) -> [field_info()]. -spec lookup_record_field(env(), name(), create | project | update) -> [field_info()].
lookup_record_field(Env, FieldName, Kind) -> lookup_record_field(Env, FieldName, Kind) ->
[ Fld || Fld = #field_info{ kind = K } <- lookup_record_field(Env, FieldName), [ Fld || Fld = #field_info{ kind = K } <- lookup_record_field(Env, FieldName),
Kind == project orelse K /= contract ]. Kind == project orelse K /= contract ].
@ -1357,7 +1358,7 @@ solve_field_constraints(Env, Constraints) ->
[] -> [] ->
type_error({undefined_field, Field}), type_error({undefined_field, Field}),
false; false;
[{FieldName, #field_info{field_t = FldType, record_t = RecType}}] -> [#field_info{field_t = FldType, record_t = RecType}] ->
create_freshen_tvars(), create_freshen_tvars(),
FreshFldType = freshen(FldType), FreshFldType = freshen(FldType),
FreshRecType = freshen(RecType), FreshRecType = freshen(RecType),