Psyco, the Python Specializing Compiler

Update of /cvsroot/psyco/psyco/c/Objects
In directory sc8-pr-cvs1:/tmp/cvs-serv5479/c/Objects

Modified Files:
	pintobject.c pintobject.h pobject.c 
Added Files:
	pboolobject.c pboolobject.h 
Log Message:
Py2.3 compatibility: 'True' and 'False'

--- NEW FILE: pboolobject.c ---
#include "pboolobject.h"
#include "pintobject.h"

#if BOOLEAN_TYPE    /* Booleans were introduced in Python 2.3 */


static bool compute_bool(PsycoObject* po, vinfo_t* boolobj)
{
	vinfo_t* newobj;
	vinfo_t* x;
	condition_code_t cc;
	
	/* get the field 'ob_ival' from the Python object 'boolobj' */
	x = vinfo_getitem(boolobj, iBOOL_OB_IVAL);
	if (x == NULL)
		return false;

	cc = integer_non_null(po, x);
	if (cc == CC_ERROR)
		return false;
	newobj = integer_conditional(po, cc,
				     (long) Py_True,
				     (long) Py_False);
	if (newobj == NULL)
		return false;

	/* move the resulting non-virtual Python object back into 'boolobj' */
	vinfo_move(po, boolobj, newobj);
	return true;
}


DEFINEVAR source_virtual_t psyco_computed_bool;


 /***************************************************************/
  /*** boolean objects meta-implementation                     ***/

#define CONVERT_TO_BOOL(vobj, vlng)				\
	switch (Psyco_VerifyType(po, vobj, &PyBool_Type)) {	\
	case true:   /* vobj is a PyBoolObject */		\
		vlng = PsycoInt_AS_LONG(po, vobj);		\
		if (vlng == NULL)				\
			return NULL;				\
		break;						\
	case false:  /* vobj is not a PyBoolObject */		\
		return pint_base2op(po, v, w, op);		\
	default:     /* error or promotion */			\
		return NULL;					\
	}

static vinfo_t* pbool_base2op(PsycoObject* po, vinfo_t* v, vinfo_t* w,
			      vinfo_t*(*op)(PsycoObject*,vinfo_t*,vinfo_t*))
{
	vinfo_t* a;
	vinfo_t* b;
	vinfo_t* x;
	CONVERT_TO_BOOL(v, a);
	CONVERT_TO_BOOL(w, b);
	x = op (po, a, b);
	if (x != NULL)
		x = PsycoBool_FROM_LONG(x);
	return x;
}

static vinfo_t* pbool_or(PsycoObject* po, vinfo_t* v, vinfo_t* w)
{
	return pbool_base2op(po, v, w, integer_or);
}

static vinfo_t* pbool_xor(PsycoObject* po, vinfo_t* v, vinfo_t* w)
{
	return pbool_base2op(po, v, w, integer_xor);
}

static vinfo_t* pbool_and(PsycoObject* po, vinfo_t* v, vinfo_t* w)
{
	return pbool_base2op(po, v, w, integer_and);
}


INITIALIZATIONFN
void psy_boolobject_init(void)
{
	PyNumberMethods *m = PyBool_Type.tp_as_number;

	Psyco_DefineMeta(m->nb_or,       pbool_or);
	Psyco_DefineMeta(m->nb_xor,      pbool_xor);
	Psyco_DefineMeta(m->nb_and,      pbool_and);

	INIT_SVIRTUAL(psyco_computed_bool, compute_bool, 0, 0);
}

#else /* !BOOLEAN_TYPE */
INITIALIZATIONFN
void psy_boolobject_init(void) { }
#endif /* BOOLEAN_TYPE */

--- NEW FILE: pboolobject.h ---
 /***************************************************************/
/***             Psyco equivalent of boolobject.h              ***/
 /***************************************************************/

#ifndef _PSY_BOOLOBJECT_H
#define _PSY_BOOLOBJECT_H


#include "pobject.h"
#include "pabstract.h"

#if BOOLEAN_TYPE    /* Booleans were introduced in Python 2.3 */


