[Psyco-checkins] CVS: psyco/c mergepoints.c,1.25,1.26 versionchecker.py,1.7,1.8

[Armin R. <ar...@us...>]

Update of /cvsroot/psyco/psyco/c
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10865/c

Modified Files:
	mergepoints.c versionchecker.py 
Log Message:
Working on completing the Python 2.4 support

Index: mergepoints.c
===================================================================
RCS file: /cvsroot/psyco/psyco/c/mergepoints.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mergepoints.c	29 Oct 2004 11:36:37 -0000	1.25
--- mergepoints.c	1 Dec 2004 12:59:10 -0000	1.26
***************
*** 71,74 ****
--- 71,75 ----
                               HAS_JABS_INSTR(op) ||      \
                               IS_SET_LINENO(op) ||       \
+                              IS_NOP(op) ||              \
                               op == POP_TOP ||           \
                               op == ROT_TWO ||           \
***************
*** 203,206 ****
--- 204,213 ----
  #endif
  
+ #ifdef NOP
+ # define IS_NOP(op)             (op == NOP)
+ #else
+ # define IS_NOP(op)              0
+ #endif
+ 
  #ifdef BINARY_FLOOR_DIVIDE
  # define IS_NEW_DIVIDE(op)      (op == BINARY_FLOOR_DIVIDE ||         \
***************
*** 514,517 ****
--- 521,544 ----
        return Py_None;
      }
+ #ifdef CO_GENERATOR
+   /* check for this flag -- it is not enough to check for the presence of
+      a YIELD_VALUE instruction because such an instruction might exist but
+      be unreachable. */
+   if (co->co_flags & CO_GENERATOR)
+     {
+ #if PY_VERSION_HEX < 0x02040000
+       debug_printf(1 + (strcmp(PyCodeObject_NAME(co), "?")==0),
+                    ("generator not supported at %s\n",
+                     PyCodeObject_NAME(co)));
+ #else
+       debug_printf(1 + (strcmp(PyCodeObject_NAME(co), "?")==0),
+                    ("generator or generator expression not supported at %s\n",
+                     PyCodeObject_NAME(co)));
+ #endif
+       Py_INCREF(Py_None);
+       return Py_None;
+     }
+ #endif  /* CO_GENERATOR */
+ 
    instrnodes = (struct instrnode_s*) PyMem_MALLOC(ibytes);
    if (instrnodes == NULL)

Index: versionchecker.py
===================================================================
RCS file: /cvsroot/psyco/psyco/c/versionchecker.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** versionchecker.py	4 Mar 2004 08:50:06 -0000	1.7
--- versionchecker.py	1 Dec 2004 12:59:10 -0000	1.8
***************
*** 5,8 ****
--- 5,9 ----
      '0x010100f0': '1.1.1',   # bugfix release, no change in hex version
      '0x010200f0': '1.2',
+     '0x010300f0': '1.3',
      }