[m-rev.] for review: C foreign types

[Peter Ross]

On Mon, May 06, 2002 at 08:21:11PM +1000, Fergus Henderson wrote:
> > Index: foreign/compiler/make_hlds.m
> > @@ -1921,9 +1923,23 @@
> >  				module_info_set_types(Module0, Types, Module)
> >  			}
> >  		;
> > -			{ Module = Module0 },
> > -			multiple_def_error(Status, Name, Arity, "type",
> > -				Context, OrigContext, _)
> > +			{ merge_foreign_type_bodies(Body, Body_2, NewBody) }
> > +		->
> > +			{ hlds_data__set_type_defn(TVarSet_2, Params_2,
> > +				NewBody, Status, Context, T3) },
> > +			{ map__det_update(Types0, TypeCtor, T3, Types) },
> > +			{ module_info_set_types(Module0, Types, Module) }
> > +		;
> > +			% otherwise issue an error message if the second
> > +			% definition wasn't read while reading .opt files. 
> > +			{ Status = opt_imported }
> > +		->
> > +			{ Module = Module0 }
> > +		;
> > +				% XXX Fix this merge up.
> > +			{ module_info_incr_errors(Module0, Module) },
> > +			multiple_def_error(Status, Name, Arity, "type", Context,
> > +				OrigContext, _)
> 
> I don't understand the XXX comment here.
> 
> Otherwise that looks OK.
> 
Was working disconnected and buggered up the merge of the conflict, so
had to remember to check that I did it correctly.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------