|
From: <rom...@us...> - 2006-10-04 00:47:05
|
Revision: 610
http://svn.sourceforge.net/pygccxml/?rev=610&view=rev
Author: roman_yakovenko
Date: 2006-10-01 12:20:54 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
fixing code generation for non-public class hierarchies
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-09-29 16:45:03 UTC (rev 609)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-10-01 19:20:54 UTC (rev 610)
@@ -153,7 +153,7 @@
assert isinstance( self.declaration, declarations.class_t )
for base_desc in self.declaration.bases:
assert isinstance( base_desc, declarations.hierarchy_info_t )
- if base_desc.access == declarations.ACCESS_TYPES.PRIVATE:
+ if base_desc.access != declarations.ACCESS_TYPES.PUBLIC:
continue
if base_creators.has_key( id(base_desc.related_class) ):
bases.append( algorithm.create_identifier( self, base_desc.related_class.decl_string ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-08-18 05:50:58
|
Revision: 1107
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1107&view=rev
Author: roman_yakovenko
Date: 2007-08-17 22:51:01 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
optimization: eliminating condition test for non-relevant code creators
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-08-18 05:47:24 UTC (rev 1106)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2007-08-18 05:51:01 UTC (rev 1107)
@@ -122,13 +122,12 @@
base_classes[ id( hierarchy_info.related_class ) ] = hierarchy_info
base_classes_size = len( base_classes )
creators = {}
+ creators_len = 0
for creator in algorithm.make_flatten_generator( self.top_parent.body.creators ):
- if not isinstance( creator, class_t ):
- continue
- if id(creator.declaration) in base_classes:
+ if isinstance( creator, class_t ) and id(creator.declaration) in base_classes:
creators[ id(creator.declaration) ] = creator
- if len( creators ) == base_classes_size:
- break #all classes has been found
+ if len( creators ) == base_classes_size:
+ break #all classes has been found
return base_classes, creators
def _get_base_operators(self, base_classes, base_creators):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-06-26 07:41:07
|
Revision: 1356
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1356&view=rev
Author: roman_yakovenko
Date: 2008-06-26 00:41:16 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
updating to latest GCCXML version
struct X{ const int items[10]; } will generate noncopyable in class_ definition
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 06:13:05 UTC (rev 1355)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 07:41:16 UTC (rev 1356)
@@ -148,7 +148,11 @@
return operator_creators
def _generate_noncopyable(self):
- if self.declaration.noncopyable:
+ noncopyable_vars = self.declaration.find_noncopyable_vars()
+ copy_constr = self.declaration.find_copy_constructor()
+
+ if self.declaration.noncopyable \
+ or copy_constr and copy_constr.is_artificial and noncopyable_vars:
return algorithm.create_identifier( self, '::boost::noncopyable' )
def _generate_bases(self, base_creators):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-06-26 09:36:17
|
Revision: 1357
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1357&view=rev
Author: roman_yakovenko
Date: 2008-06-26 02:36:26 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
cleaning no_init conditions
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 07:41:16 UTC (rev 1356)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 09:36:26 UTC (rev 1357)
@@ -218,15 +218,14 @@
result.append( ', %s' % self.documentation )
used_init = None
inits = filter( lambda x: isinstance( x, calldef.constructor_t ), self.creators )
- if ( self.declaration.is_abstract \
- or not declarations.has_any_non_copyconstructor(self.declaration) ) \
- and not self.wrapper \
- or ( declarations.has_destructor( self.declaration )
- and not declarations.has_public_destructor( self.declaration ) ):
- #TODO: or self.declaration has public constructor and destructor
+ has_nonpublic_destructor = declarations.has_destructor( self.declaration ) \
+ and not declarations.has_public_destructor( self.declaration )
+ if has_nonpublic_destructor \
+ or ( self.declaration.is_abstract and not self.wrapper ) \
+ or not declarations.has_any_non_copyconstructor(self.declaration):
result.append( ", " )
result.append( algorithm.create_identifier( self, '::boost::python::no_init' ) )
- elif not declarations.has_trivial_constructor( self.declaration ):
+ elif not self.declaration.find_trivial_constructor():
if inits:
used_init = inits[0]
result.append( ", " )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-06-26 10:49:06
|
Revision: 1358
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1358&view=rev
Author: roman_yakovenko
Date: 2008-06-26 03:49:15 -0700 (Thu, 26 Jun 2008)
Log Message:
-----------
updating to latest GCCXML version
struct X{ const int items[10]; } will generate no_init in class_<...> constructor
Modified Paths:
--------------
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 09:36:26 UTC (rev 1357)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-26 10:49:15 UTC (rev 1358)
@@ -220,9 +220,17 @@
inits = filter( lambda x: isinstance( x, calldef.constructor_t ), self.creators )
has_nonpublic_destructor = declarations.has_destructor( self.declaration ) \
and not declarations.has_public_destructor( self.declaration )
+
+ #select all public constructors and exclude copy constructor
+ cs = self.declaration.constructors( lambda c: not c.is_copy_constructor and c.access_type == 'public'
+ , recursive=False, allow_empty=True )
+ has_suitable_constructor = bool( cs )
+ if cs and len(cs) == 1 and cs[0].is_trivial_constructor and self.declaration.find_noncopyable_vars():
+ has_suitable_constructor = False
+
if has_nonpublic_destructor \
or ( self.declaration.is_abstract and not self.wrapper ) \
- or not declarations.has_any_non_copyconstructor(self.declaration):
+ or not has_suitable_constructor:
result.append( ", " )
result.append( algorithm.create_identifier( self, '::boost::python::no_init' ) )
elif not self.declaration.find_trivial_constructor():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
