diff options
| author | Björn Gustavsson <[email protected]> | 2014-08-21 14:23:01 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-09-01 14:37:14 +0200 |
| commit | f94cfe594e449799b1e97829483551572bb39f63 (patch) | |
| tree | ddcb561e877323722de531571feff21f25f0d603 /lib | |
| parent | f4ac66dc45dff2b0e6a7b2abdc24fd5ffb1c53fa (diff) | |
| download | otp-f94cfe594e449799b1e97829483551572bb39f63.tar.gz otp-f94cfe594e449799b1e97829483551572bb39f63.tar.bz2 otp-f94cfe594e449799b1e97829483551572bb39f63.zip | |
Report errors also for unused parameterized types
Definitions for parameterized types are verified once very early,
and one more time when they are instantiated.
Errors found during the first check were ignored, so errors for
unused parameterized types were not reported.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/asn1/src/asn1ct_check.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl index 265f6554e5..2055f2e5eb 100644 --- a/lib/asn1/src/asn1ct_check.erl +++ b/lib/asn1/src/asn1ct_check.erl @@ -91,7 +91,7 @@ check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) -> save_asn1db_uptodate(S,S#state.erule,S#state.mname), put(top_module,S#state.mname), - _ = checkp(S, ParameterizedTypes), %must do this before the templates are used + ParamError = checkp(S, ParameterizedTypes), %must do this before the templates are used %% table to save instances of parameterized objects,object sets asn1ct_table:new(parameterized_objects), @@ -160,8 +160,10 @@ check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) -> Exporterror = check_exports(S,S#state.module), ImportError = check_imports(S,S#state.module), - case {Terror3,Verror5,Cerror,Oerror,Exporterror,ImportError} of - {[],[],[],[],[],[]} -> + AllErrors = lists:flatten([ParamError,Terror3,Verror5,Cerror, + Oerror,Exporterror,ImportError]), + case AllErrors of + [] -> ContextSwitchTs = context_switch_in_spec(), InstanceOf = instance_of_in_spec(S#state.mname), NewTypes = lists:subtract(Types,AddClasses) ++ ContextSwitchTs @@ -175,8 +177,7 @@ check(S,{Types,Values,ParameterizedTypes,Classes,Objects,ObjectSets}) -> lists:subtract(NewObjects,ExclO)++InlinedObjects, lists:subtract(NewObjectSets,ExclOS)++ParObjectSetNames}}; _ -> - {error,lists:flatten([Terror3,Verror5,Cerror, - Oerror,Exporterror,ImportError])} + {error,AllErrors} end. context_switch_in_spec() -> |