#define BOOL_ob_ival    DEF_FIELD(PyBoolObject, long, ob_ival, OB_type)
#define iBOOL_OB_IVAL   FIELD_INDEX(BOOL_ob_ival)
#define BOOL_TOTAL      FIELDS_TOTAL(BOOL_ob_ival)


#define PsycoBool_Check(tp) PyType_TypeCheck(tp, &PyBool_Type)


 /***************************************************************/
  /***   Virtual-time object builder                           ***/

/* not-yet-computed booleans */
EXTERNVAR source_virtual_t psyco_computed_bool;

/* !! consumes a reference to vlong. PsycoBool_FromLong() does not. */
inline vinfo_t* PsycoBool_FROM_LONG(vinfo_t* vlong)
{
	vinfo_t* result = vinfo_new(VirtualTime_New(&psyco_computed_bool));
	result->array = array_new(BOOL_TOTAL);
	result->array->items[iOB_TYPE] =
		vinfo_new(CompileTime_New((long)(&PyBool_Type)));
	result->array->items[iBOOL_OB_IVAL] = vlong;
	return result;
}
inline vinfo_t* PsycoBool_FromLong(vinfo_t* vlong)
{
	vinfo_incref(vlong);
	return PsycoBool_FROM_LONG(vlong);
}


#else /* !BOOLEAN_TYPE */
/* define the booleans as synonims for integers */
# define PsycoBool_FROM_LONG(v)  PsycoInt_FROM_LONG(v)
# define PsycoBool_FromLong(v)   PsycoInt_FromLong(v)
#endif /* BOOLEAN_TYPE */

/* utility */
#define PsycoBool_FromCondition(po, cc)                         \
	PsycoBool_FROM_LONG(psyco_vinfo_condition(po, cc))

#endif /* _PSY_INTOBJECT_H */

Index: pintobject.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Objects/pintobject.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pintobject.c	9 Mar 2003 21:06:46 -0000	1.11
--- pintobject.c	26 Apr 2003 21:01:23 -0000	1.12
***************
*** 187,192 ****
  }
  
! static vinfo_t* pint_base2op(PsycoObject* po, vinfo_t* v, vinfo_t* w,
! 			     vinfo_t*(*op)(PsycoObject*,vinfo_t*,vinfo_t*))
  {
  	vinfo_t* a;
--- 187,193 ----
  }
  
! DEFINEFN
! vinfo_t* pint_base2op(PsycoObject* po, vinfo_t* v, vinfo_t* w,
!                       vinfo_t*(*op)(PsycoObject*,vinfo_t*,vinfo_t*))
  {
  	vinfo_t* a;

Index: pintobject.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Objects/pintobject.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pintobject.h	17 Jan 2003 14:41:26 -0000	1.4
--- pintobject.h	26 Apr 2003 21:01:24 -0000	1.5
***************
*** 9,12 ****
--- 9,13 ----
  #include "pobject.h"
  #include "pabstract.h"
+ #include "pboolobject.h"
  
  
***************
*** 62,67 ****
  	cc = integer_cmp(po, a, b, op);
  	if (cc == CC_ERROR) return NULL;
! 	return PsycoInt_FROM_LONG(psyco_vinfo_condition(po, cc));
  }
  
  
--- 63,73 ----
  	cc = integer_cmp(po, a, b, op);
  	if (cc == CC_ERROR) return NULL;
! 	return PsycoBool_FromCondition(po, cc);
  }
+ 
+ 
+ EXTERNFN  /* internal, for pboolobject.c */
+ vinfo_t* pint_base2op(PsycoObject* po, vinfo_t* v, vinfo_t* w,
+                       vinfo_t*(*op)(PsycoObject*,vinfo_t*,vinfo_t*));
  
  

Index: pobject.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Objects/pobject.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** pobject.c	17 Jan 2003 14:41:34 -0000	1.13
--- pobject.c	26 Apr 2003 21:01:24 -0000	1.14
***************
*** 1,4 ****
--- 1,5 ----
  #include "pobject.h"
  #include "pintobject.h"
