diff options
| author | Raimo Niskanen <[email protected]> | 2017-01-18 11:42:04 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2017-01-18 11:42:04 +0100 |
| commit | 7f52af8875a1ab1ba96c6cb2403211bfc876639c (patch) | |
| tree | d25e874124f5946b505a33db097d822e0ed48b96 /lib/snmp/src/compile | |
| parent | 1d947e619d805c76d0c9d5e1745af08da8d6cef4 (diff) | |
| parent | 21f287ca0b9d81700f323f99ab51bdef35b06717 (diff) | |
| download | otp-7f52af8875a1ab1ba96c6cb2403211bfc876639c.tar.gz otp-7f52af8875a1ab1ba96c6cb2403211bfc876639c.tar.bz2 otp-7f52af8875a1ab1ba96c6cb2403211bfc876639c.zip | |
Merge branch 'raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145' into maint
* raimo/snmp/compile-enum-refinement/ERL-325/OTP-14145:
Bump version
Do without compilation time in SNMP versions[12]()
Test enum refinement MIB
Fix enum refinement in usertype in SYNTAX
Diffstat (limited to 'lib/snmp/src/compile')
| -rw-r--r-- | lib/snmp/src/compile/snmpc_lib.erl | 4 | ||||
| -rw-r--r-- | lib/snmp/src/compile/snmpc_mib_gram.yrl | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/snmp/src/compile/snmpc_lib.erl b/lib/snmp/src/compile/snmpc_lib.erl index 51690b6e7e..33ddd78308 100644 --- a/lib/snmp/src/compile/snmpc_lib.erl +++ b/lib/snmp/src/compile/snmpc_lib.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2016. All Rights Reserved. +%% Copyright Ericsson AB 1997-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -99,7 +99,7 @@ make_ASN1type({{type_with_size,Type,{range,Lo,Hi}},Line}) -> print_error("Undefined type '~w'",[Type],Line), guess_string_type() end; -make_ASN1type({{integer_with_enum,Type,Enums},Line}) -> +make_ASN1type({{type_with_enum,Type,Enums},Line}) -> case lookup_vartype(Type) of {value,ASN1type} -> ASN1type#asn1_type{assocList = [{enums, Enums}]}; false -> diff --git a/lib/snmp/src/compile/snmpc_mib_gram.yrl b/lib/snmp/src/compile/snmpc_mib_gram.yrl index 743c3a6550..14a668127e 100644 --- a/lib/snmp/src/compile/snmpc_mib_gram.yrl +++ b/lib/snmp/src/compile/snmpc_mib_gram.yrl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2016. All Rights Reserved. +%% Copyright Ericsson AB 1996-2017. All Rights Reserved. %% %% Licensed under the Apache License, Version 2.0 (the "License"); %% you may not use this file except in compliance with the License. @@ -387,10 +387,12 @@ syntax -> type : {{type, cat('$1')},line_of('$1')}. syntax -> type size : {{type_with_size, cat('$1'), '$2'},line_of('$1')}. syntax -> usertype size : {{type_with_size,val('$1'), '$2'},line_of('$1')}. syntax -> 'INTEGER' '{' namedbits '}' : - {{integer_with_enum, 'INTEGER', '$3'}, line_of('$1')}. + {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}. syntax -> 'BITS' '{' namedbits '}' : ensure_ver(2,'$1'), {{bits, '$3'}, line_of('$1')}. +syntax -> usertype '{' namedbits '}' : + {{type_with_enum, 'INTEGER', '$3'}, line_of('$1')}. syntax -> 'SEQUENCE' 'OF' usertype : {{sequence_of,val('$3')},line_of('$1')}. |