Commit d23617b3 authored by Guido van Rossum's avatar Guido van Rossum

Declare ticker as int; made testbool generic for all numeric types

parent 4eb2168c
...@@ -162,7 +162,7 @@ eval_code(co, globals, locals, arg) ...@@ -162,7 +162,7 @@ eval_code(co, globals, locals, arg)
lineno = -1; lineno = -1;
for (;;) { for (;;) {
static ticker; static int ticker;
/* Do periodic things */ /* Do periodic things */
...@@ -983,16 +983,14 @@ static int ...@@ -983,16 +983,14 @@ static int
testbool(v) testbool(v)
object *v; object *v;
{ {
if (is_intobject(v)) if (v == None)
return getintvalue(v) != 0; return 0;
if (is_floatobject(v)) if (v->ob_type->tp_as_number != NULL)
return getfloatvalue(v) != 0.0; return (*v->ob_type->tp_as_number->nb_nonzero)(v);
if (v->ob_type->tp_as_sequence != NULL) if (v->ob_type->tp_as_sequence != NULL)
return (*v->ob_type->tp_as_sequence->sq_length)(v) != 0; return (*v->ob_type->tp_as_sequence->sq_length)(v) != 0;
if (v->ob_type->tp_as_mapping != NULL) if (v->ob_type->tp_as_mapping != NULL)
return (*v->ob_type->tp_as_mapping->mp_length)(v) != 0; return (*v->ob_type->tp_as_mapping->mp_length)(v) != 0;
if (v == None)
return 0;
/* All other objects are 'true' */ /* All other objects are 'true' */
return 1; return 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment