2004-11-12
2004-11-12 13:45:30 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
9606ebebee6907fc3e0a2dc1b9748554e5f4bcae
(33 lines)
(+13/-20)
[
Show
| Annotate
]
Branch: 7.9
Updated use of Pike_error().
Rev: src/builtin.cmod:1.173
Rev: src/cpp.c:1.151
Rev: src/dynamic_load.c:1.86
Rev: src/encode.c:1.224
Rev: src/interpret.c:1.359
Rev: src/modules/Gmp/mpf.cmod:1.30
Rev: src/modules/Postgres/postgres.c:1.40
Rev: src/modules/_Image_FreeType/freetype.c:1.25
Rev: src/modules/files/efuns.c:1.153
Rev: src/modules/files/file.c:1.332
Rev: src/object.c:1.259
Rev: src/operators.c:1.199
Rev: src/post_modules/SDL/SDL.cmod:1.27
Rev: src/post_modules/SQLite/sqlite.cmod:1.14
Rev: src/post_modules/_ADT/circular_list.cmod:1.15
Rev: src/post_modules/_ADT/sequence.cmod:1.14
Rev: src/signal_handler.c:1.311
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: operators.c,v 1.198 2004/10/30 11:38:27 mast Exp $
+ || $Id: operators.c,v 1.199 2004/11/12 13:20:15 grubba Exp $
*/
#include "global.h"
89:
to->u.integer=i;
break;
}else{
- if (ind->type == T_STRING && !ind->u.string->size_shift)
- Pike_error ("Expected integer as string index, got \"%s\".\n",
- ind->u.string->str);
+ if (ind->type == T_STRING)
+ Pike_error ("Expected integer as string index, got \"%S\".\n",
+ ind->u.string);
else
Pike_error ("Expected integer as string index, got %s.\n",
get_name_of_type (ind->type));
120: Inside #if defined(AUTO_BIGNUM)
index_no_free(to, what, ind);
if(IS_UNDEFINED(to)) {
if (val) {
- if (!ind->u.string->size_shift)
+
Pike_error("Indexing the integer %"PRINTPIKEINT"d "
- "with unknown method \"%s\".\n",
- val, ind->u.string->str);
- else
- Pike_error("Indexing the integer %"PRINTPIKEINT"d "
- "with a wide string.\n",
- val);
+ "with unknown method \"%S\".\n",
+ val, ind->u.string);
} else {
- if(!ind->u.string->size_shift)
- Pike_error("Indexing the NULL value with \"%s\".\n",
- ind->u.string->str);
- else
- Pike_error("Indexing the NULL value with a wide string.\n");
+ Pike_error("Indexing the NULL value with \"%S\".\n",
+ ind->u.string);
}
}
break;
153:
(what->type == T_INT && !what->u.integer)?
"the NULL value":get_name_of_type(what->type),
ind->u.float_number);
- else if (ind->type == T_STRING && !ind->u.string->size_shift)
- Pike_error ("Cannot index %s with \"%s\".\n",
+ else if (ind->type == T_STRING)
+ Pike_error ("Cannot index %s with \"%S\".\n",
(what->type == T_INT && !what->u.integer)?
"the NULL value":get_name_of_type(what->type),
- ind->u.string->str);
+ ind->u.string);
else
Pike_error ("Cannot index %s with %s.\n",
(what->type == T_INT && !what->u.integer)?