[m-rev.] diff: MR_TAG_NIL

[Zoltan Somogyi]

This is only for the main branch, not the release branch.

Zoltan.

runtime/mercury_tags.h:
	Avoid defining MR_TAG_NIL when it is not meaningful.

	Consolidate multiple occurrences of #ifdef MR_RESERVE_TAG.

cvs diff: Diffing .
Index: mercury_tags.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_tags.h,v
retrieving revision 1.16
diff -u -b -c -r1.16 mercury_tags.h
cvs diff: conflicting specifications of output style
*** mercury_tags.h	18 Feb 2002 07:01:21 -0000	1.16
--- mercury_tags.h	31 Jul 2002 15:36:34 -0000
***************
*** 94,99 ****
--- 94,101 ----
  #ifdef MR_RESERVE_TAG
    #define MR_RAW_TAG_VAR		0     /* for Prolog-style variables */
    #define MR_FIRST_UNRESERVED_RAW_TAG	1
+ 
+   #define MR_TAG_VAR			MR_mktag(MR_RAW_TAG_VAR)
  #else
    #define MR_FIRST_UNRESERVED_RAW_TAG	0
  #endif
***************
*** 105,124 ****
    ** rather than using tag bits.
    */
    #define MR_RAW_TAG_CONS       MR_FIRST_UNRESERVED_RAW_TAG
  #else
    #define MR_RAW_TAG_NIL        MR_FIRST_UNRESERVED_RAW_TAG
    #define MR_RAW_TAG_CONS       (MR_FIRST_UNRESERVED_RAW_TAG + 1)
- #endif
- 
- #define MR_RAW_UNIV_TAG         MR_FIRST_UNRESERVED_RAW_TAG
- 
- #define	MR_TAG_NIL		MR_mktag(MR_RAW_TAG_NIL)
- #define	MR_TAG_CONS		MR_mktag(MR_RAW_TAG_CONS)
  
! #ifdef MR_RESERVE_TAG
!   #define MR_TAG_VAR		MR_mktag(MR_RAW_TAG_VAR)
  #endif
  
  #define	MR_UNIV_TAG		MR_mktag(MR_RAW_UNIV_TAG)
  
  #if MR_TAGBITS > 0 || (MR_TAGBITS == 0 && \
--- 107,122 ----
    ** rather than using tag bits.
    */
    #define MR_RAW_TAG_CONS	MR_FIRST_UNRESERVED_RAW_TAG
+   #define MR_TAG_CONS		MR_mktag(MR_RAW_TAG_CONS)
  #else
    #define MR_RAW_TAG_NIL	MR_FIRST_UNRESERVED_RAW_TAG
    #define MR_RAW_TAG_CONS	(MR_FIRST_UNRESERVED_RAW_TAG + 1)
  
!   #define MR_TAG_NIL		MR_mktag(MR_RAW_TAG_NIL)
!   #define MR_TAG_CONS		MR_mktag(MR_RAW_TAG_CONS)
  #endif
  
+ #define MR_RAW_UNIV_TAG		MR_FIRST_UNRESERVED_RAW_TAG
  #define	MR_UNIV_TAG		MR_mktag(MR_RAW_UNIV_TAG)
  
  #if MR_TAGBITS > 0 || (MR_TAGBITS == 0 && \
cvs diff: Diffing GETOPT
cvs diff: Diffing machdeps
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------