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

add the -classptr option to generate the old ClassPtr classes

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7957 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-12-09 01:41:19 +00:00
commit d7c67aecfe
2 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
SWIG/CHANGES.current
View file

@ -638,10 +638,17 @@ Version 1.3.28 (unreleased).
*** POTENTIAL INCOMPATIBILITY *** *** POTENTIAL INCOMPATIBILITY ***
There is no more ClassPtr classes, so, if in the past you There is no more ClassPtr classes in the python code. Hence,
needed to resort in some kind of trick to use, or overcome if in the past you needed to resort in some kind of trick
their presence, it is no longer needed, but the extra code to use them, or overcome their presence, it is no longer
you added could break. required, but the extra code you added could now break
things arounds.
If needed, you can use the option -classptr, i.e.,
swig -classptr -python ...
to generate the old ClassPtr classes.
10/30/2005: mkoeppe 10/30/2005: mkoeppe

46
SWIG/Source/Modules/python.cxx
View file

@ -60,6 +60,7 @@ static String *real_classname;
/* Thread Support */ /* Thread Support */
static int threads = 0; static int threads = 0;
static int nothreads = 0; static int nothreads = 0;
static int classptr = 0;
/* flags for the make_autodoc function */ /* flags for the make_autodoc function */
enum autodoc_t { enum autodoc_t {
@ -86,6 +87,7 @@ Python Options (available with -python)\n\
-new_vwm - New value wrapper mode, use only when everything else fails \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\ -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\ -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\ -threads - Add thread support for all the interface\n\
-nothreads - Disable thread support for all the interface\n\ -nothreads - Disable thread support for all the interface\n\
-noexcept - No automatic exception handling\n\ -noexcept - No automatic exception handling\n\
@ -214,6 +216,9 @@ public:
} else if (strcmp(argv[i],"-old_repr") == 0) { } else if (strcmp(argv[i],"-old_repr") == 0) {
new_repr = 0; new_repr = 0;
Swig_mark_arg(i); Swig_mark_arg(i);
} else if (strcmp(argv[i],"-classptr") == 0) {
classptr = 1;
Swig_mark_arg(i);
} else if ((strcmp(argv[i],"-noproxy") == 0)) { } else if ((strcmp(argv[i],"-noproxy") == 0)) {
shadow = 0; shadow = 0;
Swig_mark_arg(i); Swig_mark_arg(i);
@ -2304,29 +2309,34 @@ public:
Printv(f_shadow_file, f_shadow, NIL); Printv(f_shadow_file, f_shadow, NIL);
/* Now the Ptr class */ /* Now the Ptr class */
#if 0 if (classptr) {
Printv(f_shadow_file, Printv(f_shadow_file,
"\nclass ", class_name, "Ptr(", class_name, "):\n", "\nclass ", class_name, "Ptr(", class_name, "):\n",
tab4, "def __init__(self, this):\n", NIL); tab4, "def __init__(self, this):\n", NIL);
if (!modern) { if (!modern) {
Printv(f_shadow_file, Printv(f_shadow_file,
tab8, "_swig_setattr(self, ", class_name, ", 'this', this)\n", tab8, "try: self.this.append(this)\n",
tab8, "except: self.this = this\n",
#ifdef USE_THISOWN #ifdef USE_THISOWN
tab8, "if not hasattr(self,\"thisown\"): _swig_setattr(self, ", class_name, ", 'thisown', 0)\n", tab8, "if not hasattr(self,\"thisown\"): _swig_setattr(self, ", class_name, ", 'thisown', 0)\n",
#else
tab8, "self.this.own(0)\n",
#endif #endif
tab8, "self.__class__ = ", class_name, "\n", NIL); tab8, "self.__class__ = ", class_name, "\n\n", NIL);
} else { } else {
Printv(f_shadow_file, Printv(f_shadow_file,
tab8, "self.this = this\n", tab8, "try: self.this.append(this)\n",
tab8, "except: self.this = this\n",
#ifdef USE_THISOWN #ifdef USE_THISOWN
tab8, "if not hasattr(self,\"thisown\"): self.thisown = 0\n", tab8, "if not hasattr(self,\"thisown\"): self.thisown = 0\n",
#else
tab8, "self.this.own(0)\n",
#endif #endif
tab8, "self.__class__ = ", class_name, "\n", NIL); tab8, "self.__class__ = ", class_name, "\n\n", NIL);
// tab8,"try: self.this = this.this; self.thisown = getattr(this,'thisown',0); this.thisown=0\n", }
// tab8,"except AttributeError: self.this = this\n"
} }
#endif
List *shadow_list = Getattr(n,"shadow_methods"); List *shadow_list = Getattr(n,"shadow_methods");
for (int i = 0; i < Len(shadow_list); ++i) { for (int i = 0; i < Len(shadow_list); ++i) {
String *symname = Getitem(shadow_list,i); String *symname = Getitem(shadow_list,i);