diff options
| author | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-12-16 14:34:26 +0100 |
| commit | 73205a499c16781ecd064ec2446d502b3c0d01b6 (patch) | |
| tree | 260a1805f06a1ecef92d03d29853dbddb0bbd803 /lib/ic/src/ic_symtab.erl | |
| parent | 99e34bba1a60b262e24496cc9288b549360c6377 (diff) | |
| parent | 98a66242abe688d852ec46f4298a364fc0124995 (diff) | |
| download | otp-73205a499c16781ecd064ec2446d502b3c0d01b6.tar.gz otp-73205a499c16781ecd064ec2446d502b3c0d01b6.tar.bz2 otp-73205a499c16781ecd064ec2446d502b3c0d01b6.zip | |
Merge branch 'nick/orber/recursive_types/OTP-8868' into maint-r14
* nick/orber/recursive_types/OTP-8868:
Support for recursive unions and structs. Break loop if recursive TypeCode.
Added basic tests for recursive uinions and structs.
Removed test code.
Added partial support for recursive IDL types.
Conflicts:
lib/ic/doc/src/notes.xml
lib/ic/vsn.mk
lib/orber/vsn.mk
Diffstat (limited to 'lib/ic/src/ic_symtab.erl')
| -rw-r--r-- | lib/ic/src/ic_symtab.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ic/src/ic_symtab.erl b/lib/ic/src/ic_symtab.erl index 889c75e3a2..d710154a5d 100644 --- a/lib/ic/src/ic_symtab.erl +++ b/lib/ic/src/ic_symtab.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1998-2009. All Rights Reserved. +%% Copyright Ericsson AB 1998-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -69,6 +69,8 @@ store(G, N, X) -> ets:insert(G#genobj.symtab, {Name, X}); {ok, Y} when is_record(Y, forward) -> ets:insert(G#genobj.symtab, {Name, X}); + {ok, Y} when is_record(Y, constr_forward) -> + ets:insert(G#genobj.symtab, {Name, X}); {ok, _Y} -> ic_error:error(G, {multiply_defined, X}) end. |