jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add buildnone option and cosmetics, including sorting options by name

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8290 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-08 06:58:49 +00:00
commit cf431d3b47
2 changed files with 67 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/python/pyrun.swg
View file

@ -87,17 +87,20 @@ extern "C" {
#endif #endif
#endif #endif
/* Safe Py_None and Py_Void accessors */ /* How to access Py_None */
#if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
# ifndef SWIG_PYTHON_NO_SAFE_NONE # ifndef SWIG_PYTHON_NO_BUILD_NONE
# ifndef SWIG_PYTHON_SAFE_NONE # ifndef SWIG_PYTHON_BUILD_NONE
# define SWIG_PYTHON_SAFE_NONE # define SWIG_PYTHON_BUILD_NONE
# endif # endif
# endif # endif
#endif #endif
#ifdef SWIG_PYTHON_SAFE_NONE #ifdef SWIG_PYTHON_BUILD_NONE
# ifdef Py_None
# undef Py_None
# define Py_None SWIG_Py_None()
# endif
SWIGRUNTIMEINLINE PyObject * SWIGRUNTIMEINLINE PyObject *
_SWIG_Py_None(void) _SWIG_Py_None(void)
{ {
@ -111,12 +114,10 @@ SWIG_Py_None(void)
static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None(); static PyObject *SWIG_STATIC_POINTER(none) = _SWIG_Py_None();
return none; return none;
} }
# ifdef Py_None
# undef Py_None
# define Py_None SWIG_Py_None()
# endif
#endif #endif
/* The python void return value */
SWIGRUNTIMEINLINE PyObject * SWIGRUNTIMEINLINE PyObject *
SWIG_Py_Void(void) SWIG_Py_Void(void)
{ {
@ -357,7 +358,6 @@ PySwigObject_Check(PyObject *op) {
|| (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0); || (strcmp((op)->ob_type->tp_name,"PySwigObject") == 0);
} }
SWIGRUNTIME PyObject * SWIGRUNTIME PyObject *
PySwigObject_New(void *ptr, swig_type_info *ty, int own); PySwigObject_New(void *ptr, swig_type_info *ty, int own);
@ -813,14 +813,10 @@ PySwigPacked_UnpackData(PyObject *obj, void *ptr, size_t size)
* pointers/data manipulation * pointers/data manipulation
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
SWIGRUNTIME PyObject * SWIGRUNTIMEINLINE PyObject *
_SWIG_This(void) _SWIG_This(void)
{ {
static PyObject *_this = 0; return PyString_FromString("this");
if (!_this) {
_this = PyString_FromString("this");
}
return _this;
} }
SWIGRUNTIME PyObject * SWIGRUNTIME PyObject *

83
Source/Modules/python.cxx
View file

@ -63,6 +63,8 @@ static int nothreads = 0;
static int classptr = 0; static int classptr = 0;
/* Other options */ /* Other options */
static int shadowimport = 1; static int shadowimport = 1;
static int buildnone = 0;
static int nobuildnone = 0;
static int safecstrings = 0; static int safecstrings = 0;
static int dirvtable = 0; static int dirvtable = 0;
static int proxydel = 1; static int proxydel = 1;
@ -81,46 +83,49 @@ enum autodoc_t {
AUTODOC_METHOD AUTODOC_METHOD
}; };
static const char *usage1 = (char *)"\ static const char *usage1 = (char *)"\
Python Options (available with -python)\n\ Python Options (available with -python)\n\
-aliasobj0 - Alias obj0 when using fastunpack, needed for some old typemaps \n\
-apply - Use apply() in proxy classes\n\
-buildnone - Use Py_BuildValue("") to obtain Py_None (default in Windows)\n\
-castmode - Enable the casting mode, which allows implicit cast between types in python\n\
-classic - Use classic classes only\n\
-classptr - Generate shadow 'ClassPtr' as in older swig versions\n\
-cppcast - Enable C++ casting operators (default) \n\
-dirvtable - Generate a pseudo virtual table for directors for faster dispatch \n\
-fastunpack - Use fast unpack mechanism to parse the argument functions \n\
-globals <name> - Set <name> used to access C global variable [default: 'cvar']\n\ -globals <name> - Set <name> used to access C global variable [default: 'cvar']\n\
-interface <lib>- Set the lib name to <lib>\n\ -interface <lib>- Set the lib name to <lib>\n\
-keyword - Use keyword arguments\n\ -keyword - Use keyword arguments\n\
-classic - Use classic classes only\n\
-cppcast - Enable C++ casting operators (default) \n\
-nocppcast - Disable C++ casting operators, useful for generating bugs\n\
-nortti - Disable the use of the native C++ RTTI with directors\n\
-modern - Use modern python features only, without compatibility code\n\ -modern - Use modern python features only, without compatibility code\n\
-nomodern - Don't use modern python features which are not back compatible \n\
-apply - Use apply() in proxy classes\n\
-new_vwm - New value wrapper mode, use only when everything else fails \n\
-new_repr - Use more informative version of __repr__ in proxy classes (default) \n\
-old_repr - Use shorter and old version of __repr__ in proxy classes\n\
-classptr - Generate shadow 'ClassPtr' as in older swig versions\n\
-threads - Add thread support for all the interface\n\
-nothreads - Disable thread support for all the interface\n\
-noexcept - No automatic exception handling\n";
static const char *usage2 = (char *)"\
-noh - Don't generate the output header file\n\
-noproxy - Don't generate proxy classes \n\
-noproxyimport - Don't insert proxy import statements derived from the %import directive \n\
-safecstrings - Use safer (but slower) C string mapping, generating copies from Python -> C/C++\n\
-nosafecstrings - Avoid extra strings copies when possible (default)\n\
-dirvtable - Generate a pseudo virtual table for directors for faster dispatch \n\
-nodirvtable - Don't use the virtual table feature, resolve the python method each time (default)\n\
-proxydel - Generate a __del__ method even when now is redundant (default) \n\
-noproxydel - Don't generate the redundant __del__ method \n\
-modernargs - Use \"modern\" args mechanism to pack/unpack the function arguments \n\ -modernargs - Use \"modern\" args mechanism to pack/unpack the function arguments \n\
-nomodernargs - Use classic ParseTuple/CallFunction methods to pack/unpack the function arguments (default) \n\ -new_repr - Use more informative version of __repr__ in proxy classes (default) \n\
-fastunpack - Use fast unpack mechanism to parse the argument functions \n\ -new_vwm - New value wrapper mode, use only when everything else fails \n\
-nofastunpack - Use traditional UnpackTuple method to parse the argument functions (default) \n\
-aliasobj0 - Alias obj0 when using fastunpack, needed for some old typemaps \n\
-noaliasobj0 - Don't generate an obj0 alias when using fastunpack (default) \n\ -noaliasobj0 - Don't generate an obj0 alias when using fastunpack (default) \n\
-castmode - Enable the casting mode, which allows implicit cast between types in python\n\ -nobuildnone - Access Py_None directly (default in non-Windows systems)\n\
-nocastmode - Disable the casting mode (default)\n\ -nocastmode - Disable the casting mode (default)\n";
static const char *usage2 = (char *)"\
-nocppcast - Disable C++ casting operators, useful for generating bugs\n\
-nodirvtable - Don't use the virtual table feature, resolve the python method each time (default)\n\
-noexcept - No automatic exception handling\n\
-nofastunpack - Use traditional UnpackTuple method to parse the argument functions (default) \n\
-noh - Don't generate the output header file\n\
-nomodern - Don't use modern python features which are not back compatible \n\
-nomodernargs - Use classic ParseTuple/CallFunction methods to pack/unpack the function arguments (default) \n\
-noproxy - Don't generate proxy classes \n\
-noproxydel - Don't generate the redundant __del__ method \n\
-noproxyimport - Don't insert proxy import statements derived from the %import directive \n\
-nortti - Disable the use of the native C++ RTTI with directors\n\
-nosafecstrings - Avoid extra strings copies when possible (default)\n\
-nothreads - Disable thread support for all the interface\n\
-old_repr - Use shorter and old version of __repr__ in proxy classes\n\
-proxydel - Generate a __del__ method even when now is redundant (default) \n\
-safecstrings - Use safer (but slower) C string mapping, generating copies from Python -> C/C++\n\
-threads - Add thread support for all the interface\n\
-O - Enable all the optimizations options: \n\ -O - Enable all the optimizations options: \n\
-modern -fastdispatch -dirvtable -nosafecstrings -fvirtual \n\ -modern -fastdispatch -dirvtable -nosafecstrings -fvirtual \n\
-noproxydel -fastunpack -modernargs\n\ -noproxydel -fastunpack -modernargs -nobuildnone \n\
\n"; \n";
class PYTHON : public Language { class PYTHON : public Language {
@ -287,6 +292,14 @@ public:
} else if (strcmp(argv[i],"-nosafecstrings") == 0) { } else if (strcmp(argv[i],"-nosafecstrings") == 0) {
safecstrings = 0; safecstrings = 0;
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strcmp(argv[i],"-buildnone") == 0) {
buildnone = 1;
nobuildnone = 0;
Swig_mark_arg(i);
} else if (strcmp(argv[i],"-nobuildnone") == 0) {
buildnone = 0;
nobuildnone = 1;
Swig_mark_arg(i);
} else if (strcmp(argv[i],"-dirvtable") == 0) { } else if (strcmp(argv[i],"-dirvtable") == 0) {
dirvtable = 1; dirvtable = 1;
Swig_mark_arg(i); Swig_mark_arg(i);
@ -347,6 +360,8 @@ public:
modern = 1; modern = 1;
dirvtable = 1; dirvtable = 1;
safecstrings = 0; safecstrings = 0;
buildnone = 0;
nobuildnone = 1;
classptr = 0; classptr = 0;
proxydel = 0; proxydel = 0;
fastunpack = 1; fastunpack = 1;
@ -478,6 +493,14 @@ public:
Printf(f_runtime,"#define SWIG_PYTHON_SAFE_CSTRINGS\n"); Printf(f_runtime,"#define SWIG_PYTHON_SAFE_CSTRINGS\n");
} }
if (buildnone) {
Printf(f_runtime,"#define SWIG_PYTHON_BUILD_NONE\n");
}
if (nobuildnone) {
Printf(f_runtime,"#define SWIG_PYTHON_NO_BUILD_NONE\n");
}
if (!dirvtable) { if (!dirvtable) {
Printf(f_runtime,"#define SWIG_PYTHON_DIRECTOR_NO_VTABLE\n"); Printf(f_runtime,"#define SWIG_PYTHON_DIRECTOR_NO_VTABLE\n");
} }