[m-dev.] for review: cleanup of type_ctor_infos, part 3

[Tyson Dowd]

> @@ -1607,16 +1643,106 @@
>  				** Copy arguments.
>  				*/
>  
> -			ML_copy_arguments_from_list_to_vector(info.arity,
> +                ML_copy_arguments_from_list_to_vector(construct_info.arity,
>  					ArgList, term_vector);
>  
>  				/* 
>  				** Add tag to new_data.
>  				*/
> -			new_data = (Word) MR_mkword(MR_mktag(info.primary_tag), 
> -				new_data);
> +                new_data = (Word) MR_mkword(MR_mktag(
> +                    construct_info.primary_tag), new_data);
> +            }
> +        } else {
> +            /* CHECKME XXXX */

is this supposed to be here?

>  void 
> -ML_expand(Word* type_info, Word *data_word_ptr, ML_Expand_Info *info)
> +ML_expand(Word* type_info, Word *data_word_ptr, ML_Expand_Info *expand_info)
>  {
>      MR_TypeCtorInfo	type_ctor_info;
> +
> +    type_ctor_info = MR_TYPEINFO_GET_TYPE_CTOR_INFO(type_info);
> +    expand_info->non_canonical_type = ( type_ctor_info->compare_pred ==
> +        ENTRY(mercury__builtin_compare_non_canonical_type_3_0) );

This is probably better done using MR_TYPECTOR_REP_*_USEREQ


(I didn't have a lot of time to go through this diff in detail).

Tyson.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------