2016-01-26
2016-01-26 21:08:15 by Martin Nilsson <nilsson@fastmail.com>
-
06bd618d0aee37857e438da1ddd7820172f4fc36
(121 lines)
(+57/-64)
[
Show
| Annotate
]
Branch: 8.1
SIMPLE_TOO_FEW_ARGS_ERROR should be SIMPLE_WRONG_NUM_ARGS_ERROR since long ago. Replaced them and tighten up argument control in places.
104:
{
int i;
if(args != 2)
- SIMPLE_TOO_FEW_ARGS_ERROR("equal", 2);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("equal", 2);
i=is_equal(Pike_sp-2,Pike_sp-1);
pop_n_elems(args);
268:
struct pike_string *s = Pike_sp[-args].u.string;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("7.4::hash",1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("7.4::hash",1);
if(TYPEOF(Pike_sp[-args]) != T_STRING)
SIMPLE_ARG_TYPE_ERROR("7.4::hash", 1, "string");
330:
struct pike_string *s = Pike_sp[-args].u.string;
unsigned int i;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("7.0::hash",1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("7.0::hash",1);
if(TYPEOF(Pike_sp[-args]) != T_STRING)
SIMPLE_ARG_TYPE_ERROR("7.0::hash", 1, "string");
388:
struct pike_string *s;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("hash",1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("hash",1);
if(TYPEOF(Pike_sp[-args]) != T_STRING)
SIMPLE_ARG_TYPE_ERROR("hash", 1, "string");
443:
unsigned INT32 h;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("hash_value",1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("hash_value",1);
h = hash_svalue (Pike_sp - args);
pop_n_elems (args);
467:
PMOD_EXPORT void f_copy_value(INT32 args)
{
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("copy_value",1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("copy_value",1);
pop_n_elems(args-1);
push_undefined(); /* Placeholder */
898:
ptrdiff_t start;
if(args < 2)
- SIMPLE_TOO_FEW_ARGS_ERROR("search", 2);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("search", 2);
switch(TYPEOF(Pike_sp[-args]))
{
1109:
{
struct pike_string *a, *b;
- if(args<2)
- SIMPLE_TOO_FEW_ARGS_ERROR("has_prefix", 2);
+ if(args!=2)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("has_prefix", 2);
if((TYPEOF(Pike_sp[-args]) != T_STRING) &&
(TYPEOF(Pike_sp[-args]) != T_OBJECT))
SIMPLE_ARG_TYPE_ERROR("has_prefix", 1, "string|object");
1215:
{
struct pike_string *a, *b;
- if(args<2)
- SIMPLE_TOO_FEW_ARGS_ERROR("has_suffix", 2);
+ if(args!=2)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("has_suffix", 2);
if(TYPEOF(Pike_sp[-args]) != T_STRING)
SIMPLE_ARG_TYPE_ERROR("has_suffix", 1, "string");
if(TYPEOF(Pike_sp[1-args]) != T_STRING)
1302:
{
int t = 0;
- if(args < 2)
- SIMPLE_TOO_FEW_ARGS_ERROR("has_index", 2);
- if(args > 2)
- pop_n_elems(args-2);
+ if(args != 2)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("has_index", 2);
switch(TYPEOF(Pike_sp[-2]))
{
1397:
*/
PMOD_EXPORT void f_has_value(INT32 args)
{
- if(args < 2)
- SIMPLE_TOO_FEW_ARGS_ERROR("has_value", 2);
- if(args > 2)
- pop_n_elems(args-2);
+ if(args != 2)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("has_value", 2);
switch(TYPEOF(Pike_sp[-2]))
{
1475:
PMOD_EXPORT void f_add_constant(INT32 args)
{
if(args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("add_constant", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("add_constant", 1);
if(TYPEOF(Pike_sp[-args]) != T_STRING)
SIMPLE_ARG_TYPE_ERROR("add_constant", 1, "string");
1557:
*/
PMOD_EXPORT void f_zero_type(INT32 args)
{
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("zero_type",1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("zero_type",1);
if(IS_DESTRUCTED(Pike_sp-args))
{
2991:
*/
PMOD_EXPORT void f_throw(INT32 args)
{
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("throw", 1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("throw", 1);
assign_svalue(&throw_value,Pike_sp-args);
pop_n_elems(args);
throw_severity=0;
3020:
static int in_exit=0;
if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("exit", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("exit", 1);
if(TYPEOF(Pike_sp[-args]) != T_INT)
SIMPLE_ARG_TYPE_ERROR("exit", 1, "int");
3284:
ptrdiff_t size;
struct array *a = NULL;
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("indices", 1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("indices", 1);
switch(TYPEOF(Pike_sp[-args]))
{
3591:
{
ptrdiff_t size;
struct array *a = NULL;
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("values", 1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("values", 1);
switch(TYPEOF(Pike_sp[-args]))
{
3681:
struct array *a = NULL;
struct pike_type *default_type = mixed_type_string;
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("types", 1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("types", 1);
switch(TYPEOF(Pike_sp[-args]))
{
3753:
*/
PMOD_EXPORT void f_object_program(INT32 args)
{
- if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("object_program", 1);
+ if(args != 1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("object_program", 1);
if(TYPEOF(Pike_sp[-args]) == T_OBJECT)
{
4401:
args++;
}
else
- SIMPLE_TOO_FEW_ARGS_ERROR("replace", 3);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("replace", 3);
} else if (args > 3) {
pop_n_elems(args-3);
args = 3;
4681:
*/
PMOD_EXPORT void f_objectp(INT32 args)
{
- if(args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("objectp", 1);
+ if(args!=1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("objectp", 1);
if(TYPEOF(Pike_sp[-args]) != T_OBJECT || !Pike_sp[-args].u.object->prog
|| is_bignum_object(Pike_sp[-args].u.object))
{
4705:
PMOD_EXPORT void f_functionp(INT32 args)
{
int res = 0;
- if(args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("functionp", 1);
+ if(args!=1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("functionp", 1);
if( TYPEOF(Pike_sp[-args]) == T_FUNCTION &&
(SUBTYPEOF(Pike_sp[-args]) == FUNCTION_BUILTIN ||
Pike_sp[-args].u.object->prog))
4783:
PMOD_EXPORT void f_callablep(INT32 args)
{
int res = 0;
- if(args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("callablep", 1);
+ if(args!=1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("callablep", 1);
res = callablep(&Pike_sp[-args]);
pop_n_elems(args);
4990:
{ \
int t; \
struct program *p; \
- if (args<1) \
- SIMPLE_TOO_FEW_ARGS_ERROR(NAME, 1); \
+ if (args!=1) \
+ SIMPLE_WRONG_NUM_ARGS_ERROR(NAME, 1); \
if (TYPEOF(Pike_sp[-args]) == T_OBJECT && \
(p = Pike_sp[-args].u.object->prog)) \
{ \
5021:
*/
PMOD_EXPORT void f_undefinedp(INT32 args)
{
- if( args<1 )
- SIMPLE_TOO_FEW_ARGS_ERROR("undefinedp", 1);
+ if( args!=1 )
+ SIMPLE_WRONG_NUM_ARGS_ERROR("undefinedp", 1);
f_zero_type(args);
Pike_sp[-1].u.integer = ( Pike_sp[-1].u.integer == NUMBER_UNDEFINED);
}
5037:
*/
PMOD_EXPORT void f_destructedp(INT32 args)
{
- if( args<1 )
- SIMPLE_TOO_FEW_ARGS_ERROR("destructedp", 1);
+ if( args!=1 )
+ SIMPLE_WRONG_NUM_ARGS_ERROR("destructedp", 1);
f_zero_type(args);
Pike_sp[-1].u.integer = ( Pike_sp[-1].u.integer == NUMBER_DESTRUCTED);
}
5053:
*/
PMOD_EXPORT void f_programp(INT32 args)
{
- if(args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("programp", 1);
+ if(args!=1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("programp", 1);
switch(TYPEOF(Pike_sp[-args]))
{
case T_PROGRAM:
5197:
struct array *a;
if(args < 1)
- SIMPLE_TOO_FEW_ARGS_ERROR("sort", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("sort", 1);
if(TYPEOF(Pike_sp[-args]) != T_ARRAY)
SIMPLE_ARG_TYPE_ERROR("sort", 1, "array");
a = Pike_sp[-args].u.array;
5730:
time_t retval;
if (args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("mktime", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("mktime", 1);
if(args == 1)
{
5972:
struct svalue *glob;
int nglobs;
- if(args < 2)
- SIMPLE_TOO_FEW_ARGS_ERROR("glob", 2);
+ if(args != 2)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("glob", 2);
- if(args > 2)
- pop_n_elems(args-2);
- args=2;
-
+
if (TYPEOF(Pike_sp[-args]) == T_STRING)
{
glob=Pike_sp-args;
7526:
struct pike_type *t;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("_typeof", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("_typeof", 1);
t = get_type_of_svalue(Pike_sp-args);
7553:
struct object *new_master;
if(!args)
- SIMPLE_TOO_FEW_ARGS_ERROR("replace_master", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("replace_master", 1);
if(TYPEOF(Pike_sp[-args]) != T_OBJECT)
SIMPLE_ARG_TYPE_ERROR("replace_master", 1, "object");
new_master = Pike_sp[-args].u.object;
7813: Inside #if defined(PROFILING)
int i;
if (!args) {
- SIMPLE_TOO_FEW_ARGS_ERROR("get_profiling_info", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("get_profiling_info", 1);
}
prog = program_from_svalue(Pike_sp-args);
if(!prog)
8053:
INT32 j,i;
TYPE_FIELD type=0;
- if (args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("transpose", 1);
+ if (args!=1)
+ SIMPLE_WRONG_NUM_ARGS_ERROR("transpose", 1);
if (TYPEOF(Pike_sp[-args]) != T_ARRAY)
SIMPLE_ARG_TYPE_ERROR("transpose", 1, "array(array)");
8181:
TYPE_FIELD types;
if (args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("map", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("map", 1);
else if (args<2)
{ push_int(0); args++; }
8525:
struct svalue *mysp;
if (args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("filter", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("filter", 1);
switch (TYPEOF(Pike_sp[-args]))
{
8770:
INT_TYPE n;
if (args<1)
- SIMPLE_TOO_FEW_ARGS_ERROR("enumerate", 1);
+ SIMPLE_WRONG_NUM_ARGS_ERROR("enumerate", 1);
if (args<2)
{
push_int(1);