out-of-line generic functions. The vectors are designed to
interoperate with the GTY machinery.
- Because of the different behaviour of objects and of pointers to
- objects, there are two flavours. One to deal with a vector of
+ Because of the different behavior of objects and of pointers to
+ objects, there are two flavors. One to deal with a vector of
pointers to objects, and one to deal with a vector of objects
themselves. Both of these pass pointers to objects around -- in
the former case the pointers are stored into the vector and in the
objects pointed to must be long lived, but when dealing with a
vector of objects, the source objects need not be.
+ There are both 'index' and 'iterate' accessors. The iterator
+ returns a boolean iteration condition and updates the iteration
+ variable passed by reference. Because the iterator will be
+ inlined, the address-of can be optimized away.
+
The vectors are implemented using the trailing array idiom, thus
they are not resizeable without changing the address of the vector
object itself. This means you cannot have variables or fields of
vector, if needed. Reallocation causes an exponential increase in
vector size. If you know you will be adding N elements, it would
be more efficient to use the reserve operation before adding the
- elements with the 'quick' operation.
+ elements with the 'quick' operation. You may also use the reserve
+ operation with a -1 operand, to gain control over exactly when
+ reallocation occurs.
You should prefer the push and pop operations, as they append and
remove from the end of the vector. If you need to remove several
element ordering 'ordered_remove', and one which does not
'unordered_remove'. The latter function copies the end element
into the removed slot, rather than invoke a memmove operation.
+ The 'lower_bound' function will determine where to place an item in the
+ array using insert that will maintain sorted order.
+
+ Both garbage collected and explicitly managed vector types are
+ creatable. The allocation mechanism is specified when the type is
+ defined, and is therefore part of the type.
- Vector types are defined using a DEF_VEC_x(TYPEDEF) macro, and
- variables of vector type are declared using a VEC(TYPEDEF)
- macro. The 'x' letter indicates whether TYPEDEF is a pointer (P) or
+ If you need to directly manipulate a vector, then the 'address'
+ accessor will return the address of the start of the vector. Also
+ the 'space' predicate will tell you whether there is spare capacity
+ in the vector. You will not normally need to use these two functions.
+
+ Vector types are defined using a DEF_VEC_{GC,MALLOC}_{O,P}(TYPEDEF)
+ macro, and variables of vector type are declared using a
+ VEC(TYPEDEF) macro. The tags GC and MALLOC specify the allocation
+ method -- garbage collected or explicit malloc/free calls. The
+ characters O and P indicate whether TYPEDEF is a pointer (P) or
object (O) type.
An example of their use would be,
- DEF_VEC_P(tree); // define a vector of tree pointers. This must
+ DEF_VEC_GC_P(tree); // define a gc'd vector of tree pointers. This must
// appear at file scope.
struct my_struct {
struct my_struct *s;
- if (VEC_length(tree,s)) { we have some contents }
- VEC_safe_push(tree,s,decl); // append some decl onto the end
- for (ix = 0; (t = VEC_iterate(tree,s,ix)); ix++)
- { do something with t }
+ if (VEC_length(tree,s->v)) { we have some contents }
+ VEC_safe_push(tree,s->v,decl); // append some decl onto the end
+ for (ix = 0; VEC_iterate(tree,s->v,ix,elt); ix++)
+ { do something with elt }
*/
(by taking its address), this is noted in the descriptions. */
/* Length of vector
- size_t VEC_T_length(const VEC(T) *v);
+ unsigned VEC_T_length(const VEC(T) *v);
Return the number of active elements in V. V can be NULL, in which
case zero is returned. */
-#define VEC_length(TDEF,V) (VEC_OP(TDEF,length)(V))
+
+#define VEC_length(TDEF,V) (VEC_OP(TDEF,length)(V))
/* Get the final element of the vector.
T VEC_T_last(VEC(T) *v); // Pointer
T *VEC_T_last(VEC(T) *v); // Object
Return the final element. If V is empty, abort. */
-#define VEC_last(TDEF,V) (VEC_OP(TDEF,last)(V))
+
+#define VEC_last(TDEF,V) (VEC_OP(TDEF,last)(V VEC_CHECK_INFO))
/* Index into vector
- T VEC_T_index(VEC(T) *v, size_t ix); // Pointer
- T *VEC_T_index(VEC(T) *v, size_t ix); // Object
+ T VEC_T_index(VEC(T) *v, unsigned ix); // Pointer
+ T *VEC_T_index(VEC(T) *v, unsigned ix); // Object
Return the IX'th element. If IX is outside the domain of V,
abort. */
-#define VEC_index(TDEF,V,I) (VEC_OP(TDEF,index)(V,I))
+
+#define VEC_index(TDEF,V,I) (VEC_OP(TDEF,index)(V,I VEC_CHECK_INFO))
/* Iterate over vector
- T VEC_T_index(VEC(T) *v, size_t ix); // Pointer
- T *VEC_T_index(VEC(T) *v, size_t ix); // Object
+ int VEC_T_iterate(VEC(T) *v, unsigned ix, T &ptr); // Pointer
+ int VEC_T_iterate(VEC(T) *v, unsigned ix, T *&ptr); // Object
- Return the IX'th element or NULL. Use this to iterate over the
- elements of a vector as follows,
+ Return iteration condition and update PTR to point to the IX'th
+ element. At the end of iteration, sets PTR to NULL. Use this to
+ iterate over the elements of a vector as follows,
- for (ix = 0; (ptr = VEC_iterate(T,v,ix)); ix++)
+ for (ix = 0; VEC_iterate(T,v,ix,ptr); ix++)
continue; */
-#define VEC_iterate(TDEF,V,I) (VEC_OP(TDEF,iterate)(V,I))
+
+#define VEC_iterate(TDEF,V,I,P) (VEC_OP(TDEF,iterate)(V,I,&(P)))
/* Allocate new vector.
- VEC(T) *VEC_T_alloc(size_t reserve);
+ VEC(T) *VEC_T_alloc(int reserve);
+
+ Allocate a new vector with space for RESERVE objects. If RESERVE
+ is <= 0, a default number of slots are created. */
- Allocate a new vector with space for RESERVE objects. */
-#define VEC_alloc(TDEF,A) (VEC_OP(TDEF,alloc)(A MEM_STAT_INFO))
+#define VEC_alloc(TDEF,A) (VEC_OP(TDEF,alloc)(A MEM_STAT_INFO))
+
+/* Free a vector.
+ void VEC_T_alloc(VEC(T) *&);
+
+ Free a vector and set it to NULL. */
+
+#define VEC_free(TDEF,V) (VEC_OP(TDEF,free)(&V))
/* Use these to determine the required size and initialization of a
vector embedded within another structure (as the final member).
- size_t VEC_T_embedded_size(size_t reserve);
- void VEC_T_embedded_init(VEC(T) *v, size_t reserve);
+ size_t VEC_T_embedded_size(int reserve);
+ void VEC_T_embedded_init(VEC(T) *v, int reserve);
These allow the caller to perform the memory allocation. */
-#define VEC_embedded_size(TDEF,A) (VEC_OP(TDEF,embedded_size)(A))
-#define VEC_embedded_init(TDEF,O,A) (VEC_OP(TDEF,embedded_init)(O,A))
+
+#define VEC_embedded_size(TDEF,A) (VEC_OP(TDEF,embedded_size)(A))
+#define VEC_embedded_init(TDEF,O,A) (VEC_OP(TDEF,embedded_init)(O,A))
+
+/* Determine if a vector has additional capacity.
+
+ int VEC_T_space (VEC(T) *v,int reserve)
+
+ If V has space for RESERVE additional entries, return nonzero. If
+ RESERVE is < 0, ensure there is at least one space slot. You
+ usually only need to use this if you are doing your own vector
+ reallocation, for instance on an embedded vector. This returns
+ nonzero in exactly the same circumstances that VEC_T_reserve
+ will. */
+
+#define VEC_space(TDEF,V,R) (VEC_OP(TDEF,space)(V,R))
/* Reserve space.
- void VEC_T_reserve(VEC(T) *&v, size_t reserve);
+ int VEC_T_reserve(VEC(T) *&v, int reserve);
+
+ Ensure that V has at least RESERVE slots available, if RESERVE is
+ >= 0. If RESERVE < 0, ensure that there is at least one spare
+ slot. These differ in their reallocation behavior, the first will
+ not create additional headroom, but the second mechanism will
+ perform the usual exponential headroom increase. Note this can
+ cause V to be reallocated. Returns nonzero iff reallocation
+ actually occurred. */
- Ensure that V has at least RESERVE slots available. Note this can
- cause V to be reallocated. */
-#define VEC_reserve(TDEF,V,R) (VEC_OP(TDEF,reserve)(&(V),R MEM_STAT_INFO))
+#define VEC_reserve(TDEF,V,R) (VEC_OP(TDEF,reserve)(&(V),R MEM_STAT_INFO))
/* Push object with no reallocation
T *VEC_T_quick_push (VEC(T) *v, T obj); // Pointer
Push a new element onto the end, returns a pointer to the slot
filled in. For object vectors, the new value can be NULL, in which
case NO initialization is performed. Aborts if there is
- insufficient space in the vector. */
-#define VEC_quick_push(TDEF,V,O) (VEC_OP(TDEF,quick_push)(V,O))
+ insufficient space in the vector. */
+
+#define VEC_quick_push(TDEF,V,O) \
+ (VEC_OP(TDEF,quick_push)(V,O VEC_CHECK_INFO))
/* Push object with reallocation
T *VEC_T_safe_push (VEC(T) *&v, T obj); // Pointer
Push a new element onto the end, returns a pointer to the slot
filled in. For object vectors, the new value can be NULL, in which
case NO initialization is performed. Reallocates V, if needed. */
-#define VEC_safe_push(TDEF,V,O) (VEC_OP(TDEF,safe_push)(&(V),O MEM_STAT_INFO))
+
+#define VEC_safe_push(TDEF,V,O) \
+ (VEC_OP(TDEF,safe_push)(&(V),O VEC_CHECK_INFO MEM_STAT_INFO))
/* Pop element off end
T VEC_T_pop (VEC(T) *v); // Pointer
Pop the last element off the end. Returns the element popped, for
pointer vectors. */
-#define VEC_pop(TDEF,V) (VEC_OP(TDEF,pop)(V))
+
+#define VEC_pop(TDEF,V) (VEC_OP(TDEF,pop)(V VEC_CHECK_INFO))
/* Truncate to specific length
- void VEC_T_truncate (VEC(T) *v, size_t len);
+ void VEC_T_truncate (VEC(T) *v, unsigned len);
Set the length as specified. This is an O(1) operation. */
-#define VEC_truncate(TDEF,V,I) (VEC_OP(TDEF,truncate)(V,I))
+
+#define VEC_truncate(TDEF,V,I) \
+ (VEC_OP(TDEF,truncate)(V,I VEC_CHECK_INFO))
/* Replace element
- T VEC_T_replace (VEC(T) *v, size_t ix, T val); // Pointer
- T *VEC_T_replace (VEC(T) *v, size_t ix, T *val); // Object
+ T VEC_T_replace (VEC(T) *v, unsigned ix, T val); // Pointer
+ T *VEC_T_replace (VEC(T) *v, unsigned ix, T *val); // Object
Replace the IXth element of V with a new value, VAL. For pointer
vectors returns the original value. For object vectors returns a
pointer to the new value. For object vectors the new value can be
NULL, in which case no overwriting of the slot is actually
performed. */
-#define VEC_replace(TDEF,V,I,O) (VEC_OP(TDEF,replace)(V,I,O))
+
+#define VEC_replace(TDEF,V,I,O) \
+ (VEC_OP(TDEF,replace)(V,I,O VEC_CHECK_INFO))
/* Insert object with no reallocation
- T *VEC_T_quick_insert (VEC(T) *v, size_t ix, T val); // Pointer
- T *VEC_T_quick_insert (VEC(T) *v, size_t ix, T *val); // Object
+ T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Pointer
+ T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T *val); // Object
Insert an element, VAL, at the IXth position of V. Return a pointer
to the slot created. For vectors of object, the new value can be
NULL, in which case no initialization of the inserted slot takes
place. Aborts if there is insufficient space. */
-#define VEC_quick_insert(TDEF,V,I,O) (VEC_OP(TDEF,quick_insert)(V,I,O))
+
+#define VEC_quick_insert(TDEF,V,I,O) \
+ (VEC_OP(TDEF,quick_insert)(V,I,O VEC_CHECK_INFO))
/* Insert object with reallocation
- T *VEC_T_safe_insert (VEC(T) *&v, size_t ix, T val); // Pointer
- T *VEC_T_safe_insert (VEC(T) *&v, size_t ix, T *val); // Object
+ T *VEC_T_safe_insert (VEC(T) *&v, unsigned ix, T val); // Pointer
+ T *VEC_T_safe_insert (VEC(T) *&v, unsigned ix, T *val); // Object
Insert an element, VAL, at the IXth position of V. Return a pointer
to the slot created. For vectors of object, the new value can be
NULL, in which case no initialization of the inserted slot takes
place. Reallocate V, if necessary. */
-#define VEC_safe_insert(TDEF,V,I,O) (VEC_OP(TDEF,safe_insert)(&(V),I,O MEM_STAT_INFO))
+
+#define VEC_safe_insert(TDEF,V,I,O) \
+ (VEC_OP(TDEF,safe_insert)(&(V),I,O VEC_CHECK_INFO MEM_STAT_INFO))
/* Remove element retaining order
- T VEC_T_ordered_remove (VEC(T) *v, size_t ix); // Pointer
- void VEC_T_ordered_remove (VEC(T) *v, size_t ix); // Object
+ T VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Pointer
+ void VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Object
Remove an element from the IXth position of V. Ordering of
- remaining elements is preserverd. For pointer vectors returns the
+ remaining elements is preserved. For pointer vectors returns the
removed object. This is an O(N) operation due to a memmove. */
-#define VEC_ordered_remove(TDEF,V,I) (VEC_OP(TDEF,ordered_remove)(V,I))
+
+#define VEC_ordered_remove(TDEF,V,I) \
+ (VEC_OP(TDEF,ordered_remove)(V,I VEC_CHECK_INFO))
/* Remove element destroying order
- T VEC_T_unordered_remove (VEC(T) *v, size_t ix); // Pointer
- void VEC_T_unordered_remove (VEC(T) *v, size_t ix); // Object
+ T VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Pointer
+ void VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Object
Remove an element from the IXth position of V. Ordering of
remaining elements is destroyed. For pointer vectors returns the
removed object. This is an O(1) operation. */
-#define VEC_unordered_remove(TDEF,V,I) (VEC_OP(TDEF,unordered_remove)(V,I))
+
+#define VEC_unordered_remove(TDEF,V,I) \
+ (VEC_OP(TDEF,unordered_remove)(V,I VEC_CHECK_INFO))
+
+/* Get the address of the array of elements
+ T *VEC_T_address (VEC(T) v)
+
+ If you need to directly manipulate the array (for instance, you
+ want to feed it to qsort), use this accessor. */
+
+#define VEC_address(TDEF,V) (VEC_OP(TDEF,address)(V))
+
+/* Find the first index in the vector not less than the object.
+ unsigned VEC_T_lower_bound (VEC(T) *v, const T val,
+ bool (*lessthan) (const T, const T)); // Pointer
+ unsigned VEC_T_lower_bound (VEC(T) *v, const T *val,
+ bool (*lessthan) (const T*, const T*)); // Object
+
+ Find the first position in which VAL could be inserted without
+ changing the ordering of V. LESSTHAN is a function that returns
+ true if the first argument is strictly less than the second. */
+
+#define VEC_lower_bound(TDEF,V,O,LT) \
+ (VEC_OP(TDEF,lower_bound)(V,O,LT VEC_CHECK_INFO))
#if !IN_GENGTYPE
/* Reallocate an array of elements with prefix. */
-extern void *vec_p_reserve (void *, size_t MEM_STAT_DECL);
-extern void *vec_o_reserve (void *, size_t, size_t, size_t MEM_STAT_DECL);
+extern void *vec_gc_p_reserve (void *, int MEM_STAT_DECL);
+extern void *vec_gc_o_reserve (void *, int, size_t, size_t MEM_STAT_DECL);
+extern void vec_gc_free (void *);
+extern void *vec_heap_p_reserve (void *, int MEM_STAT_DECL);
+extern void *vec_heap_o_reserve (void *, int, size_t, size_t MEM_STAT_DECL);
+extern void vec_heap_free (void *);
#if ENABLE_CHECKING
-extern void vec_assert_fail (const char *, const char *,
- const char *, size_t, const char *)
- ATTRIBUTE_NORETURN;
-#define VEC_ASSERT_FAIL(OP,VEC) \
- vec_assert_fail (OP,#VEC,__FILE__,__LINE__,__FUNCTION__)
+#define VEC_CHECK_INFO ,__FILE__,__LINE__,__FUNCTION__
+#define VEC_CHECK_DECL ,const char *file_,unsigned line_,const char *function_
+#define VEC_CHECK_PASS ,file_,line_,function_
#define VEC_ASSERT(EXPR,OP,TDEF) \
(void)((EXPR) ? 0 : (VEC_ASSERT_FAIL(OP,VEC(TDEF)), 0))
+
+extern void vec_assert_fail (const char *, const char * VEC_CHECK_DECL)
+ ATTRIBUTE_NORETURN;
+#define VEC_ASSERT_FAIL(OP,VEC) vec_assert_fail (OP,#VEC VEC_CHECK_PASS)
#else
+#define VEC_CHECK_INFO
+#define VEC_CHECK_DECL
+#define VEC_CHECK_PASS
#define VEC_ASSERT(EXPR,OP,TYPE) (void)(EXPR)
#endif
#define VEC_TDEF(TDEF) \
typedef struct VEC (TDEF) GTY(()) \
{ \
- size_t num; \
- size_t alloc; \
+ unsigned num; \
+ unsigned alloc; \
TDEF GTY ((length ("%h.num"))) vec[1]; \
} VEC (TDEF)
/* Vector of pointer to object. */
#if IN_GENGTYPE
-{"DEF_VEC_P", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL},
+{"DEF_VEC_GC_P", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL},
+{"DEF_VEC_MALLOC_P", "", NULL},
#else
+#define DEF_VEC_GC_P(TDEF) DEF_VEC_P(TDEF,gc)
+#define DEF_VEC_MALLOC_P(TDEF) DEF_VEC_P(TDEF,heap)
-#define DEF_VEC_P(TDEF) \
+#define DEF_VEC_P(TDEF,a) \
VEC_TDEF (TDEF); \
\
-static inline size_t VEC_OP (TDEF,length) \
+static inline unsigned VEC_OP (TDEF,length) \
(const VEC (TDEF) *vec_) \
{ \
return vec_ ? vec_->num : 0; \
} \
\
static inline TDEF VEC_OP (TDEF,last) \
- (const VEC (TDEF) *vec_) \
+ (const VEC (TDEF) *vec_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (vec_ && vec_->num, "last", TDEF); \
\
} \
\
static inline TDEF VEC_OP (TDEF,index) \
- (const VEC (TDEF) *vec_, size_t ix_) \
+ (const VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (vec_ && ix_ < vec_->num, "index", TDEF); \
\
return vec_->vec[ix_]; \
} \
\
-static inline TDEF VEC_OP (TDEF,iterate) \
- (const VEC (TDEF) *vec_, size_t ix_) \
+static inline int VEC_OP (TDEF,iterate) \
+ (const VEC (TDEF) *vec_, unsigned ix_, TDEF *ptr) \
+{ \
+ if (vec_ && ix_ < vec_->num) \
+ { \
+ *ptr = vec_->vec[ix_]; \
+ return 1; \
+ } \
+ else \
+ { \
+ *ptr = 0; \
+ return 0; \
+ } \
+} \
+ \
+static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \
+ (int alloc_ MEM_STAT_DECL) \
{ \
- return vec_ && ix_ < vec_->num ? vec_->vec[ix_] : NULL; \
+ return (VEC (TDEF) *) vec_##a##_p_reserve (NULL, alloc_ - !alloc_ PASS_MEM_STAT);\
} \
\
-static inline VEC (TDEF) *VEC_OP (TDEF,alloc MEM_STAT_DECL) \
- (size_t alloc_) \
+static inline void VEC_OP (TDEF,free) \
+ (VEC (TDEF) **vec_) \
{ \
- return vec_p_reserve (NULL, alloc_ - !alloc_ PASS_MEM_STAT); \
+ vec_##a##_free (*vec_); \
+ *vec_ = NULL; \
} \
\
static inline size_t VEC_OP (TDEF,embedded_size) \
- (size_t alloc_) \
+ (int alloc_) \
{ \
return offsetof (VEC(TDEF),vec) + alloc_ * sizeof(TDEF); \
} \
\
static inline void VEC_OP (TDEF,embedded_init) \
- (VEC (TDEF) *vec_, size_t alloc_) \
+ (VEC (TDEF) *vec_, int alloc_) \
{ \
vec_->num = 0; \
vec_->alloc = alloc_; \
} \
\
-static inline void VEC_OP (TDEF,reserve) \
- (VEC (TDEF) **vec_, size_t alloc_ MEM_STAT_DECL) \
+static inline int VEC_OP (TDEF,space) \
+ (VEC (TDEF) *vec_, int alloc_) \
{ \
- *vec_ = vec_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \
+ return vec_ ? ((vec_)->alloc - (vec_)->num \
+ >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \
+} \
+ \
+static inline int VEC_OP (TDEF,reserve) \
+ (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \
+{ \
+ int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \
+ \
+ if (extend) \
+ *vec_ = (VEC (TDEF) *) vec_##a##_p_reserve (*vec_, alloc_ PASS_MEM_STAT); \
+ \
+ return extend; \
} \
\
static inline TDEF *VEC_OP (TDEF,quick_push) \
- (VEC (TDEF) *vec_, TDEF obj_) \
+ (VEC (TDEF) *vec_, TDEF obj_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
} \
\
static inline TDEF *VEC_OP (TDEF,safe_push) \
- (VEC (TDEF) **vec_, TDEF obj_ MEM_STAT_DECL) \
+ (VEC (TDEF) **vec_, TDEF obj_ VEC_CHECK_DECL MEM_STAT_DECL) \
{ \
- if (!*vec_ || (*vec_)->num == (*vec_)->alloc) \
- VEC_OP (TDEF,reserve) (vec_, ~(size_t)0 PASS_MEM_STAT); \
+ VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \
\
- return VEC_OP (TDEF,quick_push) (*vec_, obj_); \
+ return VEC_OP (TDEF,quick_push) (*vec_, obj_ VEC_CHECK_PASS); \
} \
\
static inline TDEF VEC_OP (TDEF,pop) \
- (VEC (TDEF) *vec_) \
+ (VEC (TDEF) *vec_ VEC_CHECK_DECL) \
{ \
TDEF obj_; \
\
} \
\
static inline void VEC_OP (TDEF,truncate) \
- (VEC (TDEF) *vec_, size_t size_) \
+ (VEC (TDEF) *vec_, unsigned size_ VEC_CHECK_DECL) \
{ \
- VEC_ASSERT (vec_->num >= size_, "truncate", TDEF); \
- vec_->num = size_; \
+ VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", TDEF); \
+ if (vec_) \
+ vec_->num = size_; \
} \
\
static inline TDEF VEC_OP (TDEF,replace) \
- (VEC (TDEF) *vec_, size_t ix_, TDEF obj_) \
+ (VEC (TDEF) *vec_, unsigned ix_, TDEF obj_ VEC_CHECK_DECL) \
{ \
TDEF old_obj_; \
\
return old_obj_; \
} \
\
-static inline TDEF *VEC_OP (TDEF,quick_insert) \
- (VEC (TDEF) *vec_, size_t ix_, TDEF obj_) \
+static inline unsigned VEC_OP (TDEF,lower_bound) \
+ (VEC (TDEF) *vec_, const TDEF obj_, bool (*lessthan_)(const TDEF, const TDEF) VEC_CHECK_DECL) \
+{ \
+ unsigned int len_ = VEC_OP (TDEF, length) (vec_); \
+ unsigned int half_, middle_; \
+ unsigned int first_ = 0; \
+ while (len_ > 0) \
+ { \
+ TDEF middle_elem_; \
+ half_ = len_ >> 1; \
+ middle_ = first_; \
+ middle_ += half_; \
+ middle_elem_ = VEC_OP (TDEF, index) (vec_, middle_ VEC_CHECK_PASS); \
+ if (lessthan_ (middle_elem_, obj_)) \
+ { \
+ first_ = middle_; \
+ ++first_; \
+ len_ = len_ - half_ - 1; \
+ } \
+ else \
+ len_ = half_; \
+ } \
+ return first_; \
+} \
+ \
+static inline TDEF *VEC_OP (TDEF,quick_insert) \
+ (VEC (TDEF) *vec_, unsigned ix_, TDEF obj_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
VEC_ASSERT (vec_->num < vec_->alloc, "insert", TDEF); \
VEC_ASSERT (ix_ <= vec_->num, "insert", TDEF); \
slot_ = &vec_->vec[ix_]; \
- memmove (slot_ + 1, slot_, vec_->num++ - ix_); \
+ memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (TDEF)); \
*slot_ = obj_; \
\
return slot_; \
} \
\
static inline TDEF *VEC_OP (TDEF,safe_insert) \
- (VEC (TDEF) **vec_, size_t ix_, TDEF obj_ MEM_STAT_DECL) \
+ (VEC (TDEF) **vec_, unsigned ix_, TDEF obj_ \
+ VEC_CHECK_DECL MEM_STAT_DECL) \
{ \
- if (!*vec_ || (*vec_)->num == (*vec_)->alloc) \
- VEC_OP (TDEF,reserve) (vec_, ~(size_t)0 PASS_MEM_STAT); \
+ VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \
\
- return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_); \
+ return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_ VEC_CHECK_PASS); \
} \
\
static inline TDEF VEC_OP (TDEF,ordered_remove) \
- (VEC (TDEF) *vec_, size_t ix_) \
+ (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
TDEF obj_; \
VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \
slot_ = &vec_->vec[ix_]; \
obj_ = *slot_; \
- memmove (slot_, slot_ + 1, --vec_->num - ix_); \
+ memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (TDEF)); \
\
return obj_; \
} \
\
static inline TDEF VEC_OP (TDEF,unordered_remove) \
- (VEC (TDEF) *vec_, size_t ix_) \
+ (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
TDEF obj_; \
return obj_; \
} \
\
+static inline TDEF *VEC_OP (TDEF,address) \
+ (VEC (TDEF) *vec_) \
+{ \
+ return vec_ ? vec_->vec : 0; \
+} \
+ \
struct vec_swallow_trailing_semi
#endif
/* Vector of object. */
#if IN_GENGTYPE
-{"DEF_VEC_O", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL},
+{"DEF_VEC_GC_O", VEC_STRINGIFY (VEC_TDEF (#)) ";", NULL},
+{"DEF_VEC_MALLOC_O", "", NULL},
#else
-#define DEF_VEC_O(TDEF) \
+#define DEF_VEC_GC_O(TDEF) DEF_VEC_O(TDEF,gc)
+#define DEF_VEC_MALLOC_O(TDEF) DEF_VEC_O(TDEF,heap)
+
+#define DEF_VEC_O(TDEF,a) \
VEC_TDEF (TDEF); \
\
-static inline size_t VEC_OP (TDEF,length) \
+static inline unsigned VEC_OP (TDEF,length) \
(const VEC (TDEF) *vec_) \
{ \
return vec_ ? vec_->num : 0; \
} \
\
static inline TDEF *VEC_OP (TDEF,last) \
- (VEC (TDEF) *vec_) \
+ (VEC (TDEF) *vec_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (vec_ && vec_->num, "last", TDEF); \
\
} \
\
static inline TDEF *VEC_OP (TDEF,index) \
- (VEC (TDEF) *vec_, size_t ix_) \
+ (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (vec_ && ix_ < vec_->num, "index", TDEF); \
\
return &vec_->vec[ix_]; \
} \
\
-static inline TDEF *VEC_OP (TDEF,iterate) \
- (VEC (TDEF) *vec_, size_t ix_) \
+static inline int VEC_OP (TDEF,iterate) \
+ (VEC (TDEF) *vec_, unsigned ix_, TDEF **ptr) \
{ \
- return vec_ && ix_ < vec_->num ? &vec_->vec[ix_] : NULL; \
+ if (vec_ && ix_ < vec_->num) \
+ { \
+ *ptr = &vec_->vec[ix_]; \
+ return 1; \
+ } \
+ else \
+ { \
+ *ptr = 0; \
+ return 0; \
+ } \
} \
\
static inline VEC (TDEF) *VEC_OP (TDEF,alloc) \
- (size_t alloc_ MEM_STAT_DECL) \
+ (int alloc_ MEM_STAT_DECL) \
+{ \
+ return (VEC (TDEF) *) vec_##a##_o_reserve (NULL, alloc_ - !alloc_, \
+ offsetof (VEC(TDEF),vec), sizeof (TDEF)\
+ PASS_MEM_STAT); \
+} \
+ \
+static inline void VEC_OP (TDEF,free) \
+ (VEC (TDEF) **vec_) \
{ \
- return vec_o_reserve (NULL, alloc_ - !alloc_, \
- offsetof (VEC(TDEF),vec), sizeof (TDEF) \
- PASS_MEM_STAT); \
+ vec_##a##_free (*vec_); \
+ *vec_ = NULL; \
} \
\
static inline size_t VEC_OP (TDEF,embedded_size) \
- (size_t alloc_) \
+ (int alloc_) \
{ \
return offsetof (VEC(TDEF),vec) + alloc_ * sizeof(TDEF); \
} \
\
static inline void VEC_OP (TDEF,embedded_init) \
- (VEC (TDEF) *vec_, size_t alloc_) \
+ (VEC (TDEF) *vec_, int alloc_) \
{ \
vec_->num = 0; \
vec_->alloc = alloc_; \
} \
\
-static inline void VEC_OP (TDEF,reserve) \
- (VEC (TDEF) **vec_, size_t alloc_ MEM_STAT_DECL) \
+static inline int VEC_OP (TDEF,space) \
+ (VEC (TDEF) *vec_, int alloc_) \
{ \
- *vec_ = vec_o_reserve (*vec_, alloc_, \
- offsetof (VEC(TDEF),vec), sizeof (TDEF) \
- PASS_MEM_STAT); \
+ return vec_ ? ((vec_)->alloc - (vec_)->num \
+ >= (unsigned)(alloc_ < 0 ? 1 : alloc_)) : !alloc_; \
+} \
+ \
+static inline int VEC_OP (TDEF,reserve) \
+ (VEC (TDEF) **vec_, int alloc_ MEM_STAT_DECL) \
+{ \
+ int extend = !VEC_OP (TDEF,space) (*vec_, alloc_); \
+ \
+ if (extend) \
+ *vec_ = (VEC (TDEF) *) vec_##a##_o_reserve (*vec_, alloc_, \
+ offsetof (VEC(TDEF),vec), sizeof (TDEF) \
+ PASS_MEM_STAT); \
+ \
+ return extend; \
} \
\
static inline TDEF *VEC_OP (TDEF,quick_push) \
- (VEC (TDEF) *vec_, const TDEF *obj_) \
+ (VEC (TDEF) *vec_, const TDEF *obj_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
} \
\
static inline TDEF *VEC_OP (TDEF,safe_push) \
- (VEC (TDEF) **vec_, const TDEF *obj_ MEM_STAT_DECL) \
+ (VEC (TDEF) **vec_, const TDEF *obj_ VEC_CHECK_DECL MEM_STAT_DECL) \
{ \
- if (!*vec_ || (*vec_)->num == (*vec_)->alloc) \
- VEC_OP (TDEF,reserve) (vec_, ~(size_t)0 PASS_MEM_STAT); \
+ VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \
\
- return VEC_OP (TDEF,quick_push) (*vec_, obj_); \
+ return VEC_OP (TDEF,quick_push) (*vec_, obj_ VEC_CHECK_PASS); \
} \
\
static inline void VEC_OP (TDEF,pop) \
- (VEC (TDEF) *vec_) \
+ (VEC (TDEF) *vec_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (vec_->num, "pop", TDEF); \
--vec_->num; \
} \
\
static inline void VEC_OP (TDEF,truncate) \
- (VEC (TDEF) *vec_, size_t size_) \
+ (VEC (TDEF) *vec_, unsigned size_ VEC_CHECK_DECL) \
{ \
- VEC_ASSERT (vec_->num >= size_, "truncate", TDEF); \
- vec_->num = size_; \
+ VEC_ASSERT (vec_ ? vec_->num >= size_ : !size_, "truncate", TDEF); \
+ if (vec_) \
+ vec_->num = size_; \
} \
\
static inline TDEF *VEC_OP (TDEF,replace) \
- (VEC (TDEF) *vec_, size_t ix_, const TDEF *obj_) \
+ (VEC (TDEF) *vec_, unsigned ix_, const TDEF *obj_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
return slot_; \
} \
\
-static inline TDEF *VEC_OP (TDEF,quick_insert) \
- (VEC (TDEF) *vec_, size_t ix_, const TDEF *obj_) \
+static inline unsigned VEC_OP (TDEF,lower_bound) \
+ (VEC (TDEF) *vec_, const TDEF *obj_, bool (*lessthan_)(const TDEF *, const TDEF *) VEC_CHECK_DECL) \
+{ \
+ unsigned int len_ = VEC_OP (TDEF, length) (vec_); \
+ unsigned int half_, middle_; \
+ unsigned int first_ = 0; \
+ while (len_ > 0) \
+ { \
+ TDEF *middle_elem_; \
+ half_ = len_ >> 1; \
+ middle_ = first_; \
+ middle_ += half_; \
+ middle_elem_ = VEC_OP (TDEF, index) (vec_, middle_ VEC_CHECK_PASS); \
+ if (lessthan_ (middle_elem_, obj_)) \
+ { \
+ first_ = middle_; \
+ ++first_; \
+ len_ = len_ - half_ - 1; \
+ } \
+ else \
+ len_ = half_; \
+ } \
+ return first_; \
+} \
+ \
+static inline TDEF *VEC_OP (TDEF,quick_insert) \
+ (VEC (TDEF) *vec_, unsigned ix_, const TDEF *obj_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
VEC_ASSERT (vec_->num < vec_->alloc, "insert", TDEF); \
VEC_ASSERT (ix_ <= vec_->num, "insert", TDEF); \
slot_ = &vec_->vec[ix_]; \
- memmove (slot_ + 1, slot_, vec_->num++ - ix_); \
+ memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (TDEF)); \
if (obj_) \
*slot_ = *obj_; \
\
} \
\
static inline TDEF *VEC_OP (TDEF,safe_insert) \
- (VEC (TDEF) **vec_, size_t ix_, const TDEF *obj_ MEM_STAT_DECL) \
+ (VEC (TDEF) **vec_, unsigned ix_, const TDEF *obj_ \
+ VEC_CHECK_DECL MEM_STAT_DECL) \
{ \
- if (!*vec_ || (*vec_)->num == (*vec_)->alloc) \
- VEC_OP (TDEF,reserve) (vec_, ~(size_t)0 PASS_MEM_STAT); \
+ VEC_OP (TDEF,reserve) (vec_, -1 PASS_MEM_STAT); \
\
- return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_); \
+ return VEC_OP (TDEF,quick_insert) (*vec_, ix_, obj_ VEC_CHECK_PASS); \
} \
\
static inline void VEC_OP (TDEF,ordered_remove) \
- (VEC (TDEF) *vec_, size_t ix_) \
+ (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
TDEF *slot_; \
\
VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \
slot_ = &vec_->vec[ix_]; \
- memmove (slot_, slot_ + 1, --vec_->num - ix_); \
+ memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (TDEF)); \
} \
\
static inline void VEC_OP (TDEF,unordered_remove) \
- (VEC (TDEF) *vec_, size_t ix_) \
+ (VEC (TDEF) *vec_, unsigned ix_ VEC_CHECK_DECL) \
{ \
VEC_ASSERT (ix_ < vec_->num, "remove", TDEF); \
vec_->vec[ix_] = vec_->vec[--vec_->num]; \
} \
\
+static inline TDEF *VEC_OP (TDEF,address) \
+ (VEC (TDEF) *vec_) \
+{ \
+ return vec_ ? vec_->vec : 0; \
+} \
+ \
struct vec_swallow_trailing_semi
#endif
OSDN Git Service
