pike.git/ src/ array.h

2008-07-04

2008-07-04 15:53:14 by Martin Stjernholm <mast@lysator.liu.se>

• 2ccb0279e22e5e89441159532d47b7c0b9129c79 (23 lines) (+18/-5) ^{[ Show | Annotate ]}
  Branch: 7.9

Optimized the AGGREGATE macros a little, and avoid fiddling with
type_field on the static empty arrays.

Rev: src/array.h:1.77

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: array.h,v 1.76 2008/07/01 09:36:29 mast Exp $ + || $Id: array.h,v 1.77 2008/07/04 15:53:14 mast Exp $   */      #ifndef ARRAY_H
237:    struct svalue *base__; \    push_array(allocate_array_no_init(0, (estimated_size))); \    base__ = Pike_sp; \ +  if (base__[-1].u.array->malloced_size) \    base__[-1].u.array->type_field = (BIT_MIXED | BIT_UNFINISHED);      #define DO_AGGREGATE_ARRAY(max_keep_on_stack) \    do { \    ptrdiff_t diff__ = Pike_sp - base__; \ -  if (!(max_keep_on_stack) || diff__ > (max_keep_on_stack)) { \ +  if (diff__ > (max_keep_on_stack)) { \    INT32 oldsize__ = base__[-1].u.array->size; \    ACCEPT_UNFINISHED_TYPE_FIELDS { \    base__[-1].u.array = \
257:    } while (0)      #define END_AGGREGATE_ARRAY \ -  DO_AGGREGATE_ARRAY(0); \ +     DO_IF_DEBUG(if (Pike_sp[-1].type != T_ARRAY) { \    Pike_fatal("Lost track of aggregated array.\n"); \    }); \ -  array_fix_type_field(Pike_sp[-1].u.array); \ +  { \ +  ptrdiff_t diff__ = Pike_sp - base__; \ +  if (!diff__) { \ +  if (base__[-1].u.array->size) { \ +  free_array (base__[-1].u.array); \ +  add_ref (base__[-1].u.array = &empty_array); \ +  } \ +  } \ +  else \ +  DO_AGGREGATE_ARRAY (0); \ +  if (base__[-1].u.array->type_field & BIT_UNFINISHED) \ +  array_fix_type_field(Pike_sp[-1].u.array); \ +  } \   } while (0)