diff options
| author | Kenneth Lundin <[email protected]> | 2012-06-08 13:37:34 +0200 |
|---|---|---|
| committer | Kenneth Lundin <[email protected]> | 2012-06-08 13:37:34 +0200 |
| commit | d7554d5b53ef85861bb5593fba38f65c40faca33 (patch) | |
| tree | 4bd276f2d9fb028d92e9254aa1572774beeed9a5 /lib/asn1/src/asn1ct_parser2.erl | |
| parent | 0374be0e7caf06a9d1af3daef2cea1f7b20a57ab (diff) | |
| parent | b4b4c6299d3926e55b042ea45f55adaeec41cb6f (diff) | |
| download | otp-d7554d5b53ef85861bb5593fba38f65c40faca33.tar.gz otp-d7554d5b53ef85861bb5593fba38f65c40faca33.tar.bz2 otp-d7554d5b53ef85861bb5593fba38f65c40faca33.zip | |
Merge branch 'maint'
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. |