+ #include "pboolobject.h"
  #include "pstringobject.h"
  
***************
*** 426,430 ****
  	if (cc == CC_ERROR)
  		return NULL;
! 	return PsycoInt_FROM_LONG(psyco_vinfo_condition(po, cc));
  }
  
--- 427,431 ----
  	if (cc == CC_ERROR)
  		return NULL;
! 	return PsycoBool_FromCondition(po, cc);
  }

Update of /cvsroot/psyco/psyco/c
In directory sc8-pr-cvs1:/tmp/cvs-serv5479/c

Modified Files:
	Makefile encoding.h files.py initialize.h processor.c 
	processor.h psyco.h timing.h 
Log Message:
Py2.3 compatibility: 'True' and 'False'

Index: Makefile
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	24 Mar 2003 13:29:16 -0000	1.13
--- Makefile	26 Apr 2003 21:01:18 -0000	1.14
***************
*** 66,70 ****
  	cd ..; $(python) setup.py build_py
  
! include dyn-Makefile
  
  %.o: %.c
--- 66,70 ----
  	cd ..; $(python) setup.py build_py
  
! -include dyn-Makefile
  
  %.o: %.c

Index: encoding.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/encoding.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** encoding.h	17 Jan 2003 14:41:02 -0000	1.16
--- encoding.h	26 Apr 2003 21:01:19 -0000	1.17
***************
*** 866,876 ****
  
  
! /* CMOV instruction: this instruction does not exist on the i486,
!    should we avoid it? Or should be test for Pentium-ness at start-up?
!    We currently avoid it. */
  /* #define CONDITIONAL_LOAD_REG_FROM_RT(source, dst, condition)  do {      \ */
  /*   *code++ = 0x0F;        * CMOVxx dst, (...) *                          \ */
  /*   INSTR_MODRM_FROM_RT(source, 0x40 | (condition), (dst)<<3);            \ */
  /* } while (0) */
  
  
--- 866,875 ----
  
  
! #if PENTIUM_INSNS
  /* #define CONDITIONAL_LOAD_REG_FROM_RT(source, dst, condition)  do {      \ */
  /*   *code++ = 0x0F;        * CMOVxx dst, (...) *                          \ */
  /*   INSTR_MODRM_FROM_RT(source, 0x40 | (condition), (dst)<<3);            \ */
  /* } while (0) */
+ #endif
  
  

Index: files.py
===================================================================
RCS file: /cvsroot/psyco/psyco/c/files.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** files.py	17 Jan 2003 14:41:03 -0000	1.7
--- files.py	26 Apr 2003 21:01:19 -0000	1.8
***************
*** 44,47 ****
--- 44,48 ----
      Object('object'),
      Object('abstract', 0),
+     Object('boolobject'),
      Object('classobject'),
      Object('descrobject'),

Index: initialize.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/initialize.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** initialize.h	17 Jan 2003 14:41:04 -0000	1.7
--- initialize.h	26 Apr 2003 21:01:20 -0000	1.8
***************
*** 18,21 ****
--- 18,22 ----
  # include "Objects/pobject.h"
  # include "Objects/pabstract.h"
+ # include "Objects/pboolobject.h"
  # include "Objects/pclassobject.h"
  # include "Objects/pdescrobject.h"
***************
*** 55,58 ****
--- 56,60 ----
  # include "Objects/pobject.c"
  # include "Objects/pabstract.c"
+ # include "Objects/pboolobject.c"
  # include "Objects/pclassobject.c"
  # include "Objects/pdescrobject.c"
***************
*** 82,85 ****
--- 84,88 ----
    EXTERNFN void psyco_bltinmodule_init(void);	/* Python/pbltinmodule.c */
    EXTERNFN void psy_object_init(void);	/* Objects/pobject.c */
+   EXTERNFN void psy_boolobject_init(void);	/* Objects/pboolobject.c */
    EXTERNFN void psy_classobject_init(void);	/* Objects/pclassobject.c */
    EXTERNFN void psy_descrobject_init(void);	/* Objects/pdescrobject.c */
