diff options
author | Kenneth Lundin <[email protected]> | 2012-06-08 13:26:41 +0200 |
---|---|---|
committer | Kenneth Lundin <[email protected]> | 2012-06-08 13:27:40 +0200 |
commit | b4b4c6299d3926e55b042ea45f55adaeec41cb6f (patch) | |
tree | 23fb9c48a109397a4aa9bd68b70a07a6cd9cf086 /lib/asn1/src/asn1ct_parser2.erl | |
parent | 9cfeeb9b7e66a3345cbc0e5b4b634cb5965635fc (diff) | |
parent | be01ab6d2cad9d5b139b36c79b1c7addd57d5265 (diff) | |
download | otp-b4b4c6299d3926e55b042ea45f55adaeec41cb6f.tar.gz otp-b4b4c6299d3926e55b042ea45f55adaeec41cb6f.tar.bz2 otp-b4b4c6299d3926e55b042ea45f55adaeec41cb6f.zip |
Merge branch 'kenneth/asn1/multiple_extaddgroup/OTP-10058' into maint
* kenneth/asn1/multiple_extaddgroup/OTP-10058:
Add support for multiple ExtensionAdditionGroups
Diffstat (limited to 'lib/asn1/src/asn1ct_parser2.erl')
-rw-r--r-- | lib/asn1/src/asn1ct_parser2.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/asn1/src/asn1ct_parser2.erl b/lib/asn1/src/asn1ct_parser2.erl index 007d390a1b..7301f49085 100644 --- a/lib/asn1/src/asn1ct_parser2.erl +++ b/lib/asn1/src/asn1ct_parser2.erl @@ -769,9 +769,11 @@ resolve_module(_Type, Current, undefined) -> Current; resolve_module(Type, Current, Imports) -> case [Mod || #'SymbolsFromModule'{symbols = S, module = Mod} <- Imports, - #'Externaltypereference'{type = T} <- S, + #'Externaltypereference'{type = T} <- S, Type == T] of - [#'Externaltypereference'{type = Mod}] -> Mod; + [#'Externaltypereference'{type = Mod}|_] -> Mod; + %% This allows the same symbol to be imported several times + %% which ought to be checked elsewhere and flagged as an error [] -> Current end. |