pike.git / src / array.c

version» Context lines:

pike.git/src/array.c:1:   /*   || 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.c,v 1.146 2003/04/28 18:32:38 mast Exp $ + || $Id: array.c,v 1.147 2003/05/15 15:33:30 mast Exp $   */      #include "global.h"   #include "svalue.h"   #include "array.h"   #include "object.h"   #include "las.h"   #include "stralloc.h"   #include "interpret.h"   #include "opcodes.h"
pike.git/src/array.c:19:   #include "builtin_functions.h"   #include "pike_memory.h"   #include "gc.h"   #include "main.h"   #include "security.h"   #include "stuff.h"   #include "bignum.h"   #include "cyclic.h"   #include "multiset.h"    - RCSID("$Id: array.c,v 1.146 2003/04/28 18:32:38 mast Exp $"); + RCSID("$Id: array.c,v 1.147 2003/05/15 15:33:30 mast Exp $");      PMOD_EXPORT struct array empty_array=   {    PIKE_CONSTANT_MEMOBJ_INIT(1), /* Never free */    &weak_empty_array, /* Next */    &weak_shrink_empty_array, /* previous (circular) */    0, /* Size = 0 */    0, /* malloced Size = 0 */    0, /* no types */    0, /* no flags */
pike.git/src/array.c:246:    Pike_sp--;    }    END_CYCLIC();       return a;   }      PMOD_EXPORT void simple_array_index_no_free(struct svalue *s,    struct array *a,struct svalue *ind)   { -  INT32 i; +     switch(ind->type)    { -  case T_INT: -  i=ind->u.integer; -  if(i<0) i+=a->size; +  case T_INT: { +  INT_TYPE p = ind->u.integer; +  INT_TYPE i = p < 0 ? p + a->size : p;    if(i<0 || i>=a->size) {    struct svalue tmp;    tmp.type=T_ARRAY;    tmp.u.array=a;    if (a->size) { -  index_error(0,0,0,&tmp,ind,"Index %d is out of array range 0 - %d.\n", i, a->size-1); +  index_error(0,0,0,&tmp,ind, +  "Index %"PRINTPIKEINT"d is out of array range " +  "%"PRINTPTRDIFFT"d..%"PRINTPTRDIFFT"d.\n", +  p, -a->size, a->size-1);    } else { -  index_error(0,0,0,&tmp,ind,"Attempt to index the empty array with %d.\n", i); +  index_error(0,0,0,&tmp,ind, +  "Attempt to index the empty array with %"PRINTPIKEINT"d.\n", p);    }    }    array_index_no_free(s,a,i);    break; -  +  }       case T_STRING:    {    /* Set the type afterwards to avoid a clobbered svalue in case    * array_column throws. */    s->u.array = array_column (a, ind, 0);    s->type = T_ARRAY;    break;    }   
pike.git/src/array.c:300: Inside #if defined(PIKE_DEBUG)
   if(index<0 || index>=v->size)    Pike_fatal("Illegal index in low level free index routine.\n");   #endif       free_svalue(ITEM(v) + index);   }         PMOD_EXPORT void simple_set_index(struct array *a,struct svalue *ind,struct svalue *s)   { -  INT32 i; +     switch (ind->type) { -  case T_INT: -  i=ind->u.integer; -  if(i<0) i+=a->size; +  case T_INT: { +  INT_TYPE p = ind->u.integer; +  INT_TYPE i = p < 0 ? p + a->size : p;    if(i<0 || i>=a->size) {    if (a->size) { -  Pike_error("Index %d is out of array range 0 - %d.\n", i, a->size-1); +  Pike_error("Index %"PRINTPIKEINT"d is out of array range " +  "%"PRINTPTRDIFFT"d..%"PRINTPTRDIFFT"d.\n", +  p, -a->size, a->size-1);    } else { -  Pike_error("Attempt to index the empty array with %d.\n", i); +  Pike_error("Attempt to index the empty array with %"PRINTPIKEINT"d.\n", p);    }    }    array_set_index(a,i,s);    break; -  +  }       case T_STRING:    {    INT32 i, n;    check_stack(2);    Pike_sp++->type = T_VOID;    push_svalue(ind);    for (i = 0, n = a->size; i < n; i++) {    assign_svalue(Pike_sp-2, &a->item[i]);    assign_lvalue(Pike_sp-2, s);
pike.git/src/array.c:1256:   /*    * Get a pointer to the 'union anything' specified IF it is of the specified    * type. The 'union anything' may be changed, but not the type.    * The differance between this routine and the one above is that this takes    * the index as an svalue.    */   PMOD_EXPORT union anything *array_get_item_ptr(struct array *a,    struct svalue *ind,    TYPE_T t)   { -  INT_TYPE i; +  INT_TYPE i, p;    if(ind->type != T_INT)    Pike_error("Expected integer as array index, got %s.\n",    get_name_of_type (ind->type)); -  i=ind->u.integer; -  if(i<0) i+=a->size; +  p = ind->u.integer; +  i = p < 0 ? p + a->size : p;    if(i<0 || i>=a->size) {    if (a->size) { -  Pike_error("Index %"PRINTPIKEINT"d is out of " -  "array range 0 - %"PRINTPTRDIFFT"d.\n", i, a->size-1); +  Pike_error("Index %"PRINTPIKEINT"d is out of array range " +  "%"PRINTPTRDIFFT"d..%"PRINTPTRDIFFT"d.\n", +  p, -a->size, a->size-1);    } else { -  Pike_error("Attempt to index the empty array with %"PRINTPIKEINT"d.\n", i); +  Pike_error("Attempt to index the empty array with %"PRINTPIKEINT"d.\n", p);    }    }    return low_array_get_item_ptr(a,i,t);   }      /*    * organize an array of INT32 to specify how to zip two arrays together    * to maintain the order.    * the first item in this array is the size of the result    * the rest is n >= 0 for a[ n ]
pike.git/src/array.c:2295:    if (!(t = gc_mark_weak_svalues(a->item, a->size)))    t = a->type_field;       /* Ugly, but we are not allowed to change type_field    * at the same time as the array is being built...    * Actually we just need better primitives for building arrays.    */    if(!(a->type_field & BIT_UNFINISHED) || a->refs!=1)    a->type_field = t;    else -  a->type_field |= t; +  a->type_field |= t; /* There might be an additional BIT_INT. */       gc_assert_checked_as_weak(a);    }    else {    TYPE_FIELD t;    if ((t = gc_mark_svalues(ITEM(a), a->size))) {    if(!(a->type_field & BIT_UNFINISHED) || a->refs!=1)    a->type_field = t;    else    a->type_field |= t;