* pythonrun.c: Print exception type+arg *after* stack trace instead of
before it.
* ceval.c, object.c: moved testbool() to object.c (now extern visible)
* stringobject.c: fix bugs in and rationalize string resize in formatstring()
* tokenizer.[ch]: fix non-working code for lines longer than BUFSIZ
diff --git a/Objects/object.c b/Objects/object.c
index 9a8d4b3..e28158e 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -213,6 +213,29 @@
}
}
+/* Test a value used as condition, e.g., in a for or if statement.
+ Return -1 if an error occurred */
+
+int
+testbool(v)
+ object *v;
+{
+ int res;
+ if (v == None)
+ res = 0;
+ else if (v->ob_type->tp_as_number != NULL)
+ res = (*v->ob_type->tp_as_number->nb_nonzero)(v);
+ else if (v->ob_type->tp_as_mapping != NULL)
+ res = (*v->ob_type->tp_as_mapping->mp_length)(v);
+ else if (v->ob_type->tp_as_sequence != NULL)
+ res = (*v->ob_type->tp_as_sequence->sq_length)(v);
+ else
+ res = 1;
+ if (res > 0)
+ res = 1;
+ return res;
+}
+
/*
NoObject is usable as a non-NULL undefined value, used by the macro None.