***************
*** 110,113 ****
--- 113,117 ----
    psyco_bltinmodule_init();	/* Python/pbltinmodule.c */
    psy_object_init();	/* Objects/pobject.c */
+   psy_boolobject_init();	/* Objects/pboolobject.c */
    psy_classobject_init();	/* Objects/pclassobject.c */
    psy_descrobject_init();	/* Objects/pdescrobject.c */

Index: processor.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/processor.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** processor.c	9 Mar 2003 21:06:39 -0000	1.24
--- processor.c	26 Apr 2003 21:01:20 -0000	1.25
***************
*** 2251,2254 ****
--- 2251,2280 ----
  
  DEFINEFN
+ vinfo_t* integer_conditional(PsycoObject* po, condition_code_t cc,
+                              long immed_true, long immed_false)
+ {
+   reg_t rg;
+   
+   switch (cc) {
+   case CC_ALWAYS_FALSE:
+     return vinfo_new(CompileTime_New(immed_false));
+ 
+   case CC_ALWAYS_TRUE:
+     return vinfo_new(CompileTime_New(immed_true));
+ 
+   default:
+     BEGIN_CODE
+     NEED_FREE_REG(rg);
+     LOAD_REG_FROM_IMMED(rg, immed_true);
+     SHORT_COND_JUMP_TO(code + SIZE_OF_SHORT_CONDITIONAL_JUMP
+                             + SIZE_OF_LOAD_REG_FROM_IMMED, cc);
+     LOAD_REG_FROM_IMMED(rg, immed_false);
+     END_CODE
+       
+     return new_rtvinfo(po, rg, false, false);
+   }
+ }
+ 
+ DEFINEFN
  vinfo_t* make_runtime_copy(PsycoObject* po, vinfo_t* v)
  {

Index: processor.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/processor.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** processor.h	4 Feb 2003 11:18:51 -0000	1.14
--- processor.h	26 Apr 2003 21:01:20 -0000	1.15
***************
*** 8,11 ****
--- 8,12 ----
  
  #include "vcompiler.h"
+ #include "Python/pyver.h"
  
  
***************
*** 247,250 ****
--- 248,255 ----
  #endif
  
+ /* Return one of two constants, depending on the condition code */
+ EXTERNFN vinfo_t* integer_conditional(PsycoObject* po, condition_code_t cc,
+                                       long immed_true, long immed_false);
+ 
  /* make a run-time copy of a vinfo_t */
  EXTERNFN vinfo_t* make_runtime_copy(PsycoObject* po, vinfo_t* v);
***************
*** 361,365 ****
                     TIMING_WITH_PENTIUM_TSC in timing.h) */
  #if HAVE_LONG_LONG
! typedef LONG_LONG pentium_tsc_t;
  #else
  typedef long pentium_tsc_t;
--- 366,370 ----
                     TIMING_WITH_PENTIUM_TSC in timing.h) */
  #if HAVE_LONG_LONG
! typedef PY_LONG_LONG pentium_tsc_t;
  #else
  typedef long pentium_tsc_t;

Index: psyco.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/psyco.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** psyco.h	15 Mar 2003 13:15:36 -0000	1.30
--- psyco.h	26 Apr 2003 21:01:21 -0000	1.31
***************
*** 15,18 ****
--- 15,23 ----
    /***   option to override them, e.g. -DXXX=value in gcc)       ***/
  
+  /* set to 0 to emit code that runs on 386 and 486 */
+ #ifndef PENTIUM_INSNS
+ # define PENTIUM_INSNS    1
+ #endif
+ 
   /* set to 0 to disable all debugging checks and output */
  #ifndef PSYCO_DEBUG

Index: timing.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/timing.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** timing.h	15 Mar 2003 13:15:36 -0000	1.2
--- timing.h	26 Apr 2003 21:01:21 -0000	1.3
***************
*** 29,34 ****
  #elif defined(HAVE_CLOCK) && CLOCK_IS_PER_PROCESS
  # define TIMING_WITH   TIMING_WITH_CLOCK
! #else
  # define TIMING_WITH   TIMING_WITH_PENTIUM_TSC
  #endif
  
