xemacs-beta: src/lrecord.h comparison

comparison src/lrecord.h @ 647:b39c14581166

[xemacs-hg @ 2001-08-13 04:45:47 by ben] removal of unsigned, size_t, etc.

author	ben
date	Mon, 13 Aug 2001 04:46:48 +0000
parents	af57a77cbc92
children	fdefd0186b75

comparison

equal deleted inserted replaced

-:00c54252fe4f
+:b39c14581166
 lrecord_type_free, /* only used for "free" lrecords */
 lrecord_type_undefined, /* only used for debugging */
 lrecord_type_last_built_in_type /* must be last */
 };
-extern unsigned int lrecord_type_count;
+extern int lrecord_type_count;
 struct lrecord_implementation
 {
 const char *name;
 int (*remprop) (Lisp_Object obj, Lisp_Object prop);
 Lisp_Object (*plist) (Lisp_Object obj);
 /* Only one of `static_size' and `size_in_bytes_method' is non-0.
 If both are 0, this type is not instantiable by alloc_lcrecord(). */
-size_t static_size;
+Memory_Count static_size;
-size_t (*size_in_bytes_method) (const void *header);
+Memory_Count (*size_in_bytes_method) (const void *header);
 /* The (constant) index into lrecord_implementations_table */
 enum lrecord_type lrecord_type_index;
 /* A "basic" lrecord is any lrecord that's not an lcrecord, i.e.
 /* All the built-in lisp object types are enumerated in `enum lrecord_type'.
 Additional ones may be defined by a module (none yet).  We leave some
 room in `lrecord_implementations_table' for such new lisp object types. */
 #define MODULE_DEFINABLE_TYPE_COUNT 32
-extern const struct lrecord_implementation *lrecord_implementations_table[(unsigned int)lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT];
+extern const struct lrecord_implementation *lrecord_implementations_table[lrecord_type_last_built_in_type + MODULE_DEFINABLE_TYPE_COUNT];
 #define XRECORD_LHEADER_IMPLEMENTATION(obj) \
 LHEADER_IMPLEMENTATION (XRECORD_LHEADER (obj))
 #define LHEADER_IMPLEMENTATION(lh) lrecord_implementations_table[(lh)->type]
 XD_INT_RESET
 An integer which will be reset to a given value in the dump file.
-XD_SIZE_T
+XD_ELEMENT_COUNT
-size_t value.  Used for counts.
+Element_Count value.  Used for counts.
+XD_MEMORY_COUNT
+Memory_Count value.  Used for counts.
+XD_HASH_CODE
+Hash_Code value.  Used for the results of hashing functions.
 XD_INT
 int value.  Used for counts.
 XD_LONG
 Usable where  a "count" or "size"  is requested.  Gives the value of
 the element which is at line number 'line' in the description (count
 starts at zero) and adds delta to it.
 */
-enum lrecord_description_type {
+enum lrecord_description_type
+{
 XD_LISP_OBJECT_ARRAY,
 XD_LISP_OBJECT,
 XD_LO_LINK,
 XD_OPAQUE_PTR,
 XD_STRUCT_PTR,
 XD_OPAQUE_DATA_PTR,
 XD_C_STRING,
 XD_DOC_STRING,
 XD_INT_RESET,
-XD_SIZE_T,
+XD_MEMORY_COUNT,
+XD_ELEMENT_COUNT,
+XD_HASH_CODE,
 XD_INT,
 XD_LONG,
 XD_BYTECOUNT,
 XD_END,
 XD_SPECIFIER_END
 };
-struct lrecord_description {
+struct lrecord_description
+{
 enum lrecord_description_type type;
 int offset;
 EMACS_INT data1;
 const struct struct_description *data2;
 };
-struct struct_description {
+struct struct_description
-size_t size;
+{
+Memory_Count size;
 const struct lrecord_description *description;
 };
 #define XD_INDIRECT(val, delta) (-1-((val)|(delta<<8)))
 #define DEFINE_EXTERNAL_LRECORD_SEQUENCE_IMPLEMENTATION_WITH_PROPS(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,sizer,structtype) \
 MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,0,sizer,0,structtype)
 #define MAKE_EXTERNAL_LRECORD_IMPLEMENTATION(name,c_name,marker,printer,nuker,equal,hash,desc,getprop,putprop,remprop,plist,size,sizer,basic_p,structtype) \
 DECLARE_ERROR_CHECK_TYPECHECK(c_name, structtype)			\
-unsigned int lrecord_type_##c_name;					\
+int lrecord_type_##c_name;						\
 struct lrecord_implementation lrecord_##c_name =			\
 { name, marker, printer, nuker, equal, hash, desc,			\
 getprop, putprop, remprop, plist, size, sizer,			\
 lrecord_type_last_built_in_type, basic_p }
 #define LRECORDP(a) (XTYPE (a) == Lisp_Type_Record)
 #define XRECORD_LHEADER(a) ((struct lrecord_header *) XPNTR (a))
 #define RECORD_TYPEP(x, ty) \
-(LRECORDP (x) && (((unsigned int)(XRECORD_LHEADER (x)->type)) == ((unsigned int)(ty))))
+(LRECORDP (x) && (XRECORD_LHEADER (x)->type == (unsigned int) (ty)))
 /* Steps to create a new object:
 1. Declare the struct for your object in a header file somewhere.
 Remember that it must begin with
 return (structtype *) XPNTR (obj);				\
 }								\
 extern Lisp_Object Q##c_name##p
 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype)	       	\
-extern unsigned int lrecord_type_##c_name;                      \
+extern int lrecord_type_##c_name;				\
 extern struct lrecord_implementation lrecord_##c_name;		\
 INLINE_HEADER structtype *					\
 error_check_##c_name (Lisp_Object obj);				\
 INLINE_HEADER structtype *					\
 error_check_##c_name (Lisp_Object obj)				\
 # define DECLARE_LRECORD(c_name, structtype)			\
 extern Lisp_Object Q##c_name##p;				\
 extern const struct lrecord_implementation lrecord_##c_name
 # define DECLARE_EXTERNAL_LRECORD(c_name, structtype)		\
 extern Lisp_Object Q##c_name##p;				\
-extern unsigned int lrecord_type_##c_name;			\
+extern int lrecord_type_##c_name;				\
 extern struct lrecord_implementation lrecord_##c_name
 # define DECLARE_NONRECORD(c_name, type_enum, structtype)	\
 extern Lisp_Object Q##c_name##p
 # define XRECORD(x, c_name, structtype) ((structtype *) XPNTR (x))
 # define XNONRECORD(x, c_name, type_enum, structtype)		\
 #define CHECK_NONRECORD(x, lisp_enum, predicate) do {	\
 if (XTYPE (x) != lisp_enum)				\
 dead_wrong_type_argument (predicate, x);		\
 } while (0)
-void *alloc_lcrecord (size_t size, const struct lrecord_implementation *);
+void *alloc_lcrecord (Memory_Count size,
+		      const struct lrecord_implementation *);
 #define alloc_lcrecord_type(type, lrecord_implementation) \
 ((type *) alloc_lcrecord (sizeof (type), lrecord_implementation))
 /* Copy the data from one lcrecord structure into another, but don't

Mercurial > hg > xemacs-beta

comparison src/lrecord.h @ 647:b39c14581166