2004-04-15
2004-04-15 00:12:21 by Martin Nilsson <mani@lysator.liu.se>
-
fa666b313bdcdf4826c628fef0c235db690a4b37
(19 lines)
(+11/-8)
[
Show
| Annotate
]
Branch: 7.9
MAPPING_LOOP -> NEW_MAPPING_LOOP
Rev: src/builtin_functions.c:1.540
Rev: src/mapping.c:1.180
Rev: src/modules/Oracle/oracle.c:1.82
Rev: src/modules/Parser/html.c:1.172
Rev: src/modules/Perl/perlmod.c:1.36
Rev: src/modules/_Image_JPEG/image_jpeg.c:1.65
Rev: src/operators.c:1.189
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: builtin_functions.c,v 1.539 2004/04/13 06:43:24 jonasw Exp $
+ || $Id: builtin_functions.c,v 1.540 2004/04/15 00:12:21 nilsson Exp $
*/
#include "global.h"
- RCSID("$Id: builtin_functions.c,v 1.539 2004/04/13 06:43:24 jonasw Exp $");
+ RCSID("$Id: builtin_functions.c,v 1.540 2004/04/15 00:12:21 nilsson Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
4823:
/* Initialize the min array */
for (i = 0; i < arr->size; i++) {
- struct mapping *m;
- /* e and k are used by MAPPING_LOOP() */
+ struct mapping_data *md;
+ /* e and k are used by NEW_MAPPING_LOOP() */
INT32 e;
struct keypair *k;
INT_TYPE low = MAX_INT_TYPE;
4833: Inside #if defined(PIKE_DEBUG)
Pike_error("interleave_array(): Element %d is not a mapping!\n", i);
}
#endif /* PIKE_DEBUG */
- m = ITEM(arr)[i].u.mapping;
- MAPPING_LOOP(m) {
+ md = ITEM(arr)[i].u.mapping->data;
+ NEW_MAPPING_LOOP(md) {
if (k->ind.type != T_INT) {
Pike_error("interleave_array(): Index not an integer in mapping %d!\n", i);
}
4885:
int j = ITEM(order)[i].u.integer;
int offset = 0;
struct mapping *m;
+ struct mapping_data *md;
INT32 e;
struct keypair *k;
4900:
minfree = offset;
}
+ md = m->data;
ok = 0;
while (!ok) {
ok = 1;
- MAPPING_LOOP(m) {
+ NEW_MAPPING_LOOP(md) {
int ind = k->ind.u.integer;
if (tab[offset + ind]) {
ok = 0;
4912:
}
}
}
- MAPPING_LOOP(m) {
+ NEW_MAPPING_LOOP(md) {
tab[offset + k->ind.u.integer] = 1;
}
while(tab[minfree]) {