--- 29,38 ----
  #elif defined(HAVE_CLOCK) && CLOCK_IS_PER_PROCESS
  # define TIMING_WITH   TIMING_WITH_CLOCK
! #elif PENTIUM_INSNS
  # define TIMING_WITH   TIMING_WITH_PENTIUM_TSC
+ #elif defined(HAVE_CLOCK)
+ # define TIMING_WITH   TIMING_WITH_CLOCK
+ #else
+ # error "no way to measure time!"
  #endif

Update of /cvsroot/psyco/psyco/test
In directory sc8-pr-cvs1:/tmp/cvs-serv5479/test

Modified Files:
	basetests.py btrun.py 
Log Message:
Py2.3 compatibility: 'True' and 'False'

Index: basetests.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/basetests.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** basetests.py	15 Mar 2003 13:14:47 -0000	1.3
--- basetests.py	26 Apr 2003 21:01:27 -0000	1.4
***************
*** 35,38 ****
--- 35,43 ----
  print >> childin, PRELUDE
  
+ def filterline(line):
+     if line.startswith('${') and line.endswith('}'):
+         line = str(eval(line[2:-1]))
+     return line
+ 
  for inp, outp, line in all_tests:
      sep = SEPARATOR % inp
***************
*** 41,45 ****
      print >> expected, sep
      print >> childin, inp
!     expected.write(outp)
  
  print >> childin, 'print %r' % LASTLINE
--- 46,51 ----
      print >> expected, sep
      print >> childin, inp
!     outplines = [filterline(line) for line in outp.split('\n')]
!     expected.write('\n'.join(outplines))
  
  print >> childin, 'print %r' % LASTLINE

Index: btrun.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/btrun.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** btrun.py	26 Apr 2003 19:06:03 -0000	1.5
--- btrun.py	26 Apr 2003 21:01:27 -0000	1.6
***************
*** 35,49 ****
                               ###################
  
! >>> assert_equal(str('abcdefghijklmnop'=='abcdefghijklMNop'), str(False))
! Ok
  
! >>> assert_equal(str('abcdefghijklmnop'=='abcdefghijklmnop'), str(True))
! Ok
  
! >>> assert_equal(str((lambda x: x==1)(0)), str(False))
! Ok
  
! >>> assert_equal(str((lambda x: x==1)(1)), str(True))
! Ok
  
  >>> print test1.f1(217)
--- 35,55 ----
                               ###################
  
! >>> print 'abcdefghijklmnop'=='abcdefghijklMNop'
! ${False}
  
! >>> print 'abcdefghijklmnop'=='abcdefghijklmnop'
! ${True}
  
! >>> print str('abcdefghijklmnop'=='abcdefghijklMNop')
! ${False}
  
! >>> print str('abcdefghijklmnop'=='abcdefghijklmnop')
! ${True}
! 
! >>> print (lambda x: x==1)(0)
! ${False}
! 
! >>> print (lambda x: x==1)(1)
! ${True}
  
  >>> print test1.f1(217)
***************
*** 176,183 ****
  
  >>> test3.f14(5)
! 1
  
  >>> test3.f14(-2)
! 0
  
  >>> print test3.f16(123)
--- 182,189 ----
  
  >>> test3.f14(5)
! ${True}
  
  >>> test3.f14(-2)
! ${False}
  
  >>> print test3.f16(123)
***************
*** 192,196 ****
  >>> print test3.f19([1,2,3,4])
  hello
! ([1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4], 1, 0)
  
  >>> print test3.f20('l', 12)
--- 198,202 ----
  >>> print test3.f19([1,2,3,4])
  hello
! ${([1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4], True, 0)}
  
  >>> print test3.f20('l', 12)
***************
*** 304,308 ****
  
  >>> test3.f37(None)
! 1
  1
  
--- 310,314 ----
  
  >>> test3.f37(None)
! ${True}
  1

Update of /cvsroot/psyco/psyco/c/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv5479/c/Python

Modified Files:
	pycompiler.c pyver.h 
Log Message:
Py2.3 compatibility: 'True' and 'False'

