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

Added patch 701860.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4586 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-03-20 18:59:01 +00:00
commit fd5f885380
1 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1854,14 +1854,14 @@ public:
} }
/* Now build the real class with a normal constructor */ /* Now build the real class with a normal constructor */
Printv(f_shadow, Printv(f_shadow,
"\nclass ", class_name, "Ptr(", class_name, "):\n", "\nclass ", class_name, "Ptr(", class_name, "):\n",
tab4, "def __init__(self,this):\n", tab4, "def __init__(self,this):\n",
tab8, "self.this = this\n", tab8, "_swig_setattr(self, ", class_name, ", 'this', this)\n",
tab8, "if not hasattr(self,\"thisown\"): self.thisown = 0\n", tab8, "if not hasattr(self,\"thisown\"): _swig_setattr(self, ", class_name, ", 'thisown', 0)\n",
// tab8,"try: self.this = this.this; self.thisown = getattr(this,'thisown',0); this.thisown=0\n", // tab8,"try: self.this = this.this; self.thisown = getattr(this,'thisown',0); this.thisown=0\n",
// tab8,"except AttributeError: self.this = this\n" // tab8,"except AttributeError: self.this = this\n"
tab8, "self.__class__ = ", class_name, "\n", tab8, "_swig_setattr(self, ", class_name, ",self.__class__,", class_name, ")\n",
NIL); NIL);
Printf(f_shadow,"%s.%s_swigregister(%sPtr)\n", module, class_name, class_name,0); Printf(f_shadow,"%s.%s_swigregister(%sPtr)\n", module, class_name, class_name,0);
shadow_indent = 0; shadow_indent = 0;
@ -1975,6 +1975,8 @@ public:
String *pass_self = NewString(""); String *pass_self = NewString("");
Node *parent = Swig_methodclass(n); Node *parent = Swig_methodclass(n);
String *classname = Swig_class_name(parent); String *classname = Swig_class_name(parent);
String *rclassname = Swig_class_name(getCurrentClass());
assert(rclassname);
if (use_director) { if (use_director) {
Printv(pass_self, tab8, NIL); Printv(pass_self, tab8, NIL);
Printf(pass_self, "if self.__class__ == %s:\n", classname); Printf(pass_self, "if self.__class__ == %s:\n", classname);
@ -1983,20 +1985,20 @@ public:
tab8, tab4, "args = (self,) + args\n", tab8, tab4, "args = (self,) + args\n",
NIL); NIL);
} }
if ((allow_kwargs) && (!Getattr(n,"sym:overloaded"))) { if ((allow_kwargs) && (!Getattr(n,"sym:overloaded"))) {
Printv(f_shadow, tab4, "def __init__(self,*args,**kwargs):\n", NIL); Printv(f_shadow, tab4, "def __init__(self,*args,**kwargs):\n", NIL);
Printv(f_shadow, pass_self, NIL); Printv(f_shadow, pass_self, NIL);
Printv(f_shadow, tab8, "self.this = apply(", module, ".", Swig_name_construct(symname), ",args,kwargs)\n", NIL); Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', apply(", module, ".", Swig_name_construct(symname), ",args, kwargs))\n", NIL);
} else { } else {
Printv(f_shadow, tab4, "def __init__(self,*args):\n",NIL); Printv(f_shadow, tab4, "def __init__(self,*args):\n",NIL);
Printv(f_shadow, pass_self, NIL); Printv(f_shadow, pass_self, NIL);
Printv(f_shadow, tab8, "self.this = apply(", module, ".", Swig_name_construct(symname), ",args)\n", NIL); Printv(f_shadow, tab8, "_swig_setattr(self, ", rclassname, ", 'this', apply(", module, ".", Swig_name_construct(symname), ",args))\n", NIL);
} }
Printv(f_shadow, Printv(f_shadow,
tab8, "self.thisown = 1\n", tab8, "_swig_setattr(self, ", rclassname, ", 'thisown', 1)\n",
NIL); NIL);
Delete(pass_self); Delete(pass_self);
} }
have_constructor = 1; have_constructor = 1;
} else { } else {
/* Hmmm. We seem to be creating a different constructor. We're just going to create a /* Hmmm. We seem to be creating a different constructor. We're just going to create a