[Stackless-checkins] CVS: slpdev/src/2.2/src/Include Python.h, 1.9, 1.10 ceval.h, 1.3, 1.4 descrobject.h, 1.1.1.2, 1.2 frameobject.h, 1.22, 1.23 methodobject.h, 1.5, 1.6 pyerrors.h, 1.3, 1.4 pystate.h, 1.9, 1.10
Christian Tismer
tismer at centera.de
Sat May 1 03:21:12 CEST 2004
- Previous message: [Stackless-checkins] CVS: slpdev/src/2.2/src/Lib copy.py, 1.4, 1.5 copy_reg.py, 1.1.1.2, 1.2 pickle.py, 1.4, 1.5 site.py, 1.1.1.2, 1.2
- Next message: [Stackless-checkins] CVS: slpdev/src/2.2/src/Mac/Modules/cg CGStubLib, 1.1.1.2, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/slpdev/src/2.2/src/Include
In directory centera.de:/tmp/cvs-serv18709/src/Include
Modified Files:
Python.h ceval.h descrobject.h frameobject.h methodobject.h
pyerrors.h pystate.h
Log Message:
initial patches from diffs (merge) plus a little Visual Studio
Index: Python.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/Python.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Python.h 1 May 2004 00:44:32 -0000 1.9
--- Python.h 1 May 2004 01:21:08 -0000 1.10
***************
*** 64,67 ****
--- 64,70 ----
#include "pymem.h"
+ /* comment this out if you don't want to be stackless */
+ #include "stackless.h"
+
#include "object.h"
#include "objimpl.h"
Index: ceval.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/ceval.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ceval.h 30 Apr 2004 22:11:27 -0000 1.3
--- ceval.h 1 May 2004 01:21:08 -0000 1.4
***************
*** 5,9 ****
#endif
-
/* Interface to random parts in ceval.c */
--- 5,8 ----
Index: descrobject.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/descrobject.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -d -r1.1.1.2 -r1.2
*** descrobject.h 15 Oct 2002 22:22:47 -0000 1.1.1.2
--- descrobject.h 1 May 2004 01:21:08 -0000 1.2
***************
*** 36,39 ****
--- 36,43 ----
#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */
+ #ifdef STACKLESS
+ #define PyWrapperFlag_STACKLESS 2
+ #endif
+
/* Various kinds of descriptor objects */
Index: frameobject.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/frameobject.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** frameobject.h 1 May 2004 00:44:32 -0000 1.22
--- frameobject.h 1 May 2004 01:21:08 -0000 1.23
***************
*** 8,11 ****
--- 8,15 ----
#endif
+ #ifdef STACKLESS
+ typedef PyObject *(PyFrame_ExecFunc) (struct _frame *, PyObject *);
+ #endif
+
typedef struct {
int b_type; /* what kind of block this is */
***************
*** 17,20 ****
--- 21,28 ----
PyObject_VAR_HEAD
struct _frame *f_back; /* previous frame, or NULL */
+ #ifdef STACKLESS
+ /* support for soft stackless */
+ PyFrame_ExecFunc *f_execute;
+ #endif
PyCodeObject *f_code; /* code segment */
PyObject *f_builtins; /* builtin symbol table (PyDictObject) */
***************
*** 28,32 ****
--- 36,42 ----
PyObject *f_trace; /* Trace function */
PyObject *f_exc_type, *f_exc_value, *f_exc_traceback;
+ #ifndef STACKLESS
PyThreadState *f_tstate;
+ #endif
int f_lasti; /* Last instruction if called */
int f_lineno; /* Current line number */
Index: methodobject.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/methodobject.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** methodobject.h 1 May 2004 00:44:32 -0000 1.5
--- methodobject.h 1 May 2004 01:21:08 -0000 1.6
***************
*** 51,54 ****
--- 51,66 ----
#define METH_O 0x0008
+ <<<<<<< ../../2.2/src/./Include/methodobject.h
+ =======
+ /* METH_CLASS and METH_STATIC are a little different; these control
+ the construction of methods for a class. These cannot be used for
+ functions in modules. */
+ #define METH_CLASS 0x0010
+ #define METH_STATIC 0x0020
+ #ifdef STACKLESS
+ #define METH_STACKLESS 0x0040
+ #endif
+
+ >>>>>>> ././Include/methodobject.h
typedef struct PyMethodChain {
PyMethodDef *methods; /* Methods of this type */
Index: pyerrors.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/pyerrors.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pyerrors.h 1 May 2004 00:44:33 -0000 1.3
--- pyerrors.h 1 May 2004 01:21:08 -0000 1.4
***************
*** 24,27 ****
--- 24,28 ----
/* Predefined exceptions */
+ <<<<<<< ../../2.2/src/./Include/pyerrors.h
extern DL_IMPORT(PyObject *) PyExc_Exception;
extern DL_IMPORT(PyObject *) PyExc_StopIteration;
***************
*** 57,60 ****
--- 58,102 ----
extern DL_IMPORT(PyObject *) PyExc_ValueError;
extern DL_IMPORT(PyObject *) PyExc_ZeroDivisionError;
+ =======
+ PyAPI_DATA(PyObject *) PyExc_Exception;
+ PyAPI_DATA(PyObject *) PyExc_StopIteration;
+ #ifdef STACKLESS
+ PyAPI_DATA(PyObject *) PyExc_TaskletExit;
+ #endif
+ PyAPI_DATA(PyObject *) PyExc_StandardError;
+ PyAPI_DATA(PyObject *) PyExc_ArithmeticError;
+ PyAPI_DATA(PyObject *) PyExc_LookupError;
+
+ PyAPI_DATA(PyObject *) PyExc_AssertionError;
+ PyAPI_DATA(PyObject *) PyExc_AttributeError;
+ PyAPI_DATA(PyObject *) PyExc_EOFError;
+ PyAPI_DATA(PyObject *) PyExc_FloatingPointError;
+ PyAPI_DATA(PyObject *) PyExc_EnvironmentError;
+ PyAPI_DATA(PyObject *) PyExc_IOError;
+ PyAPI_DATA(PyObject *) PyExc_OSError;
+ PyAPI_DATA(PyObject *) PyExc_ImportError;
+ PyAPI_DATA(PyObject *) PyExc_IndexError;
+ PyAPI_DATA(PyObject *) PyExc_KeyError;
+ PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt;
+ PyAPI_DATA(PyObject *) PyExc_MemoryError;
+ PyAPI_DATA(PyObject *) PyExc_NameError;
+ PyAPI_DATA(PyObject *) PyExc_OverflowError;
+ PyAPI_DATA(PyObject *) PyExc_RuntimeError;
+ PyAPI_DATA(PyObject *) PyExc_NotImplementedError;
+ PyAPI_DATA(PyObject *) PyExc_SyntaxError;
+ PyAPI_DATA(PyObject *) PyExc_IndentationError;
+ PyAPI_DATA(PyObject *) PyExc_TabError;
+ PyAPI_DATA(PyObject *) PyExc_ReferenceError;
+ PyAPI_DATA(PyObject *) PyExc_SystemError;
+ PyAPI_DATA(PyObject *) PyExc_SystemExit;
+ PyAPI_DATA(PyObject *) PyExc_TypeError;
+ PyAPI_DATA(PyObject *) PyExc_UnboundLocalError;
+ PyAPI_DATA(PyObject *) PyExc_UnicodeError;
+ PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError;
+ PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError;
+ PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError;
+ PyAPI_DATA(PyObject *) PyExc_ValueError;
+ PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError;
+ >>>>>>> ././Include/pyerrors.h
#ifdef MS_WINDOWS
extern DL_IMPORT(PyObject *) PyExc_WindowsError;
Index: pystate.h
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Include/pystate.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** pystate.h 1 May 2004 00:44:33 -0000 1.9
--- pystate.h 1 May 2004 01:21:08 -0000 1.10
***************
*** 5,8 ****
--- 5,11 ----
#ifndef Py_PYSTATE_H
#define Py_PYSTATE_H
+ #ifdef STACKLESS
+ #include "core/stackless_tstate.h"
+ #endif
#ifdef __cplusplus
extern "C" {
***************
*** 75,78 ****
--- 78,85 ----
int tick_counter;
+ #ifdef STACKLESS
+ PyStacklessState st;
+ #endif
+
/* XXX signal handlers should also be here */
_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins
- Previous message: [Stackless-checkins] CVS: slpdev/src/2.2/src/Lib copy.py, 1.4, 1.5 copy_reg.py, 1.1.1.2, 1.2 pickle.py, 1.4, 1.5 site.py, 1.1.1.2, 1.2
- Next message: [Stackless-checkins] CVS: slpdev/src/2.2/src/Mac/Modules/cg CGStubLib, 1.1.1.2, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Stackless-checkins
mailing list