Index: pycompiler.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Python/pycompiler.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** pycompiler.c	9 Mar 2003 21:06:52 -0000	1.40
--- pycompiler.c	26 Apr 2003 21:01:25 -0000	1.41
***************
*** 2183,2188 ****
  		
                  cc = INVERT_CC(cc);
! 		/* turns 'cc' into a Python integer object, 0 or 1 */
! 		x = PsycoInt_FROM_LONG(psyco_vinfo_condition(po, cc));
  		POP_DECREF();
  		PUSH(x);  /* consumes ref on 'x' */
--- 2183,2188 ----
  		
                  cc = INVERT_CC(cc);
! 		/* turns 'cc' into a virtual Python boolean object */
! 		x = PsycoBool_FromCondition(po, cc);
  		POP_DECREF();
  		PUSH(x);  /* consumes ref on 'x' */
***************
*** 2818,2823 ****
  			break;
  		
! 		/* turns 'cc' into a virtual Python integer object, 0 or 1 */
! 		x = PsycoInt_FROM_LONG(psyco_vinfo_condition(po, cc));
  		
  	compare_done:
--- 2818,2823 ----
  			break;
  		
! 		/* turns 'cc' into a virtual Python boolean object */
! 		x = PsycoBool_FromCondition(po, cc);
  		
  	compare_done:

Index: pyver.h
===================================================================
RCS file: /cvsroot/psyco/psyco/c/Python/pyver.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pyver.h	9 Mar 2003 21:06:54 -0000	1.2
--- pyver.h	26 Apr 2003 21:01:26 -0000	1.3
***************
*** 62,64 ****
--- 62,75 ----
  
  
+ #if HAVE_LONG_LONG && !defined(PY_LONG_LONG)
+ # define PY_LONG_LONG   LONG_LONG   /* Python < 2.3 */
+ #endif
+ 
+ #ifdef PyBool_Check
+ # define BOOLEAN_TYPE              1    /* Python >=2.3 */
+ #else
+ # define BOOLEAN_TYPE              0
+ #endif
+ 
+ 
  #endif /* _PYVER_H */

Update of /cvsroot/psyco/psyco/test
In directory sc8-pr-cvs1:/tmp/cvs-serv30004

Modified Files:
	btrun.py 
Log Message:
more Python 2.3 compatibility

Index: btrun.py
===================================================================
RCS file: /cvsroot/psyco/psyco/test/btrun.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** btrun.py	24 Mar 2003 13:29:19 -0000	1.4
--- btrun.py	26 Apr 2003 19:06:03 -0000	1.5
***************
*** 20,28 ****
  ...         return 'exception: ' + sys.exc_info()[0].__name__
  
! >>> def truth(x):
! ...     if x:
! ...         return 'True'
  ...     else:
! ...         return 'False'
  
  >>> PY21 = sys.hexversion < 0x02020000
--- 20,30 ----
  ...         return 'exception: ' + sys.exc_info()[0].__name__
  
! >>> def assert_equal(x, y):
! ...     if x == y:
! ...         print 'Ok'
  ...     else:
! ...         print 'assert_equal failed: %r != %r' % (x,y)
! 
! >>> True,False = 1==1,1==0
  
  >>> PY21 = sys.hexversion < 0x02020000
***************
*** 33,36 ****
--- 35,50 ----
                               ###################
  
+ >>> assert_equal(str('abcdefghijklmnop'=='abcdefghijklMNop'), str(False))
+ Ok
+ 
+ >>> assert_equal(str('abcdefghijklmnop'=='abcdefghijklmnop'), str(True))
+ Ok
+ 
+ >>> assert_equal(str((lambda x: x==1)(0)), str(False))
+ Ok
+ 
+ >>> assert_equal(str((lambda x: x==1)(1)), str(True))
+ Ok
+ 
  >>> print test1.f1(217)
  1115467
