comparison src/lrecord.h @ 4844:91b3d00e717f

Various cleanups for Dynarr code, from Unicode-internal ws dynarr.c: Add comment explaining Dynarr_largest() use. dynarr.c: In Dynarr_insert_many(), don't call Dynarr_resize() unless we actually need to resize, and note that an assert() that we are inserting at or below the current end could be wrong if code wants to access stuff between `len' and `largest'. dynarr.c: Don't just Dynarr_resize() to the right size; instead use Dynarr_reset() then Dynarr_add_many(), so that the 'len' and 'largest' and such get set properly. dynarr.c, faces.c, gutter.c, lisp.h, lread.c, lrecord.h, redisplay-output.c, redisplay.c: Rename Dynarr member 'cur' to 'len' since it's the length of the dynarr, not really a pointer to a "current insertion point". Use type_checking_assert() instead of just assert() in some places. Add additional assertions (Dynarr_verify*()) to check that we're being given positions within range. Use them in Dynarr_at, Dynarr_atp, etc. New Dynarr_atp_allow_end() for retrieving a pointer to a position that might be the element past the last one. New Dynarr_past_lastp() to retrieve a pointer to the position past the last one, using Dynarr_atp_allow_end(). Change code appropriately to use it. Rename Dynarr_end() to Dynarr_lastp() (pointer to the last element) for clarity, and change code appropriately to use it. Change code appropriately to use Dynarr_begin(). Rewrite Dynarr_add_many(). New version can accept a NULL pointer to mean "reserve space but don't put anything in it". Used by stack_like_malloc().
author Ben Wing <ben@xemacs.org>
date Wed, 13 Jan 2010 04:07:42 -0600
parents 8f1ee2d15784
children 6ef8256a020a 9f04877ce07e
comparison
equal deleted inserted replaced
4843:715b15990d0a 4844:91b3d00e717f
1130 #define XD_INDIRECT_VAL(code) ((-1 - (code)) & 255) 1130 #define XD_INDIRECT_VAL(code) ((-1 - (code)) & 255)
1131 #define XD_INDIRECT_DELTA(code) ((-1 - (code)) >> 8) 1131 #define XD_INDIRECT_DELTA(code) ((-1 - (code)) >> 8)
1132 1132
1133 #define XD_DYNARR_DESC(base_type, sub_desc) \ 1133 #define XD_DYNARR_DESC(base_type, sub_desc) \
1134 { XD_BLOCK_PTR, offsetof (base_type, base), XD_INDIRECT(1, 0), {sub_desc} },\ 1134 { XD_BLOCK_PTR, offsetof (base_type, base), XD_INDIRECT(1, 0), {sub_desc} },\
1135 { XD_INT, offsetof (base_type, cur) }, \ 1135 { XD_INT, offsetof (base_type, len) }, \
1136 { XD_INT_RESET, offsetof (base_type, max), XD_INDIRECT(1, 0) } \ 1136 { XD_INT_RESET, offsetof (base_type, max), XD_INDIRECT(1, 0) } \
1137 1137
1138 #ifdef NEW_GC 1138 #ifdef NEW_GC
1139 #define XD_LISP_DYNARR_DESC(base_type, sub_desc) \ 1139 #define XD_LISP_DYNARR_DESC(base_type, sub_desc) \
1140 { XD_LISP_OBJECT_BLOCK_PTR, offsetof (base_type, base), \ 1140 { XD_LISP_OBJECT_BLOCK_PTR, offsetof (base_type, base), \
1141 XD_INDIRECT(1, 0), {sub_desc} }, \ 1141 XD_INDIRECT(1, 0), {sub_desc} }, \
1142 { XD_INT, offsetof (base_type, cur) }, \ 1142 { XD_INT, offsetof (base_type, len) }, \
1143 { XD_INT_RESET, offsetof (base_type, max), XD_INDIRECT(1, 0) } 1143 { XD_INT_RESET, offsetof (base_type, max), XD_INDIRECT(1, 0) }
1144 #endif /* not NEW_GC */ 1144 #endif /* not NEW_GC */
1145 1145
1146 /* DEFINE_LRECORD_IMPLEMENTATION is for objects with constant size. 1146 /* DEFINE_LRECORD_IMPLEMENTATION is for objects with constant size.
1147 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION is for objects whose size varies. 1147 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION is for objects whose size varies.