Merge branch 'maint-r14' into dev

6 files changed, 54 insertions, 34 deletions

diff --git a/lib/ic/src/ic_forms.erl b/lib/ic/src/ic_forms.erl
index 7409ddeb7b..fc46a2ed40 100644
--- a/lib/ic/src/ic_forms.erl
+++ b/lib/ic/src/ic_forms.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
@@ -65,6 +65,7 @@ get_line(X) when is_record(X, scoped_id) -> X#scoped_id.line;
 get_line(X) when is_record(X, module)      -> get_line(X#module.id);
 get_line(X) when is_record(X, interface)   -> get_line(X#interface.id);
 get_line(X) when is_record(X, forward)     -> get_line(X#forward.id);
+get_line(X) when is_record(X, constr_forward) -> get_line(X#constr_forward.id);
 get_line(X) when is_record(X, const)       -> get_line(X#const.id);
 get_line(X) when is_record(X, typedef)     -> get_line(X#typedef.id);
 get_line(X) when is_record(X, struct)      -> get_line(X#struct.id);
@@ -114,6 +115,7 @@ get_line(_)				-> -1.
 get_id2(X) when is_record(X, module)       -> get_id(X#module.id);
 get_id2(X) when is_record(X, interface)    -> get_id(X#interface.id);
 get_id2(X) when is_record(X, forward)      -> get_id(X#forward.id);
+get_id2(X) when is_record(X, constr_forward) -> get_id(X#constr_forward.id);
 get_id2(X) when is_record(X, const)        -> get_id(X#const.id);
 get_id2(X) when is_record(X, typedef)      -> get_id(hd(X#typedef.id));
 get_id2(X) when is_record(X, struct)       -> get_id(X#struct.id);
@@ -156,6 +158,7 @@ get_type(X) when is_record(X, param)       -> X#param.type.
 %% Temporary place
 get_tk(X) when is_record(X, interface)  -> X#interface.tk;
 get_tk(X) when is_record(X, forward)    -> X#forward.tk;
+get_tk(X) when is_record(X, constr_forward) -> X#constr_forward.tk;
 get_tk(X) when is_record(X, const)      -> X#const.tk;
 get_tk(X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
 get_tk(X) when is_record(X, typedef)    -> X#typedef.tk;
@@ -228,6 +231,7 @@ clean_up_scope([N|Ns],Found) ->
 
 get_type_code2(_, _, X) when is_record(X, interface)  -> X#interface.tk;
 get_type_code2(_, _, X) when is_record(X, forward)    -> X#forward.tk;
+get_type_code2(_, _, X) when is_record(X, constr_forward) -> X#constr_forward.tk;
 get_type_code2(_, _, X) when is_record(X, const)      -> X#const.tk;
 get_type_code2(_, _, X) when is_record(X, type_dcl)   -> X#type_dcl.tk;
 get_type_code2(_, _, X) when is_record(X, typedef)    ->
diff --git a/lib/ic/src/ic_pragma.erl b/lib/ic/src/ic_pragma.erl
index 9165e3b03b..45cb64c9c8 100644
--- a/lib/ic/src/ic_pragma.erl
+++ b/lib/ic/src/ic_pragma.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
@@ -60,7 +60,7 @@ pragma_reg(G,X) ->
     init_pragma_status(S),
     registerOptions(G,S),
     pragma_reg_all(G, S, [], X),
-    denote_specific_code_opts(G), %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+    denote_specific_code_opts(G),
     case get_pragma_compilation_status(S) of
 	true ->
 	    %% Remove ugly pragmas from form
@@ -132,6 +132,7 @@ applyCodeOpt(G) ->
 
 %% This removes all pragma records from the form.
 %% When debugged, it can be enbodied in pragma_reg_all.
+cleanup(undefined,C) -> C;
 cleanup([],C) -> C;
 cleanup([X|Xs],CSF) ->
     cleanup(Xs, CSF++cleanup(X)).
@@ -279,7 +280,12 @@ pragma_reg(G, S, N, X) when is_record(X, union) ->
 pragma_reg(G, S, N, X) when is_record(X, struct) -> 
     mk_ref(G,[get_id2(X) | N],struct_ref),
     mk_file_data(G,X,N,struct),
-    pragma_reg_all(G, S, N, X#struct.body);
+    case X#struct.body of
+	undefined ->
+	    ok;
+	_ ->
+	    pragma_reg_all(G, S, N, X#struct.body)
+    end;
 
 pragma_reg(G, _S, N, X) when is_record(X, attr) -> 
     XX = #id_of{type=X},
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.
diff --git a/lib/ic/src/icforms.hrl b/lib/ic/src/icforms.hrl
index d1869e6330..1b394a11b4 100644
--- a/lib/ic/src/icforms.hrl
+++ b/lib/ic/src/icforms.hrl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -34,6 +34,7 @@
 -record(module,		{id, body}).
 -record(interface,	{id, inherit, body, inherit_body, tk}).
 -record(forward,	{id, tk}).
+-record(constr_forward,	{id, tk}).
 -record(const,		{type, id, val, tk}).
 -record(type_dcl,	{type, tk}).
 -record(typedef,	{type, id, tk}).
diff --git a/lib/ic/src/icparse.yrl b/lib/ic/src/icparse.yrl
index 25b0f452e7..d0dd6cde4c 100644
--- a/lib/ic/src/icparse.yrl
+++ b/lib/ic/src/icparse.yrl
@@ -1,21 +1,20 @@
-%%<copyright>
-%% <year>1997-2007</year>
-%% <holder>Ericsson AB, All Rights Reserved</holder>
-%%</copyright>
-%%<legalnotice>
+%%
+%% %CopyrightBegin%
+%% 
+%% Copyright Ericsson AB 1997-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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%%
+%% 
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%%
-%% The Initial Developer of the Original Code is Ericsson AB.
-%%</legalnotice>
+%% 
+%% %CopyrightEnd%
 %%
 %%------------------------------------------------------------
 %% Yecc spec for IDL
@@ -150,6 +149,7 @@ Nonterminals
 	'ZorM_<integer_literal>'
 	'<fixed_pt_type>'
 	'<fixed_pt_const_type>'
+	'<constr_forward_decl>'
 	.
 
 
@@ -473,6 +473,7 @@ OE_preproc -> '#' '<integer_literal>' '<string_literal>'
 '<type_dcl>' -> '<struct_type>' : '$1' .
 '<type_dcl>' -> '<union_type>' : '$1' .
 '<type_dcl>' -> '<enum_type>' : '$1' .
+'<type_dcl>' -> '<constr_forward_decl>' : '$1' .
 
 %% (28) NIY multiple declarators (FIXED)
 '<type_declarator>' -> '<type_spec>' '<declarators>'
@@ -832,6 +833,9 @@ OE_preproc -> '#' '<integer_literal>' '<string_literal>'
 '<fixed_pt_type>' -> 'fixed' '<' '<positive_int_const>' ',' '<positive_int_const>' '>'
   : #fixed{digits='$3',scale='$5'} .
 
+%% (99)
+'<constr_forward_decl>' -> 'struct' '<identifier>' : #constr_forward{id='$2', tk=tk_struct} .
+'<constr_forward_decl>' -> 'union'  '<identifier>' : #constr_forward{id='$2', tk=tk_union} .
 
 %% Added clause
 'ZorM_<string_literal>' -> '$empty' : [] .
diff --git a/lib/ic/src/ictype.erl b/lib/ic/src/ictype.erl
index 4704191bee..9e20801464 100644
--- a/lib/ic/src/ictype.erl
+++ b/lib/ic/src/ictype.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -407,6 +407,18 @@ check(G, S, N, X) when is_record(X, forward) ->
     tktab_add(G, S, N, X, {tk_objref, ictk:get_IR_ID(G, N, X), ic_forms:get_id2(X)}),
     X;
 
+check(G, S, N, #constr_forward{tk = tk_struct} = X) ->
+    ?STDDBG,
+    ID = ic_forms:get_id2(X),
+    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
+    tktab_add(G, S, N, X, {tk_struct, ictk:get_IR_ID(G, N, X), ID, Module}),
+    X;
+check(G, S, N, #constr_forward{tk = tk_union} = X) ->
+    ?STDDBG,
+    ID = ic_forms:get_id2(X),
+    Module = list_to_atom(string:join(lists:reverse([ID|N]), "_")),
+    tktab_add(G, S, N, X, {tk_union, ictk:get_IR_ID(G, N, X), ID, [], [], Module}),
+    X;
 
 check(G, S, N, X) when is_record(X, const) ->
     ?STDDBG,
@@ -427,21 +439,6 @@ check(G, S, N, X) when is_record(X, const) ->
 	    end
     end;
 
-check(G, S, N, X) when is_record(X, const) ->
-    ?STDDBG,
-    case tk_base(G, S, N, ic_forms:get_type(X)) of
-	Err when element(1, Err) == error -> X;
-	TK ->
-	    check_const_tk(G, S, N, X, TK),
-	    case iceval:eval_const(G, S, N, TK, X#const.val) of
-		Err when element(1, Err) == error -> X;
-		Val ->
-		    V = iceval:get_val(Val),
-		    tktab_add(G, S, N, X, TK, V),
-		    X#const{val=V, tk=TK}
-	    end
-    end;
-
 check(G, S, N, X) when is_record(X, except) ->
     ?STDDBG,
     TK = tk(G, S, N, X),
@@ -795,9 +792,15 @@ tktab_add_id(G, S, N, X, Id, TK, Aux) ->
     Name = [Id | N],
     UName = mk_uppercase(Name),
     case ets:lookup(S, Name) of
-	[{_, forward, _, _}] when is_record(X, interface) -> ok;
-	[XX] when is_record(X, forward) andalso element(2, XX)==interface -> ok;
-	[_] -> ic_error:error(G, {multiply_defined, X});
+	[{_, forward, _, _}] when is_record(X, interface) ->
+	    ok;
+	[{_, constr_forward, _, _}] when is_record(X, union) orelse 
+					 is_record(X, struct) -> 
+	    ok;
+	[XX] when is_record(X, forward) andalso element(2, XX)==interface -> 
+	    ok;
+	[_] -> 
+	    ic_error:error(G, {multiply_defined, X});
 	[] ->
 	    case ets:lookup(S, UName) of
 		[] -> ok;