***************
*** 52,57 ****
  [20, 14, 19, 9, 12, 25, 13, 9, 17, 23, 289, 26, 15, 13, 17, 19, 23, 18, 15, 14, 18, 22, 14, 18, 18, 17, 21, 27, 21, 20, 15, 12, 1745, 18, 17, 136, 25, 14, 27, 18, 92, 87, 386, 12, 52, 29, 63, 102, 49, 39, 26, 26, 18, 14, 16, 13, 22, 16, 29, 49, 24, 34, 30, 20, 16, 100, 98, 61, 20, 85, 61, 75, 54, 49, 19, 47, 32, 18, 67, 47, 86, 66, 184, 61, 42, 42, 74, 14, 26, 55, 74, 16, 37, 15, 19, 211, 17, 348, 369, 130, 12, 248, 264, 328, 162, 68, 69, 41, 128, 29, 240, 95, 244, 288, 673, 295, 108, 134, 380, 40, 42, 224, 137, 30, 15, 24, 11, 15, 6, 15, 19, 26, 19, 17, 15, 18, 16, 17, 11, 14, 11, 15, 11, 11, 19, 13, 18, 25, 14, 20, 12, 14, 8, 13, 17, 15, 16, 17, 15, 13, 12, 12, 10, 19, 15, 15, 16, 12, 24, 21, 14, 10, 19, 17, 14, 13, 20, 18, 11, 17, 21, 13, 21, 19, 17, 15, 19, 10, 17, 12, 16, 13, 16, 15, 13, 16, 16, 16, 15, 14, 11, 14, 18, 15, 25, 9, 19, 12, 13, 12, 18, 12, 13, 16, 13, 17, 18, 19, 16, 11, 18, 18, 27, 11, 22, 17, 13, 22, 20, 16, 9, 17, 14, 12, 20, 17, 15, 18, 16, 15, 15, 16, 16, 18, 18, 17, 21, 17, 12, 12, 17, 10, 20, 19, 18, 25]
  
! >>> print truth(PY21 or g1(test1.f4) == g1(test1.f5))
! True
  
  >>> print test1.f6(n=100, p=10001)
--- 66,71 ----
  [20, 14, 19, 9, 12, 25, 13, 9, 17, 23, 289, 26, 15, 13, 17, 19, 23, 18, 15, 14, 18, 22, 14, 18, 18, 17, 21, 27, 21, 20, 15, 12, 1745, 18, 17, 136, 25, 14, 27, 18, 92, 87, 386, 12, 52, 29, 63, 102, 49, 39, 26, 26, 18, 14, 16, 13, 22, 16, 29, 49, 24, 34, 30, 20, 16, 100, 98, 61, 20, 85, 61, 75, 54, 49, 19, 47, 32, 18, 67, 47, 86, 66, 184, 61, 42, 42, 74, 14, 26, 55, 74, 16, 37, 15, 19, 211, 17, 348, 369, 130, 12, 248, 264, 328, 162, 68, 69, 41, 128, 29, 240, 95, 244, 288, 673, 295, 108, 134, 380, 40, 42, 224, 137, 30, 15, 24, 11, 15, 6, 15, 19, 26, 19, 17, 15, 18, 16, 17, 11, 14, 11, 15, 11, 11, 19, 13, 18, 25, 14, 20, 12, 14, 8, 13, 17, 15, 16, 17, 15, 13, 12, 12, 10, 19, 15, 15, 16, 12, 24, 21, 14, 10, 19, 17, 14, 13, 20, 18, 11, 17, 21, 13, 21, 19, 17, 15, 19, 10, 17, 12, 16, 13, 16, 15, 13, 16, 16, 16, 15, 14, 11, 14, 18, 15, 25, 9, 19, 12, 13, 12, 18, 12, 13, 16, 13, 17, 18, 19, 16, 11, 18, 18, 27, 11, 22, 17, 13, 22, 20, 16, 9, 17, 14, 12, 20, 17, 15, 18, 16, 15, 15, 16, 16, 18, 18, 17, 21, 17, 12, 12, 17, 10, 20, 19, 18, 25]
  
! >>> assert_equal(PY21 or g1(test1.f4) == g1(test1.f5), 1)
! Ok
  
  >>> print test1.f6(n=100, p=10001)