aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/src
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2014-10-13 15:59:27 +0200
committerBjörn Gustavsson <[email protected]>2015-01-12 11:40:24 +0100
commit8e43bffda5069aecdd2375eb409e9c03b7ff692b (patch)
treee4728d73b01d4f40d32a7048c7c8185857105074 /lib/asn1/src
parent56ab55449e38de8b28df5e2b7e3e6bbebfecd1ba (diff)
downloadotp-8e43bffda5069aecdd2375eb409e9c03b7ff692b.tar.gz
otp-8e43bffda5069aecdd2375eb409e9c03b7ff692b.tar.bz2
otp-8e43bffda5069aecdd2375eb409e9c03b7ff692b.zip
Simplify handling of an empty object definition
When the parser sees: something SOMETHING ::= {} it has no way of knowing whether 'something' is an value or an object. It depends on how SOMETHING is defined. For example: SOMETHING ::= SEQUENCE {} or SOMETHING ::= CLASS { &id OPTIONAL } Because of that ambiguity, there is no way to avoid a special case when we check an object definition. However, there is no need to invent an entire new checking function for this special case. It is much easier to just pretend that the parser gave us {object,defaultsyntax,[]} and let check_objectdefn/3 check it in the usual way.
Diffstat (limited to 'lib/asn1/src')
-rw-r--r--lib/asn1/src/asn1ct_check.erl28
1 files changed, 4 insertions, 24 deletions
diff --git a/lib/asn1/src/asn1ct_check.erl b/lib/asn1/src/asn1ct_check.erl
index 79d55feb9f..aba0e6a9ef 100644
--- a/lib/asn1/src/asn1ct_check.erl
+++ b/lib/asn1/src/asn1ct_check.erl
@@ -796,13 +796,10 @@ check_object(S,_ObjDef,#'Object'{classname=ClassRef,def=ObjectDef}) ->
{_,Object} = get_referenced_type(S,ObjectDef),
check_object(S, Object, object_to_check(Object));
[] ->
- %% An object with no fields. All class fields must be
- %% optional or default. Check that all fields in
- %% class are 'OPTIONAL' or 'DEFAULT'
- class_fields_optional_check(S,ClassDef),
- #'Object'{def={object,defaultsyntax,[]}};
- _ ->
- exit({error,{no_object,ObjectDef},S})
+ %% An object with no fields (parsed as a value).
+ Def = {object,defaultsyntax,[]},
+ NewSettingList = check_objectdefn(S, Def, ClassDef),
+ #'Object'{def=NewSettingList}
end,
Gen = gen_incl(S,NewObj#'Object'.def,
(ClassDef#classdef.typespec)#objectclass.fields),
@@ -967,23 +964,6 @@ prepare_objset({#type{}=Type,#type{}=Ext}) ->
prepare_objset(Ret) ->
Ret.
-class_fields_optional_check(S,#classdef{typespec=ClassSpec}) ->
- Fields = ClassSpec#objectclass.fields,
- class_fields_optional_check1(S,Fields).
-
-class_fields_optional_check1(_S,[]) ->
- ok;
-class_fields_optional_check1(S,[{typefield,_,'OPTIONAL'}|Rest]) ->
- class_fields_optional_check1(S,Rest);
-class_fields_optional_check1(S,[{fixedtypevaluefield,_,_,_,'OPTIONAL'}|Rest]) ->
- class_fields_optional_check1(S,Rest);
-class_fields_optional_check1(S,[{fixedtypevaluesetfield,_,_,'OPTIONAL'}|Rest]) ->
- class_fields_optional_check1(S,Rest);
-class_fields_optional_check1(S,[{objectfield,_,_,_,'OPTIONAL'}|Rest]) ->
- class_fields_optional_check1(S,Rest);
-class_fields_optional_check1(S,[{objectsetfield,_,_,'OPTIONAL'}|Rest]) ->
- class_fields_optional_check1(S,Rest).
-
%% ObjectSetFromObjects functionality
%% The fieldname is a list of field names.They may be objects or