[pygccxml-commit] SF.net SVN: pygccxml: [979] pyplusplus_dev/pyplusplus

[<rom...@us...>]

Revision: 979
          http://svn.sourceforge.net/pygccxml/?rev=979&view=rev
Author:   roman_yakovenko
Date:     2007-04-10 13:23:57 -0700 (Tue, 10 Apr 2007)

Log Message:
-----------
fixing bug - redefining CLASS_TYPE

Modified Paths:
--------------
    pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
    pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py

Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py	2007-04-10 20:12:42 UTC (rev 978)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py	2007-04-10 20:23:57 UTC (rev 979)
@@ -178,7 +178,7 @@
 
         held_type = self._generated_held_type()
         if self.wrapper:
-            if self.declaration.class_type == self.declaration.CLASS_TYPE.WRAPPER:
+            if self.declaration.exposed_class_type == self.declaration.EXPOSED_CLASS_TYPE.WRAPPER:
                 args.append( self.wrapper.full_name )
             else:
                 if not self.target_configuration.boost_python_has_wrapper_held_type \

Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py
===================================================================
--- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py	2007-04-10 20:12:42 UTC (rev 978)
+++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py	2007-04-10 20:23:57 UTC (rev 979)
@@ -178,10 +178,10 @@
                , scopedef_wrapper.scopedef_t
                , declarations.class_t):
     
-    class CLASS_TYPE:
-        DEFAULT = 'default'
+    class EXPOSED_CLASS_TYPE:
+        DECLARED = 'declared'
         WRAPPER = 'wrapper'
-        ALL = ( DEFAULT, WRAPPER )
+        ALL = ( DECLARED, WRAPPER )
         
     def __init__(self, *arguments, **keywords):
         class_common_details_t.__init__( self )
@@ -201,7 +201,7 @@
         self._properties = []
         self._redefined_funcs = None
         self._require_self_reference  = False
-        self._class_type = self.CLASS_TYPE.DEFAULT
+        self._exposed_class_type = self.EXPOSED_CLASS_TYPE.DECLARED
         
     def _get_redefine_operators( self ):
         return self._redefine_operators
@@ -210,11 +210,12 @@
     redefine_operators = property( _get_redefine_operators, _set_redefine_operators
                                    , doc="tells Py++ to redefine operators from base class in this class, False by default")
 
-    def _get_class_type(self):
-        return self._class_type
-    def _set_class_type(self, class_type):
+    def _get_exposed_class_type(self):
+        return self._exposed_class_type
+    def _set_exposed_class_type(self, class_type):
+        assert class_type in self.EXPOSED_CLASS_TYPE.ALL
         self._class_type = class_type
-    class_type = property( _get_class_type, _set_class_type
+    exposed_class_type = property( _get_exposed_class_type, _set_exposed_class_type
                           , doc="set this value to CLASS_TYPE.WRAPPER, if you need to transfer ownership of" \
                                 "polymorphic class" )
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.