2000-12-01
2000-12-01 08:10:41 by Fredrik Hübinette (Hubbe) <hubbe@hubbe.net>
-
b2d3e49eec1c09ca1c80be79bfd6c65e50362ccb
(37 lines)
(+19/-18)
[
Show
| Annotate
]
Branch: 7.9
renamed error (and error.h) to Pike_error
Rev: src/array.c:1.97
Rev: src/backend.c:1.61
Rev: src/bignum.c:1.19
Rev: src/block_alloc.h:1.26
Rev: src/builtin_functions.c:1.318
Rev: src/callback.c:1.21
Rev: src/constants.c:1.24
Rev: src/cpp.c:1.78
Rev: src/cyclic.h:1.5
Rev: src/docode.c:1.86
Rev: src/dynamic_buffer.c:1.13
Rev: src/dynamic_load.c:1.47
Rev: src/encode.c:1.78
Rev: src/error.c:1.65
Rev: src/fd_control.c:1.34
Rev: src/fdlib.c:1.47
Rev: src/fsort.c:1.15
Rev: src/gc.c:1.143
Rev: src/hashtable.c:1.8
Rev: src/interpret.c:1.176
Rev: src/interpret.h:1.69
Rev: src/interpret_functions.h:1.34
Rev: src/interpreter.h:1.52
Rev: src/las.c:1.226
Rev: src/lex.c:1.85
Rev: src/lexer.h:1.24
Rev: src/main.c:1.108
Rev: src/mapping.c:1.112
Rev: src/module.c:1.12
Rev: src/module_support.c:1.38
Rev: src/modules/CommonLog/clf.c:1.5
Rev: src/modules/Gdbm/gdbmmod.c:1.12
Rev: src/modules/Gettext/gettext.c:1.6
Rev: src/modules/Gmp/mpz_glue.c:1.83
Rev: src/modules/Gz/gz_test.c:1.4
Rev: src/modules/Gz/zlibmod.c:1.32
Rev: src/modules/HTTPLoop/accept_and_parse.c:1.21
Rev: src/modules/HTTPLoop/log.c:1.9
Rev: src/modules/HTTPLoop/requestobject.c:1.16
Rev: src/modules/Image/blit.c:1.49
Rev: src/modules/Image/colors.c:1.41
Rev: src/modules/Image/colortable.c:1.101
Rev: src/modules/Image/colortable.h:1.23
Rev: src/modules/Image/colortable_lookup.h:1.15
Rev: src/modules/Image/dct.c:1.17
Rev: src/modules/Image/encodings/_xpm.c:1.15
Rev: src/modules/Image/encodings/any.c:1.20
Rev: src/modules/Image/encodings/avs.c:1.12
Rev: src/modules/Image/encodings/bmp.c:1.30
Rev: src/modules/Image/encodings/dsi.c:1.3
Rev: src/modules/Image/encodings/gd.c:1.5
Rev: src/modules/Image/encodings/hrz.c:1.6
Rev: src/modules/Image/encodings/iff.c:1.9
Rev: src/modules/Image/encodings/ilbm.c:1.21
Rev: src/modules/Image/encodings/pcx.c:1.14
Rev: src/modules/Image/encodings/png.c:1.40
Rev: src/modules/Image/encodings/pnm.c:1.24
Rev: src/modules/Image/encodings/psd.c:1.26
Rev: src/modules/Image/encodings/pvr.c:1.12
Rev: src/modules/Image/encodings/ras.c:1.13
Rev: src/modules/Image/encodings/tga.c:1.25
Rev: src/modules/Image/encodings/tim.c:1.11
Rev: src/modules/Image/encodings/wbf.c:1.7
Rev: src/modules/Image/encodings/x.c:1.35
Rev: src/modules/Image/encodings/xbm.c:1.12
Rev: src/modules/Image/encodings/xcf.c:1.34
Rev: src/modules/Image/encodings/xwd.c:1.19
Rev: src/modules/Image/font.c:1.66
Rev: src/modules/Image/image.c:1.182
Rev: src/modules/Image/image.h:1.45
Rev: src/modules/Image/image_module.c:1.9
Rev: src/modules/Image/layers.c:1.58
Rev: src/modules/Image/match.h:1.11
Rev: src/modules/Image/matrix.c:1.30
Rev: src/modules/Image/operator.c:1.34
Rev: src/modules/Image/orient.c:1.18
Rev: src/modules/Image/pattern.c:1.23
Rev: src/modules/Image/phase.h:1.3
Rev: src/modules/Image/poly.c:1.11
Rev: src/modules/Image/polyfill.c:1.36
Rev: src/modules/Image/search.c:1.19
Rev: src/modules/Java/jvm.c:1.30
Rev: src/modules/MIME/mime.c:1.27
Rev: src/modules/Math/math_matrix.c:1.19
Rev: src/modules/Mird/mird_glue.c:1.10
Rev: src/modules/Msql/msqlmod.c:1.15
Rev: src/modules/Mysql/mysql.c:1.38
Rev: src/modules/Mysql/precompiled_mysql.h:1.10
Rev: src/modules/Mysql/result.c:1.17
Rev: src/modules/Odbc/odbc.c:1.23
Rev: src/modules/Odbc/odbc_result.c:1.24
Rev: src/modules/Oracle/oracle.c:1.51
Rev: src/modules/Parser/html.c:1.120
Rev: src/modules/Parser/parser.c:1.11
Rev: src/modules/Perl/perlmod.c:1.22
Rev: src/modules/Pipe/pipe.c:1.44
Rev: src/modules/Postgres/pgresult.c:1.15
Rev: src/modules/Postgres/postgres.c:1.20
Rev: src/modules/Regexp/glue.c:1.19
Rev: src/modules/Regexp/pike_regexp.c:1.20
Rev: src/modules/SANE/sane.c:1.8
Rev: src/modules/Ssleay/ssleay.c:1.13
Rev: src/modules/Yp/yp.c:1.20
Rev: src/modules/_Charset/charsetmod.c:1.25
Rev: src/modules/_Charset/iso2022.c:1.20
Rev: src/modules/_Crypto/arcfour.c:1.13
Rev: src/modules/_Crypto/cast.c:1.9
Rev: src/modules/_Crypto/cbc.c:1.18
Rev: src/modules/_Crypto/crypto.c:1.40
Rev: src/modules/_Crypto/des.c:1.18
Rev: src/modules/_Crypto/idea.c:1.16
Rev: src/modules/_Crypto/invert.c:1.11
Rev: src/modules/_Crypto/md2.c:1.10
Rev: src/modules/_Crypto/md5.c:1.15
Rev: src/modules/_Crypto/nt.c:1.7
Rev: src/modules/_Crypto/pipe.c:1.19
Rev: src/modules/_Crypto/rijndael.c:1.4
Rev: src/modules/_Crypto/rsa.c:1.24
Rev: src/modules/_Crypto/sha.c:1.18
Rev: src/modules/_Image_GIF/image_gif.c:1.2
Rev: src/modules/_Image_JPEG/image_jpeg.c:1.36
Rev: src/modules/_Image_TIFF/image_tiff.c:1.22
Rev: src/modules/_Image_TTF/image_ttf.c:1.37
Rev: src/modules/_Image_XFace/image_xface.c:1.14
Rev: src/modules/_Roxen/roxen.c:1.7
Rev: src/modules/_math/math.c:1.34
Rev: src/modules/call_out/call_out.c:1.40
Rev: src/modules/files/efuns.c:1.88
Rev: src/modules/files/file.c:1.204
Rev: src/modules/files/sendfile.c:1.50
Rev: src/modules/files/socket.c:1.52
Rev: src/modules/files/stat.c:1.15
Rev: src/modules/files/termios.c:1.10
Rev: src/modules/files/udp.c:1.18
Rev: src/modules/spider/discdate.c:1.8
Rev: src/modules/spider/spider.c:1.101
Rev: src/modules/spider/stardate.c:1.11
Rev: src/modules/spider/xml.c:1.29
Rev: src/modules/sprintf/sprintf.c:1.74
Rev: src/modules/sybase/sybase.c:1.5
Rev: src/modules/sybase/sybase.h:1.2
Rev: src/modules/system/nt.c:1.28
Rev: src/modules/system/syslog.c:1.10
Rev: src/modules/system/system.c:1.94
Rev: src/multiset.c:1.30
Rev: src/object.c:1.154
Rev: src/opcodes.c:1.95
Rev: src/operators.c:1.113
Rev: src/peep.c:1.42
Rev: src/pike_memory.c:1.93
Rev: src/pike_search.c:1.4
Rev: src/pike_types.c:1.143
Rev: src/port.c:1.34
Rev: src/post_modules/GL/auto.c.in:1.16
Rev: src/post_modules/GL/top.c:1.13
Rev: src/post_modules/GLUT/auto.c.in:1.3
Rev: src/post_modules/GLUT/top.c:1.4
Rev: src/post_modules/GTK/source/encode_truecolor.c:1.4
Rev: src/post_modules/GTK/source/support.c:1.19
Rev: src/preprocessor.h:1.35
Rev: src/program.c:1.283
Rev: src/queue.c:1.7
Rev: src/security.c:1.28
Rev: src/security.h:1.12
Rev: src/signal_handler.c:1.185
Rev: src/smartlink.c:1.11
Rev: src/stralloc.c:1.109
Rev: src/svalue.c:1.89
Rev: src/svalue.h:1.71
Rev: src/threads.c:1.147
Rev: src/threads.h:1.107
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: program.c,v 1.282 2000/11/20 01:20:25 mast Exp $");
+ RCSID("$Id: program.c,v 1.283 2000/12/01 08:09:53 hubbe Exp $");
#include "program.h"
#include "object.h"
#include "dynamic_buffer.h"
16:
#include "lex.h"
#include "pike_macros.h"
#include "fsort.h"
- #include "error.h"
+ #include "pike_error.h"
#include "docode.h"
#include "interpret.h"
#include "hashtable.h"
2110: Inside #if defined(PIKE_DEBUG)
fatal("Attempting to add variable to fixed program\n");
if(Pike_compiler->compiler_pass==2)
- fatal("Internal error: Not allowed to add more identifiers during second compiler pass.\n"
+ fatal("Internal Pike_error: Not allowed to add more identifiers during second compiler pass.\n"
"Added identifier: \"%s\"\n", name->str);
#endif
2399: Inside #if defined(PIKE_DEBUG)
fatal("Attempting to add constant to fixed program\n");
if(Pike_compiler->compiler_pass==2)
- fatal("Internal error: Not allowed to add more identifiers during second compiler pass.\n");
+ fatal("Internal Pike_error: Not allowed to add more identifiers during second compiler pass.\n");
#endif
copy_shared_string(dummy.name, name);
2763: Inside #if defined(PIKE_DEBUG)
#ifdef PIKE_DEBUG
if(Pike_compiler->compiler_pass==2)
- fatal("Internal error: Not allowed to add more identifiers during second compiler pass.\n");
+ fatal("Internal Pike_error: Not allowed to add more identifiers during second compiler pass.\n");
#endif
/* define a new function */
2957:
struct pike_string *n;
if(!prog) {
if (strlen(name) < 1024) {
- error("Lookup of identifier %s in destructed object.\n", name);
+ Pike_error("Lookup of identifier %s in destructed object.\n", name);
} else {
- error("Lookup of long identifier in destructed object.\n");
+ Pike_error("Lookup of long identifier in destructed object.\n");
}
}
n=findstring(name);
3081:
struct pike_string *s;
if (ind->type != T_STRING) {
- error("Can't index a program with a %s (expected string)\n",
+ Pike_error("Can't index a program with a %s (expected string)\n",
get_name_of_type(ind->type));
}
s = ind->u.string;
3096:
return;
} else {
if (s->len < 1024) {
- error("Index \"%s\" is not constant.\n", s->str);
+ Pike_error("Index \"%s\" is not constant.\n", s->str);
} else {
- error("Index is not constant.\n");
+ Pike_error("Index is not constant.\n");
}
}
}
3109:
to->u.integer=0;
#else
if (s->len < 1024) {
- error("No such index \"%s\".\n", s->str);
+ Pike_error("No such index \"%s\".\n", s->str);
} else {
- error("No such index.\n");
+ Pike_error("No such index.\n");
}
#endif
}
3298:
}
struct program *compile(struct pike_string *prog,
- struct object *handler,/* error handler */
+ struct object *handler,/* Pike_error handler */
int major, int minor)
{
#ifdef PIKE_DEBUG
3477:
#endif
pop_stack(); /* pop the 'default' module */
- if(!p) error("Compilation failed.\n");
+ if(!p) Pike_error("Compilation failed.\n");
return p;
}
3585:
static void apply_trampoline(INT32 args)
{
- error("Internal error: Trampoline magic failed!\n");
+ Pike_error("Internal Pike_error: Trampoline magic failed!\n");
}
static void init_trampoline(struct object *o)
4182:
/* If we have parse errors we might get erroneous warnings,
* so don't print them.
* This has the additional benefit of making it easier to
- * visually locate the actual error message.
+ * visually locate the actual Pike_error message.
*/
if (Pike_compiler->num_parse_error) return;
4430:
p=get_program_for_object_being_destructed(loc.o);
if(!p)
{
- error("Cannot access parent of destructed object.\n");
+ Pike_error("Cannot access parent of destructed object.\n");
}
}
if((Pike_fp->fun & 0xffff) == 0xffff)
- error("Cannot access parent storage!\n");
+ Pike_error("Cannot access parent storage!\n");
loc.parent_identifier=Pike_fp->fun;
loc.inherit=INHERIT_FROM_INT(p, Pike_fp->fun);