|
From: <rom...@us...> - 2007-02-20 19:42:04
|
Revision: 917
http://svn.sourceforge.net/pygccxml/?rev=917&view=rev
Author: roman_yakovenko
Date: 2007-02-20 11:41:19 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
rallback some changes, which were done while I wrote documentation
Modified Paths:
--------------
pyplusplus_dev/unittests/data/function_transformations_to_be_exported.hpp
pyplusplus_dev/unittests/function_transformations_tester.py
Modified: pyplusplus_dev/unittests/data/function_transformations_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/function_transformations_to_be_exported.hpp 2007-02-20 11:04:51 UTC (rev 916)
+++ pyplusplus_dev/unittests/data/function_transformations_to_be_exported.hpp 2007-02-20 19:41:19 UTC (rev 917)
@@ -231,21 +231,20 @@
};
-
-}
-
-struct resource_t{
- resource_t(){
- std::cout << "created";
+struct transfer_ownership_tester_t{
+ struct resources_t{
+ resources_t(){
+ std::cout << "created";
+ }
+ ~resources_t(){
+ std::cout << "destroyed";
+ }
+ };
+ void tester(resources_t* r){
+ delete r;
}
- ~resource_t(){
- std::cout << "destroyed";
- }
};
-void do_smth(resource_t* r){
-
}
-
#endif//__function_transformations_to_be_exported_hpp__
Modified: pyplusplus_dev/unittests/function_transformations_tester.py
===================================================================
--- pyplusplus_dev/unittests/function_transformations_tester.py 2007-02-20 11:04:51 UTC (rev 916)
+++ pyplusplus_dev/unittests/function_transformations_tester.py 2007-02-20 19:41:19 UTC (rev 917)
@@ -85,10 +85,11 @@
write_s = cls.mem_fun( 'write_s' )
write_s.add_transformation( ft.input_c_buffer( 'buffer', 'size' ) )
- resource = mb.class_( 'resource_t' )
+ resource = mb.class_( 'resources_t' )
resource.held_type = 'std::auto_ptr< %s >' % resource.decl_string
- do_smth = mb.free_fun( 'do_smth' )
- do_smth.add_transformation( ft.transfer_ownership( 0 ) )
+ transfer_ownership_tester = mb.class_( 'transfer_ownership_tester_t' )
+ tester = transfer_ownership_tester.mem_fun( 'tester' )
+ tester.add_transformation( ft.transfer_ownership( 0 ) )
def run_tests(self, module):
"""Run the actual unit tests.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-24 19:11:18
|
Revision: 925
http://svn.sourceforge.net/pygccxml/?rev=925&view=rev
Author: roman_yakovenko
Date: 2007-02-24 11:11:16 -0800 (Sat, 24 Feb 2007)
Log Message:
-----------
adding functionality necessary to implement correct "transfer_ownership" behaviour - adding tester
Modified Paths:
--------------
pyplusplus_dev/unittests/data/transfer_ownership_to_be_exported.hpp
pyplusplus_dev/unittests/transfer_ownership_tester.py
Modified: pyplusplus_dev/unittests/data/transfer_ownership_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/transfer_ownership_to_be_exported.hpp 2007-02-24 19:09:22 UTC (rev 924)
+++ pyplusplus_dev/unittests/data/transfer_ownership_to_be_exported.hpp 2007-02-24 19:11:16 UTC (rev 925)
@@ -3,11 +3,16 @@
struct event_t
{
+ virtual ~event_t(){}
+ void invoke(){
+ notify();
+ }
+protected:
virtual void notify() = 0;
- virtual ~event_t(){}
};
struct do_nothing_t : event_t{
+protected:
virtual void notify(){};
};
@@ -18,7 +23,7 @@
};
void run() {
- m_event->notify();
+ m_event->invoke();
delete m_event;
m_event = 0;
};
Modified: pyplusplus_dev/unittests/transfer_ownership_tester.py
===================================================================
--- pyplusplus_dev/unittests/transfer_ownership_tester.py 2007-02-24 19:09:22 UTC (rev 924)
+++ pyplusplus_dev/unittests/transfer_ownership_tester.py 2007-02-24 19:11:16 UTC (rev 925)
@@ -77,8 +77,7 @@
self.container = container
def notify( self ):
- print 1
- #self.container.append( 1 )
+ self.container.append( 1 )
print '1'
notify_data = []
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-02-26 21:44:32
|
Revision: 935
http://svn.sourceforge.net/pygccxml/?rev=935&view=rev
Author: roman_yakovenko
Date: 2007-02-26 13:44:29 -0800 (Mon, 26 Feb 2007)
Log Message:
-----------
adding initial support for str( self ) ( operator<< ) support
Modified Paths:
--------------
pyplusplus_dev/unittests/data/operators_to_be_exported.hpp
pyplusplus_dev/unittests/operators_tester.py
Modified: pyplusplus_dev/unittests/data/operators_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/operators_to_be_exported.hpp 2007-02-26 21:43:00 UTC (rev 934)
+++ pyplusplus_dev/unittests/data/operators_to_be_exported.hpp 2007-02-26 21:44:29 UTC (rev 935)
@@ -26,6 +26,23 @@
}
};
+struct XXX{
+ friend std::ostream& operator<<(std::ostream& s, XXX const& x);
+};
+
+inline std::ostream& operator<<(std::ostream& s, XXX const& x){
+ return s << "<XXX instance at " << &x << ">";
+}
+
+//Boost.Python does not support member operator<<
+struct YYY{
+ std::ostream& operator<<(std::ostream& s) const{
+ return s;
+ //return s << "<YYY instance at " << reinterpret_cast<unsigned long>( this )<< ">";
+ }
+};
+
+
} }
Modified: pyplusplus_dev/unittests/operators_tester.py
===================================================================
--- pyplusplus_dev/unittests/operators_tester.py 2007-02-26 21:43:00 UTC (rev 934)
+++ pyplusplus_dev/unittests/operators_tester.py 2007-02-26 21:44:29 UTC (rev 935)
@@ -7,6 +7,7 @@
import sys
import unittest
import fundamental_tester_base
+from pygccxml import declarations
from pyplusplus.module_builder import call_policies
class tester_t(fundamental_tester_base.fundamental_tester_base_t):
@@ -20,6 +21,14 @@
def customize( self, mb ):
mb.global_ns.exclude()
+
+ xxx = mb.class_( 'XXX' )
+ xxx.include()
+ xxx_ref = declarations.reference_t( declarations.const_t( declarations.declarated_t( xxx ) ) )
+ oper = mb.global_ns.free_operator( '<<', arg_types=[None, xxx_ref] )
+ oper.include()
+
+ mb.class_( 'YYY' ).include()
rational = mb.class_('rational<long>')
rational.include()
@@ -78,7 +87,13 @@
r1 = pyrational( 5, 7 )
self.failUnless( r1.assign( 17 ) == pyrational( 17, 1 ) )
+
+ x = module.XXX()
+ print str( x )
+ y = module.YYY()
+ print str( y )
+
def create_suite():
suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-07-09 06:03:15
|
Revision: 1084
http://svn.sourceforge.net/pygccxml/?rev=1084&view=rev
Author: roman_yakovenko
Date: 2007-07-08 23:03:16 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
adding new "final class" test case
Added Paths:
-----------
pyplusplus_dev/unittests/data/final_classes_to_be_exported.hpp
pyplusplus_dev/unittests/final_classes_tester.py
Added: pyplusplus_dev/unittests/data/final_classes_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/final_classes_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/final_classes_to_be_exported.hpp 2007-07-09 06:03:16 UTC (rev 1084)
@@ -0,0 +1,24 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __final_classes_to_be_exported_hpp__
+#define __final_classes_to_be_exported_hpp__
+
+#include <string>
+
+namespace final_classes{
+
+class Foo{
+public:
+ virtual void bar() {}
+private:
+ Foo() {}
+};
+
+
+}
+
+#endif//__final_classes_to_be_exported_hpp__
+
Added: pyplusplus_dev/unittests/final_classes_tester.py
===================================================================
--- pyplusplus_dev/unittests/final_classes_tester.py (rev 0)
+++ pyplusplus_dev/unittests/final_classes_tester.py 2007-07-09 06:03:16 UTC (rev 1084)
@@ -0,0 +1,38 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import fundamental_tester_base
+from pygccxml import declarations
+from pyplusplus.module_builder import call_policies
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'final_classes'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize(self, mb ):
+ mb.namespace( 'final_classes' ).include()
+ mb.mem_fun('bar').virtuality = declarations.FUNCTION_VIRTUALITY_TYPES.NOT_VIRTUAL
+
+ def run_tests(self, module):
+ pass
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-19 21:05:04
|
Revision: 1158
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1158&view=rev
Author: roman_yakovenko
Date: 2007-11-19 13:05:05 -0800 (Mon, 19 Nov 2007)
Log Message:
-----------
adding new test case for reported bug
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/include_exclude_bug_to_be_exported.hpp
pyplusplus_dev/unittests/include_exclude_bug_tester.py
Property Changed:
----------------
pyplusplus_dev/unittests/data/
Property changes on: pyplusplus_dev/unittests/data
___________________________________________________________________
Name: svn:ignore
- *.obj
call_policies_to_be_exported.os
+ *.obj
call_policies_to_be_exported.os
global_variables_to_be_exported.os
member_functions_to_be_exported.os
Added: pyplusplus_dev/unittests/data/include_exclude_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/include_exclude_bug_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/include_exclude_bug_to_be_exported.hpp 2007-11-19 21:05:05 UTC (rev 1158)
@@ -0,0 +1,398 @@
+// Copyright 2004-2007 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//This file is base on OgreAny.h file, just slightly modified to remove dependencies.
+
+/*
+-----------------------------------------------------------------------------
+This source file is part of OGRE
+ (Object-oriented Graphics Rendering Engine)
+For the latest info, see http://www.ogre3d.org/
+
+Copyright (c) 2000-2006 Torus Knot Software Ltd
+Also see acknowledgements in Readme.html
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) Any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+Any WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with
+this program; if not, write to the Free Software Foundation, Inc., 59 Temple
+Place - Suite 330, Boston, MA 02111-1307, USA, or go to
+http://www.gnu.org/copyleft/lesser.txt.
+
+You may alternatively use this source under the terms of a specific version of
+the OGRE Unrestricted License provided you have obtained such a license from
+Torus Knot Software Ltd.
+-----------------------------------------------------------------------------
+*/
+// -- Based on boost::any, original copyright information follows --
+// Copyright Kevlin Henney, 2000, 2001, 2002. All rights reserved.
+//
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompAnying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+// -- End original copyright --
+
+#ifndef __OGRE_ANY_H__
+#define __OGRE_ANY_H__
+
+#include <string>
+#include <algorithm>
+#include <stdexcept>
+#include <typeinfo>
+
+
+namespace Ogre
+{
+ /** Variant type that can hold Any other type.
+ */
+ class Any
+ {
+ public: // constructors
+
+ Any()
+ : mContent(0)
+ {
+ }
+
+ template<typename ValueType>
+ explicit Any(const ValueType & value)
+ : mContent(new holder<ValueType>(value))
+ {
+ }
+
+ Any(const Any & other)
+ : mContent(other.mContent ? other.mContent->clone() : 0)
+ {
+ }
+
+ virtual ~Any()
+ {
+ delete mContent;
+ }
+
+ public: // modifiers
+
+ Any& swap(Any & rhs)
+ {
+ std::swap(mContent, rhs.mContent);
+ return *this;
+ }
+
+ template<typename ValueType>
+ Any& operator=(const ValueType & rhs)
+ {
+ Any(rhs).swap(*this);
+ return *this;
+ }
+
+ Any & operator=(const Any & rhs)
+ {
+ Any(rhs).swap(*this);
+ return *this;
+ }
+
+ public: // queries
+
+ bool isEmpty() const
+ {
+ return !mContent;
+ }
+
+ const std::type_info& getType() const
+ {
+ return mContent ? mContent->getType() : typeid(void);
+ }
+
+ inline friend std::ostream& operator <<
+ ( std::ostream& o, const Any& v )
+ {
+ if (v.mContent)
+ v.mContent->writeToStream(o);
+ return o;
+ }
+
+
+ protected: // types
+
+ class placeholder
+ {
+ public: // structors
+
+ virtual ~placeholder()
+ {
+ }
+
+ public: // queries
+
+ virtual const std::type_info& getType() const = 0;
+
+ virtual placeholder * clone() const = 0;
+
+ virtual void writeToStream(std::ostream& o) = 0;
+
+ };
+
+ template<typename ValueType>
+ class holder : public placeholder
+ {
+ public: // structors
+
+ holder(const ValueType & value)
+ : held(value)
+ {
+ }
+
+ public: // queries
+
+ virtual const std::type_info & getType() const
+ {
+ return typeid(ValueType);
+ }
+
+ virtual placeholder * clone() const
+ {
+ return new holder(held);
+ }
+
+ virtual void writeToStream(std::ostream& o)
+ {
+ o << held;
+ }
+
+
+ public: // representation
+
+ ValueType held;
+
+ };
+
+
+
+ protected: // representation
+ placeholder * mContent;
+
+ template<typename ValueType>
+ friend ValueType * any_cast(Any *);
+
+
+ public:
+
+ template<typename ValueType>
+ ValueType operator()() const
+ {
+ if (!mContent)
+ {
+ throw std::runtime_error( "Bad cast from uninitialised Any" );
+ }
+ else if(getType() == typeid(ValueType))
+ {
+ return static_cast<Any::holder<ValueType> *>(mContent)->held;
+ }
+ else
+ {
+ throw std::runtime_error( "Bad cast from specific type" );
+ }
+ }
+
+
+
+ };
+
+
+ /** Specialised Any class which has built in arithmetic operators, but can
+ hold only types which support operator +,-,* and / .
+ */
+ class AnyNumeric : public Any
+ {
+ public:
+ AnyNumeric()
+ : Any()
+ {
+ }
+
+ template<typename ValueType>
+ AnyNumeric(const ValueType & value)
+
+ {
+ mContent = new numholder<ValueType>(value);
+ }
+
+ AnyNumeric(const AnyNumeric & other)
+ : Any()
+ {
+ mContent = other.mContent ? other.mContent->clone() : 0;
+ }
+ protected:
+ class numplaceholder : public Any::placeholder
+ {
+ public: // structors
+
+ ~numplaceholder()
+ {
+ }
+ virtual Any::placeholder* add(Any::placeholder* rhs) = 0;
+ virtual Any::placeholder* subtract(Any::placeholder* rhs) = 0;
+ virtual Any::placeholder* multiply(Any::placeholder* rhs) = 0;
+ virtual Any::placeholder* multiply(double factor) = 0;
+ virtual Any::placeholder* divide(Any::placeholder* rhs) = 0;
+ };
+
+ template<typename ValueType>
+ class numholder : public numplaceholder
+ {
+ public: // structors
+
+ numholder(const ValueType & value)
+ : held(value)
+ {
+ }
+
+ public: // queries
+
+ virtual const std::type_info & getType() const
+ {
+ return typeid(ValueType);
+ }
+
+ virtual placeholder * clone() const
+ {
+ return new numholder(held);
+ }
+
+ virtual placeholder* add(placeholder* rhs)
+ {
+ return new numholder(held + static_cast<numholder*>(rhs)->held);
+ }
+ virtual placeholder* subtract(placeholder* rhs)
+ {
+ return new numholder(held - static_cast<numholder*>(rhs)->held);
+ }
+ virtual placeholder* multiply(placeholder* rhs)
+ {
+ return new numholder(held * static_cast<numholder*>(rhs)->held);
+ }
+ virtual placeholder* multiply(double factor)
+ {
+ return new numholder(held * factor);
+ }
+ virtual placeholder* divide(placeholder* rhs)
+ {
+ return new numholder(held / static_cast<numholder*>(rhs)->held);
+ }
+ virtual void writeToStream(std::ostream& o)
+ {
+ o << held;
+ }
+
+ public: // representation
+
+ ValueType held;
+
+ };
+
+ /// Construct from holder
+ AnyNumeric(placeholder* pholder)
+ {
+ mContent = pholder;
+ }
+
+ public:
+ AnyNumeric & operator=(const AnyNumeric & rhs)
+ {
+ AnyNumeric(rhs).swap(*this);
+ return *this;
+ }
+ AnyNumeric operator+(const AnyNumeric& rhs) const
+ {
+ return AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->add(rhs.mContent));
+ }
+ AnyNumeric operator-(const AnyNumeric& rhs) const
+ {
+ return AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->subtract(rhs.mContent));
+ }
+ AnyNumeric operator*(const AnyNumeric& rhs) const
+ {
+ return AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->multiply(rhs.mContent));
+ }
+ AnyNumeric operator*(double factor) const
+ {
+ return AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->multiply(factor));
+ }
+ AnyNumeric operator/(const AnyNumeric& rhs) const
+ {
+ return AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->divide(rhs.mContent));
+ }
+ AnyNumeric& operator+=(const AnyNumeric& rhs)
+ {
+ *this = AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->add(rhs.mContent));
+ return *this;
+ }
+ AnyNumeric& operator-=(const AnyNumeric& rhs)
+ {
+ *this = AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->subtract(rhs.mContent));
+ return *this;
+ }
+ AnyNumeric& operator*=(const AnyNumeric& rhs)
+ {
+ *this = AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->multiply(rhs.mContent));
+ return *this;
+ }
+ AnyNumeric& operator/=(const AnyNumeric& rhs)
+ {
+ *this = AnyNumeric(
+ static_cast<numplaceholder*>(mContent)->divide(rhs.mContent));
+ return *this;
+ }
+
+
+
+
+ };
+
+
+ template<typename ValueType>
+ ValueType * any_cast(Any * operand)
+ {
+ return operand && operand->getType() == typeid(ValueType)
+ ? &static_cast<Any::holder<ValueType> *>(operand->mContent)->held
+ : 0;
+ }
+
+ template<typename ValueType>
+ const ValueType * any_cast(const Any * operand)
+ {
+ return any_cast<ValueType>(const_cast<Any *>(operand));
+ }
+
+ template<typename ValueType>
+ ValueType any_cast(const Any & operand)
+ {
+ const ValueType * result = any_cast<ValueType>(&operand);
+ if(!result)
+ {
+ throw std::runtime_error( "Bad cast from specific type" );
+ }
+ return *result;
+ }
+
+
+}
+
+#endif//__OGRE_ANY_H__
Added: pyplusplus_dev/unittests/include_exclude_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/include_exclude_bug_tester.py (rev 0)
+++ pyplusplus_dev/unittests/include_exclude_bug_tester.py 2007-11-19 21:05:05 UTC (rev 1158)
@@ -0,0 +1,36 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import fundamental_tester_base
+from pyplusplus import code_creators
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'include_exclude_bug'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize(self, mb ):
+ pass
+
+ def run_tests( self, module):
+ pass
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2007-11-15 15:37:20 UTC (rev 1157)
+++ pyplusplus_dev/unittests/test_all.py 2007-11-19 21:05:05 UTC (rev 1158)
@@ -92,6 +92,7 @@
import transfer_ownership_old_tester
import transfer_ownership_tester
import unicode_bug
+import include_exclude_bug_tester
@@ -175,6 +176,7 @@
, transfer_ownership_old_tester
, transfer_ownership_tester
, unicode_bug
+ , include_exclude_bug_tester
]
class process_tester_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-21 21:07:19
|
Revision: 1166
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1166&view=rev
Author: roman_yakovenko
Date: 2007-11-21 13:07:24 -0800 (Wed, 21 Nov 2007)
Log Message:
-----------
adding new unittest
Added Paths:
-----------
pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.cpp
pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.hpp
pyplusplus_dev/unittests/vector_with_shared_data_tester.py
Added: pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.cpp
===================================================================
--- pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.cpp (rev 0)
+++ pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.cpp 2007-11-21 21:07:24 UTC (rev 1166)
@@ -0,0 +1,12 @@
+#include "vector_with_shared_data_to_be_exported.hpp"
+
+namespace samples{
+
+std::vector< boost::shared_ptr<data> > do_smth(){
+ std::vector< boost::shared_ptr<data> > result;
+ result.push_back( boost::shared_ptr<data>( new data() ) );
+ result.push_back( boost::shared_ptr<data>( new data() ) );
+ return result;
+}
+
+}
Added: pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/vector_with_shared_data_to_be_exported.hpp 2007-11-21 21:07:24 UTC (rev 1166)
@@ -0,0 +1,19 @@
+#ifndef __vector_with_shared_data_hpp__
+#define __vector_with_shared_data_hpp__
+
+#include <vector>
+#include <boost/shared_ptr.hpp>
+
+namespace samples{
+
+class data{};
+
+std::vector< boost::shared_ptr<data> > do_smth();
+
+}
+
+namespace pyplusplus{ namespace aliases{
+ typedef std::vector< boost::shared_ptr<samples::data> > shared_data_container_t;
+} }
+
+#endif//__vector_with_shared_data_hpp__
Added: pyplusplus_dev/unittests/vector_with_shared_data_tester.py
===================================================================
--- pyplusplus_dev/unittests/vector_with_shared_data_tester.py (rev 0)
+++ pyplusplus_dev/unittests/vector_with_shared_data_tester.py 2007-11-21 21:07:24 UTC (rev 1166)
@@ -0,0 +1,59 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import autoconfig
+from pyplusplus import utils
+import fundamental_tester_base
+from pygccxml import declarations
+from pyplusplus import module_builder
+from pyplusplus.module_builder import call_policies
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'vector_with_shared_data'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , indexing_suite_version=2
+ , *args )
+ self.files = []
+
+ def customize( self, mb ):
+ mb.global_ns.exclude()
+ mb.namespace( 'samples' ).include()
+ do_smth = mb.free_fun( 'do_smth' )
+ v = declarations.remove_declarated( do_smth.return_type )
+ v.indexing_suite.disable_method( 'sort' )
+ v.indexing_suite.disable_method( 'count' )
+ v.indexing_suite.disable_method( 'index' )
+ v.indexing_suite.disable_method( 'contains' )
+
+ def generate_source_files( self, mb ):
+ files = mb.split_module( autoconfig.build_dir, on_unused_file_found=lambda fpath: fpath )
+ self.files = filter( lambda fname: fname.endswith( 'cpp' ), files )
+ self.files.append( os.path.join( autoconfig.data_directory
+ , self.EXTENSION_NAME + '_to_be_exported.cpp' ) )
+
+ def get_source_files( self ):
+ return self.files
+
+ def run_tests(self, module):
+ x = module.do_smth()
+ self.failUnless( len(x) == 2 )
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-11-29 07:02:53
|
Revision: 1181
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1181&view=rev
Author: roman_yakovenko
Date: 2007-11-28 23:02:58 -0800 (Wed, 28 Nov 2007)
Log Message:
-----------
improving create_with_signature algorithm - fucntion, which are template instantiations will be exposed with signature
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/mailing_list_help_to_be_exported.hpp
pyplusplus_dev/unittests/data/templates_to_be_exported.hpp
pyplusplus_dev/unittests/mailing_list_help_tester.py
pyplusplus_dev/unittests/templates_tester.py
Added: pyplusplus_dev/unittests/data/mailing_list_help_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/mailing_list_help_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/mailing_list_help_to_be_exported.hpp 2007-11-29 07:02:58 UTC (rev 1181)
@@ -0,0 +1,20 @@
+#ifndef __mailing_list_help_hpp__
+#define __mailing_list_help_hpp__
+
+#include <string>
+
+class foo
+{
+public:
+
+ foo() {std::strcpy(buffer, "good bye cruel world!\0\0");}
+ char buffer[24];
+};
+
+class bar
+{
+public:
+ foo f;
+};
+
+#endif//__mailing_list_help_hpp__
Added: pyplusplus_dev/unittests/data/templates_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/templates_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/templates_to_be_exported.hpp 2007-11-29 07:02:58 UTC (rev 1181)
@@ -0,0 +1,31 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __enums_to_be_exported_hpp__
+#define __enums_to_be_exported_hpp__
+
+#include "boost/rational.hpp"
+
+class C{
+public:
+
+ template<typename T>
+ T get_value() const{
+ return static_cast<T>(m_value);
+ }
+
+private:
+ int m_value;
+};
+
+struct instantiator_t{
+ instantiator_t(){
+ boost::gcd<long int>( 1, 1);
+ C c;
+ c.get_value<int>();
+ }
+};
+
+#endif//__enums_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/mailing_list_help_tester.py
===================================================================
--- pyplusplus_dev/unittests/mailing_list_help_tester.py (rev 0)
+++ pyplusplus_dev/unittests/mailing_list_help_tester.py 2007-11-29 07:02:58 UTC (rev 1181)
@@ -0,0 +1,47 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import fundamental_tester_base
+from pyplusplus import code_creators
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'mailing_list_help'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize(self, mb ):
+ foo = mb.class_( 'foo' )
+ foo.add_wrapper_code( 'static std::string get_buffer(const foo& x) { return std::string(x.buffer); }' )
+ foo.add_registration_code( 'def("__str__", &foo_wrapper::get_buffer)' )
+ #bar = mb.class_( 'bar' )
+ #bar.var( 'f' ).use_make_functions = True
+
+ def run_tests( self, module):
+ f1 = module.foo()
+ print 'f1.buffer: ', f1.buffer
+ print 'str(f1):', str(f1)
+ b1 = module.bar()
+ print 'b1.f.buffer:', b1.f.buffer
+ print 'b1.f:', b1.f
+ print 'str(b1.f):', str(b1.f)
+
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Added: pyplusplus_dev/unittests/templates_tester.py
===================================================================
--- pyplusplus_dev/unittests/templates_tester.py (rev 0)
+++ pyplusplus_dev/unittests/templates_tester.py 2007-11-29 07:02:58 UTC (rev 1181)
@@ -0,0 +1,43 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import fundamental_tester_base
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'templates'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize(self, mb ):
+ mb.global_ns.exclude()
+ gcd = mb.free_fun( 'gcd' )
+ gcd.include()
+ c = mb.class_('C')
+ c.include()
+ for f in [gcd, c.mem_fun( 'get_value' )]:
+ f.alias = f.name
+ f.name = f.demangled_name
+ #f.create_with_signature = True
+
+ def run_tests(self, module):
+ pass
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2007-11-29 06:59:58 UTC (rev 1180)
+++ pyplusplus_dev/unittests/test_all.py 2007-11-29 07:02:58 UTC (rev 1181)
@@ -82,6 +82,7 @@
import custom_smart_ptr_classes_tester
import custom_string_tester
import final_classes_tester
+import templates_tester
#gui_tester
#gui_wizard_tester
#
@@ -178,6 +179,7 @@
, unicode_bug
, include_exclude_bug_tester
, vector_with_shared_data_tester
+ , templates_tester
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-12-02 20:48:23
|
Revision: 1182
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1182&view=rev
Author: roman_yakovenko
Date: 2007-12-02 12:48:27 -0800 (Sun, 02 Dec 2007)
Log Message:
-----------
trying to create new tester that reproduce erronious generated code
Modified Paths:
--------------
pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.hpp
pyplusplus_dev/unittests/split_module_bug_tester.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.cpp
pyplusplus_dev/unittests/ogre_generate_tester.py
Added: pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.cpp
===================================================================
--- pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.cpp (rev 0)
+++ pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.cpp 2007-12-02 20:48:27 UTC (rev 1182)
@@ -0,0 +1,3 @@
+#include "split_module_bug_to_be_exported.hpp"
+
+void do_smth(std::vector< image_t > &images){}
Modified: pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.hpp 2007-11-29 07:02:58 UTC (rev 1181)
+++ pyplusplus_dev/unittests/data/split_module_bug_to_be_exported.hpp 2007-12-02 20:48:27 UTC (rev 1182)
@@ -16,4 +16,10 @@
typedef std::vector<int> int_vector;
inline int_vector get_vector(){ return int_vector(); }
+struct image_t{
+ int i;
+};
+
+void do_smth(std::vector< image_t > &images);
+
#endif//__split_module_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/ogre_generate_tester.py
===================================================================
--- pyplusplus_dev/unittests/ogre_generate_tester.py (rev 0)
+++ pyplusplus_dev/unittests/ogre_generate_tester.py 2007-12-02 20:48:27 UTC (rev 1182)
@@ -0,0 +1,50 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import shutil
+import unittest
+import autoconfig
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import code_creators
+from pyplusplus import module_creator
+from pyplusplus import module_builder
+from pyplusplus import utils as pypp_utils
+from pyplusplus import function_transformers as ft
+
+class ogre_generate_tester_t(unittest.TestCase):
+ def test(self):
+ ogre_file = autoconfig.data_directory.replace( 'pyplusplus_dev', 'pygccxml_dev' )
+ ogre_file = parser.create_gccxml_fc( os.path.join( ogre_file, 'ogre1.4.xml' ) )
+
+ mb = module_builder.module_builder_t(
+ [ ogre_file ]
+ , gccxml_path=autoconfig.gccxml.executable
+ , indexing_suite_version=2)
+ mb.global_ns.exclude()
+ mb.namespace('Ogre').include()
+
+ target_dir = os.path.join( autoconfig.build_directory, 'ogre' )
+ if os.path.exists( target_dir ):
+ shutil.rmtree( target_dir )
+ os.mkdir( target_dir )
+
+ mb.build_code_creator( 'Ogre3d' )
+ mb.split_module( target_dir )
+
+
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/split_module_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/split_module_bug_tester.py 2007-11-29 07:02:58 UTC (rev 1181)
+++ pyplusplus_dev/unittests/split_module_bug_tester.py 2007-12-02 20:48:27 UTC (rev 1182)
@@ -19,6 +19,7 @@
fundamental_tester_base.fundamental_tester_base_t.__init__(
self
, tester_t.EXTENSION_NAME
+ , indexing_suite_version=2
, *args )
self.files = []
@@ -30,8 +31,11 @@
def generate_source_files( self, mb ):
files = mb.split_module( autoconfig.build_dir, on_unused_file_found=lambda fpath: fpath )
self.files = filter( lambda fname: fname.endswith( 'cpp' ), files )
+ self.files.append( os.path.join( autoconfig.data_directory
+ , self.EXTENSION_NAME + '_to_be_exported.cpp' ) )
print self.files
+
def get_source_files( self ):
return self.files
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2007-12-05 20:52:47
|
Revision: 1199
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1199&view=rev
Author: roman_yakovenko
Date: 2007-12-05 12:52:52 -0800 (Wed, 05 Dec 2007)
Log Message:
-----------
adding new tester for precompiled header files
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/precompiled_header_to_be_exported.hpp
pyplusplus_dev/unittests/precompiled_header_tester.py
Added: pyplusplus_dev/unittests/data/precompiled_header_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/precompiled_header_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/precompiled_header_to_be_exported.hpp 2007-12-05 20:52:52 UTC (rev 1199)
@@ -0,0 +1,18 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __precompiled_header_to_be_exported_hpp__
+#define __precompiled_header_to_be_exported_hpp__
+
+namespace enums{
+
+enum color{ red, green, blue};
+
+inline int to_int( int x=red ){ return x; }
+
+}
+
+
+#endif//__precompiled_header_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/precompiled_header_tester.py
===================================================================
--- pyplusplus_dev/unittests/precompiled_header_tester.py (rev 0)
+++ pyplusplus_dev/unittests/precompiled_header_tester.py 2007-12-05 20:52:52 UTC (rev 1199)
@@ -0,0 +1,47 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import autoconfig
+import fundamental_tester_base
+from pyplusplus import code_creators
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'precompiled_header'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize(self, mb ):
+ #add precompiled header
+ mb.build_code_creator( self.EXTENSION_NAME )
+ stdafx = code_creators.include_t( 'stdafx.h' )
+ mb.code_creator.adopt_creator( stdafx, 0 )
+
+ f = file( os.path.join( autoconfig.build_dir, 'stdafx.h' ), 'w+' )
+ f.writelines( ['//this should be the first header file' + os.linesep] )
+ f.close()
+
+ def run_tests(self, module):
+ lines = file( os.path.join( autoconfig.build_dir, 'precompiled_header.cpp' ) ).readlines()
+ lines = filter( lambda l: l.startswith( '#include' ), lines )
+ self.failUnless( '#include "stdafx.h"' in lines[0] )
+
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2007-12-05 14:49:45 UTC (rev 1198)
+++ pyplusplus_dev/unittests/test_all.py 2007-12-05 20:52:52 UTC (rev 1199)
@@ -96,9 +96,9 @@
import include_exclude_bug_tester
import vector_with_shared_data_tester
import constructors_bug_tester
+import precompiled_header_tester
-
testers = [
algorithms_tester
, module_body_tester
@@ -181,6 +181,7 @@
, vector_with_shared_data_tester
, templates_tester
, constructors_bug_tester
+ , precompiled_header_tester
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-02-04 06:36:49
|
Revision: 1231
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1231&view=rev
Author: roman_yakovenko
Date: 2008-02-03 22:36:54 -0800 (Sun, 03 Feb 2008)
Log Message:
-----------
adding new unit test
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/ft_inout_bugs_to_be_exported.hpp
pyplusplus_dev/unittests/ft_inout_tester.py
Added: pyplusplus_dev/unittests/data/ft_inout_bugs_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/ft_inout_bugs_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/ft_inout_bugs_to_be_exported.hpp 2008-02-04 06:36:54 UTC (rev 1231)
@@ -0,0 +1,20 @@
+
+namespace tests{
+
+inline void set_flag( bool value, bool& flag ){
+ flag = value;
+}
+
+struct base{
+ virtual void set_flag( bool value, bool& flag ){
+ flag = value;
+ }
+};
+
+struct inventor : base{
+ virtual void set_flag( bool value, bool& flag ){
+ flag = !value;
+ }
+};
+
+}
Added: pyplusplus_dev/unittests/ft_inout_tester.py
===================================================================
--- pyplusplus_dev/unittests/ft_inout_tester.py (rev 0)
+++ pyplusplus_dev/unittests/ft_inout_tester.py 2008-02-04 06:36:54 UTC (rev 1231)
@@ -0,0 +1,52 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import math
+import unittest
+import fundamental_tester_base
+from pygccxml import declarations
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'ft_inout_bugs'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize( self, mb ):
+ #~ mb.global_ns.exclude()
+ #~ mb.namespace( 'tests' ).include()
+ set_flag = mb.calldefs( 'set_flag' )
+ set_flag.add_transformation( ft.inout(1) )
+
+ def run_tests(self, module):
+ x = False
+ self.failUnless( True == module.set_flag( True, x ) )
+ self.failUnless( False == module.set_flag( False, x ) )
+ b = module.base()
+ self.failUnless( True == b.set_flag( True, x ) )
+ self.failUnless( False == b.set_flag( False, x ) )
+ inventor = module.inventor()
+ self.failUnless( False == inventor.set_flag( True, x ) )
+ self.failUnless( True == inventor.set_flag( False, x ) )
+
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2008-02-03 20:22:34 UTC (rev 1230)
+++ pyplusplus_dev/unittests/test_all.py 2008-02-04 06:36:54 UTC (rev 1231)
@@ -98,8 +98,8 @@
import constructors_bug_tester
import precompiled_header_tester
import balanced_files_tester
+import ft_inout_tester
-
testers = [
algorithms_tester
, module_body_tester
@@ -184,6 +184,7 @@
, constructors_bug_tester
, precompiled_header_tester
, balanced_files_tester
+ , ft_inout_tester
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-02-06 07:55:16
|
Revision: 1233
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1233&view=rev
Author: roman_yakovenko
Date: 2008-02-05 23:55:18 -0800 (Tue, 05 Feb 2008)
Log Message:
-----------
adding new test
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/deepcopy_to_be_exported.hpp
pyplusplus_dev/unittests/deepcopy_tester.py
Added: pyplusplus_dev/unittests/data/deepcopy_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/deepcopy_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/deepcopy_to_be_exported.hpp 2008-02-06 07:55:18 UTC (rev 1233)
@@ -0,0 +1,33 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __deepcopy_to_be_exported_hpp__
+#define __deepcopy_to_be_exported_hpp__
+
+#include <vector>
+
+namespace deepcopy{
+
+struct item_t{
+ item_t(){
+ id = reinterpret_cast< int >( this );
+ }
+ int id;
+};
+
+typedef std::vector< item_t > items_t;
+
+inline items_t create_items(){
+ items_t items;
+ items.push_back( item_t() );
+ items.push_back( item_t() );
+ items.push_back( item_t() );
+ return items;
+}
+
+}//statics
+
+
+#endif//__deepcopy_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/deepcopy_tester.py
===================================================================
--- pyplusplus_dev/unittests/deepcopy_tester.py (rev 0)
+++ pyplusplus_dev/unittests/deepcopy_tester.py 2008-02-06 07:55:18 UTC (rev 1233)
@@ -0,0 +1,41 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import copy
+import unittest
+import fundamental_tester_base
+from pyplusplus import code_creators
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'deepcopy'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , indexing_suite_version=2
+ , *args )
+
+ def customize( self, mb ):
+ pass
+
+ def run_tests( self, module):
+ items = module.create_items()
+ for i in items:
+ print i.id
+ self.failIfNotRaisesAny( copy.deepcopy, items )
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2008-02-04 16:08:50 UTC (rev 1232)
+++ pyplusplus_dev/unittests/test_all.py 2008-02-06 07:55:18 UTC (rev 1233)
@@ -83,6 +83,7 @@
import custom_string_tester
import final_classes_tester
import templates_tester
+import deepcopy_tester
#gui_tester
#gui_wizard_tester
#
@@ -185,6 +186,7 @@
, precompiled_header_tester
, balanced_files_tester
, ft_inout_tester
+ , deepcopy_tester
]
class module_runner_t( object ):
@@ -192,11 +194,11 @@
test_name_re = re.compile( '(?P<name>.+ \(.+\))\s\.\.\.' )
failed_test_re = re.compile( 'FAIL\:\s(?P<name>.+ \(.+\))' )
error_test_re = re.compile( 'ERROR\:\s(?P<name>.+ \(.+\))' )
-
+
def __init__( self, module ):
self.module = module
self.output = None
-
+
self.test_results = {} #test name : result
self.num_of_tests = 0
self.total_run_time = 0
@@ -204,7 +206,7 @@
def __call__( self ):
print os.linesep, '<*> start %s tester' % os.path.basename( self.module.__file__)
-
+
test_file_name = self.module.__file__
if test_file_name.endswith( 'pyc' ):
test_file_name = test_file_name[:-1]
@@ -219,11 +221,11 @@
break
else:
print data,
- self.output = ''.join( report )
+ self.output = ''.join( report )
self.exit_status = output.close()
self.__update()
print '<***> finish %s tester' % os.path.basename( self.module.__file__)
-
+
def __create_unique_name( self, name ):
if '__main__.' in name:
name = name.replace( '__main__', os.path.basename( self.module.__file__)[:-4] )
@@ -231,14 +233,14 @@
def __update( self ):
match_found = self.bottom_line_re.search( self.output )
- if match_found:
+ if match_found:
self.num_of_tests += int( match_found.group( 'num_of_tests' ) )
self.total_run_time += float( match_found.group( 'seconds' ) )
-
+
uname = self.__create_unique_name
for match_found in self.test_name_re.finditer( self.output ):
self.test_results[ uname( match_found.group( 'name' ) ) ] = 'ok'
-
+
for match_found in self.failed_test_re.finditer( self.output ):
self.test_results[ uname( match_found.group( 'name' ) ) ] = 'FAIL'
@@ -249,11 +251,11 @@
class process_tester_runner_t( object ):
-
+
def __init__( self, modules ):
self.__m_runners = [ module_runner_t(m) for m in modules ]
self.__total_time = 0
-
+
def __dump_statistics( self ):
num_of_tests = 0
test_results = {}
@@ -265,20 +267,20 @@
test_results.update( stat.test_results )
exit_status = max( exit_status, stat.exit_status )
test_failed = len( filter( lambda result: result != 'ok', test_results.values() ) )
-
+
for name, result in test_results.iteritems():
if result != 'ok':
print '! ',
print name, ' - ', result
- print '----------------------------------------------------------------------'
+ print '----------------------------------------------------------------------'
print 'Final exit status: ', exit_status
print 'Ran %d test in %fs. Multi-processing overhead: %fs.' \
% ( num_of_tests, self.__total_time, self.__total_time - total_tests_only_run_time )
print ' '
if test_failed:
- print os.linesep.join(['FAILED (failures=%d)' % test_failed, 'False'])
+ print os.linesep.join(['FAILED (failures=%d)' % test_failed, 'False'])
else:
- print 'ok'
+ print 'ok'
def __call__( self ):
start_time = time.time()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-02-17 11:44:43
|
Revision: 1241
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1241&view=rev
Author: roman_yakovenko
Date: 2008-02-17 03:44:47 -0800 (Sun, 17 Feb 2008)
Log Message:
-----------
adding new tests
Modified Paths:
--------------
pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
pyplusplus_dev/unittests/override_bug_tester.py
Modified: pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-02-17 11:43:23 UTC (rev 1240)
+++ pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-02-17 11:44:47 UTC (rev 1241)
@@ -24,6 +24,42 @@
inline int invoke_foo( const A& a ){
return a.foo();
};
+
+class Base1
+{
+public:
+ virtual int eval_a() { return 1; }
+ virtual int eval_b() { return 10; }
+ virtual int eval_c() { return 100; }
+ virtual int eval_d() { return 1000; }
+ virtual int eval_e() { return 10000; }
+};
+
+class Derived2: public Base1
+{
+protected:
+ virtual int eval_a() { return 2; }
+ virtual int eval_b() { return 20; }
+ virtual int eval_c() { return 200; }
+ virtual int eval_d() { return 2000; }
+ virtual int eval_e() { return 20000; }
+};
+
+class Derived3: public Derived2
+{
+};
+
+int eval(Base1* obj) {
+ return
+ obj->eval_a()
+ + obj->eval_b()
+ + obj->eval_c()
+ + obj->eval_d()
+ + obj->eval_e()
+ ;
+}
+
+
}
#endif//__final_classes_to_be_exported_hpp__
Modified: pyplusplus_dev/unittests/override_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/override_bug_tester.py 2008-02-17 11:43:23 UTC (rev 1240)
+++ pyplusplus_dev/unittests/override_bug_tester.py 2008-02-17 11:44:47 UTC (rev 1241)
@@ -17,6 +17,9 @@
, tester_t.EXTENSION_NAME
, *args )
+ def customize( self, mb ):
+ mb.class_("Derived2").member_functions("eval_c").exclude()
+
def run_tests(self, module):
class C( module.B ):
def __init__( self ):
@@ -24,7 +27,26 @@
def foo( self ):
return ord( 'c' )
self.failUnless( ord('c') == module.invoke_foo( C() ) )
+
+ class Derived4(module.Derived3):
+ def __init__( self ):
+ module.Derived3.__init__( self )
+ def eval_a(self):
+ return 3
+ def eval_c(self):
+ return 300 # ignored because eval_c excluded
+ self.failUnless( 22223 == module.eval( Derived4() ) )
+
+ # Notes:
+ # would return 22222 before any patch, since Derived3 wouldn't have a wrapper
+ # would return 22123 with my original "ignore" handling and a list
+ # instead of a set, because eval_c would be excluded naively
+ # would return 22323 if ignore flag wouldn't be considered
+ # would return ????3 (1s in some locations and 2s in others because of
+ # hashing) if set wouldn't be replaced by a list
+ # would return 11113 if protected virtual methods wouldn't be included
+
def create_suite():
suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-02-25 20:47:51
|
Revision: 1262
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1262&view=rev
Author: roman_yakovenko
Date: 2008-02-25 12:47:57 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
update unit tests
Modified Paths:
--------------
pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
pyplusplus_dev/unittests/override_bug_tester.py
Modified: pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-02-25 20:40:52 UTC (rev 1261)
+++ pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-02-25 20:47:57 UTC (rev 1262)
@@ -60,16 +60,16 @@
}
-class AA
+struct AA
{
public:
virtual void do_smth(int& i) const { i = 'a' ;}
virtual ~AA(){}
};
-class BB: public AA
+struct BB: public AA
{
- virtual void do_smth(int& i) const { i = 'b' ;}
+ virtual void do_smth(int& i, int& j) const { i = j = 'b' ;}
};
}
Modified: pyplusplus_dev/unittests/override_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/override_bug_tester.py 2008-02-25 20:40:52 UTC (rev 1261)
+++ pyplusplus_dev/unittests/override_bug_tester.py 2008-02-25 20:47:57 UTC (rev 1262)
@@ -21,8 +21,10 @@
def customize( self, mb ):
mb.class_("Derived2").member_functions("eval_c").exclude()
mb.class_( 'BB' ).include()
- do_smth = mb.mem_funs( 'do_smth' )
- do_smth.add_transformation( FT.output(0) )
+ do_smth = mb.mem_fun( '::override_bug::AA::do_smth' )
+ do_smth.add_transformation( FT.output(0), alias='do_smth_a' )
+ do_smth = mb.mem_fun( '::override_bug::BB::do_smth' )
+ do_smth.add_transformation( FT.output(0), FT.output(1), alias='do_smth_b' )
def run_tests(self, module):
class C( module.B ):
@@ -42,6 +44,11 @@
self.failUnless( 22223 == module.eval( Derived4() ) )
+ bb = module.BB()
+ print dir( bb )
+ x = bb.do_smth_b()
+ self.failUnless( x[0] == x[1] == ord( 'b' ) )
+
# Notes:
# would return 22222 before any patch, since Derived3 wouldn't have a wrapper
# would return 22123 with my original "ignore" handling and a list
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-02-27 19:58:01
|
Revision: 1267
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1267&view=rev
Author: roman_yakovenko
Date: 2008-02-27 11:57:49 -0800 (Wed, 27 Feb 2008)
Log Message:
-----------
adding new test case
Added Paths:
-----------
pyplusplus_dev/unittests/data/particleuniverse.xml.bz2
pyplusplus_dev/unittests/particle_universe_generate_tester.py
Added: pyplusplus_dev/unittests/data/particleuniverse.xml.bz2
===================================================================
(Binary files differ)
Property changes on: pyplusplus_dev/unittests/data/particleuniverse.xml.bz2
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: pyplusplus_dev/unittests/particle_universe_generate_tester.py
===================================================================
--- pyplusplus_dev/unittests/particle_universe_generate_tester.py (rev 0)
+++ pyplusplus_dev/unittests/particle_universe_generate_tester.py 2008-02-27 19:57:49 UTC (rev 1267)
@@ -0,0 +1,57 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import shutil
+import logging
+import unittest
+import autoconfig
+from pygccxml import parser
+from pygccxml import declarations
+from pyplusplus import messages
+from pyplusplus import code_creators
+from pyplusplus import module_creator
+from pyplusplus import module_builder
+from pyplusplus import utils as pypp_utils
+from pyplusplus import function_transformers as ft
+
+class ogre_generate_tester_t(unittest.TestCase):
+ def test(self):
+ module_builder.set_logger_level( logging.CRITICAL )
+ messages.disable( *messages.all_warning_msgs )
+
+ xml_file = parser.create_gccxml_fc( os.path.join( autoconfig.data_directory, 'particleuniverse.xml' ) )
+
+ mb = module_builder.module_builder_t(
+ [ xml_file ]
+ , gccxml_path=autoconfig.gccxml.executable
+ , indexing_suite_version=2)
+
+ mb.global_ns.exclude()
+ mb.namespace('ParticleUniverse').include()
+ mb.namespace('Ogre').include()
+
+ target_dir = os.path.join( autoconfig.build_directory, 'particle_universe' )
+ #~ if os.path.exists( target_dir ):
+ #~ shutil.rmtree( target_dir )
+ #~ os.mkdir( target_dir )
+ psp = mb.class_( '::ParticleUniverse::ParticleScriptParser' )
+ declarations.print_declarations( psp )
+ mb.build_code_creator( 'PU' )
+ mb.split_module( target_dir )
+
+
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(ogre_generate_tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-04-01 19:05:44
|
Revision: 1294
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1294&view=rev
Author: roman_yakovenko
Date: 2008-04-01 12:05:50 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
adding new test cases
Modified Paths:
--------------
pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
pyplusplus_dev/unittests/override_bug_tester.py
Modified: pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-03-31 16:18:12 UTC (rev 1293)
+++ pyplusplus_dev/unittests/data/override_bug_to_be_exported.hpp 2008-04-01 19:05:50 UTC (rev 1294)
@@ -13,8 +13,11 @@
class A
{
public:
+
virtual int foo() const {return int('a');}
int foo( int a, int b ) { return a + b;}
+
+ int ddd(){ return 111;}
virtual ~A(){}
};
@@ -22,6 +25,12 @@
{
};
+class D: public B
+{
+public:
+ int foo( int a, int b ){ return a*b; }
+};
+
inline int invoke_foo( const A& a ){
return a.foo();
};
@@ -88,7 +97,7 @@
void do_nothing() {}
};
-}
+}
#endif//__final_classes_to_be_exported_hpp__
Modified: pyplusplus_dev/unittests/override_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/override_bug_tester.py 2008-03-31 16:18:12 UTC (rev 1293)
+++ pyplusplus_dev/unittests/override_bug_tester.py 2008-04-01 19:05:50 UTC (rev 1294)
@@ -11,9 +11,9 @@
class tester_t(fundamental_tester_base.fundamental_tester_base_t):
EXTENSION_NAME = 'override_bug'
-
+
def __init__( self, *args ):
- fundamental_tester_base.fundamental_tester_base_t.__init__(
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
self
, tester_t.EXTENSION_NAME
, *args )
@@ -26,15 +26,15 @@
do_smth = mb.mem_fun( '::override_bug::BB::do_smth' )
do_smth.add_transformation( FT.output(0), FT.output(1), alias='do_smth_b' )
mb.class_( 'XX' ).mem_fun( 'do_smth' ).exclude()
-
- def run_tests(self, module):
+
+ def run_tests(self, module):
class C( module.B ):
def __init__( self ):
module.B.__init__( self )
def foo( self ):
return ord( 'c' )
self.failUnless( ord('c') == module.invoke_foo( C() ) )
-
+
class Derived4(module.Derived3):
def __init__( self ):
module.Derived3.__init__( self )
@@ -42,14 +42,14 @@
return 3
def eval_c(self):
return 300 # ignored because eval_c excluded
-
+
self.failUnless( 22223 == module.eval( Derived4() ) )
-
+
bb = module.BB()
print dir( bb )
x = bb.do_smth_b()
self.failUnless( x[0] == x[1] == ord( 'b' ) )
-
+
# Notes:
# would return 22222 before any patch, since Derived3 wouldn't have a wrapper
# would return 22123 with my original "ignore" handling and a list
@@ -58,9 +58,15 @@
# would return ????3 (1s in some locations and 2s in others because of
# hashing) if set wouldn't be replaced by a list
# would return 11113 if protected virtual methods wouldn't be included
+
+ b = module.B()
+ self.failUnless( 7 == b.foo( 3,4))
+ d = module.D()
+ self.failUnless( 12 == d.foo(3,4) )
+
def create_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
return suite
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-04-07 21:45:08
|
Revision: 1302
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1302&view=rev
Author: roman_yakovenko
Date: 2008-04-07 14:45:15 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
adding new test case
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/split_module_indexing_suite_bug_to_be_exported.hpp
pyplusplus_dev/unittests/split_module_indexing_suite_bug_tester.py
Added: pyplusplus_dev/unittests/data/split_module_indexing_suite_bug_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/split_module_indexing_suite_bug_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/split_module_indexing_suite_bug_to_be_exported.hpp 2008-04-07 21:45:15 UTC (rev 1302)
@@ -0,0 +1,30 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __split_module_indexing_suite_bug_to_be_exported_hpp__
+#define __split_module_indexing_suite_bug_to_be_exported_hpp__
+
+#include <string>
+#include <boost/any.hpp>
+#include <map>
+#include <vector>
+
+
+struct generic_string_map_t
+{
+public:
+ generic_string_map_t() {};
+
+ std::vector<std::string> get_value(std::string key) const{
+ return std::vector<std::string>();
+ }
+
+private:
+ std::map<std::string, boost::any> m_fields;
+
+};
+
+
+#endif//__split_module_indexing_suite_bug_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/split_module_indexing_suite_bug_tester.py
===================================================================
--- pyplusplus_dev/unittests/split_module_indexing_suite_bug_tester.py (rev 0)
+++ pyplusplus_dev/unittests/split_module_indexing_suite_bug_tester.py 2008-04-07 21:45:15 UTC (rev 1302)
@@ -0,0 +1,56 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import autoconfig
+import fundamental_tester_base
+
+from pyplusplus import module_builder
+from pyplusplus.module_builder import call_policies
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'split_module_indexing_suite_bug'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , indexing_suite_version=2
+ , *args )
+ self.files = []
+
+ def customize( self, mb ):
+ #~ find out what does happen here
+ #string = mb.class_( lambda cls: cls.partial_name.startswith( 'basic_string<' )
+ # and 'wchar_t' not in cls.partial_name )
+ #string.alias = 'string'
+ pass
+
+ def generate_source_files( self, mb ):
+ files = mb.split_module( autoconfig.build_dir, on_unused_file_found=lambda fpath: fpath )
+ self.files = filter( lambda fname: fname.endswith( 'cpp' ), files )
+ #~ self.files.append( os.path.join( autoconfig.data_directory
+ #~ , self.EXTENSION_NAME + '_to_be_exported.cpp' ) )
+ print self.files
+
+
+ def get_source_files( self ):
+ return self.files
+
+ def run_tests(self, module):
+ pass
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2008-04-07 21:41:50 UTC (rev 1301)
+++ pyplusplus_dev/unittests/test_all.py 2008-04-07 21:45:15 UTC (rev 1302)
@@ -101,6 +101,7 @@
import precompiled_header_tester
import balanced_files_tester
import ft_inout_tester
+import split_module_indexing_suite_bug_tester
testers = [
algorithms_tester
@@ -189,6 +190,7 @@
, ft_inout_tester
, deepcopy_tester
, override_bug_tester
+ , split_module_indexing_suite_bug_tester
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-04-28 15:22:47
|
Revision: 1315
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1315&view=rev
Author: roman_yakovenko
Date: 2008-04-28 08:22:30 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
adding new test case - inner template class
Modified Paths:
--------------
pyplusplus_dev/unittests/test_all.py
Added Paths:
-----------
pyplusplus_dev/unittests/data/inner_tmpl_class_to_be_exported.hpp
pyplusplus_dev/unittests/inner_tmpl_class_tester.py
Added: pyplusplus_dev/unittests/data/inner_tmpl_class_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/inner_tmpl_class_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/inner_tmpl_class_to_be_exported.hpp 2008-04-28 15:22:30 UTC (rev 1315)
@@ -0,0 +1,28 @@
+// Copyright 2004 Roman Yakovenko.
+// Distributed under the Boost Software License, Version 1.0. (See
+// accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef __inner_tmpl_class_to_be_exported_hpp__
+#define __inner_tmpl_class_to_be_exported_hpp__
+
+#include <string>
+
+namespace inner_tmpl_class{
+
+struct Outer {
+ template <typename T>
+ struct Inner{
+ Inner(T t_) : t( t_ )
+ {}
+
+ T t;
+ };
+
+ typedef Inner<int> Inner_int;
+ Inner_int f() { return Inner_int(23); }
+};
+
+}
+
+#endif//__inner_tmpl_class_to_be_exported_hpp__
Added: pyplusplus_dev/unittests/inner_tmpl_class_tester.py
===================================================================
--- pyplusplus_dev/unittests/inner_tmpl_class_tester.py (rev 0)
+++ pyplusplus_dev/unittests/inner_tmpl_class_tester.py 2008-04-28 15:22:30 UTC (rev 1315)
@@ -0,0 +1,35 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import unittest
+import fundamental_tester_base
+from pyplusplus import code_creators
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'inner_tmpl_class'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def run_tests( self, module):
+ o = module.Outer()
+ i = o.f()
+ self.failUnless( i.t == 23 )
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2008-04-27 20:03:45 UTC (rev 1314)
+++ pyplusplus_dev/unittests/test_all.py 2008-04-28 15:22:30 UTC (rev 1315)
@@ -102,6 +102,7 @@
import balanced_files_tester
import ft_inout_tester
import split_module_indexing_suite_bug_tester
+import inner_tmpl_class_tester
testers = [
algorithms_tester
@@ -191,6 +192,7 @@
, deepcopy_tester
, override_bug_tester
, split_module_indexing_suite_bug_tester
+ , inner_tmpl_class_tester
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-06-25 19:19:34
|
Revision: 1353
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1353&view=rev
Author: roman_yakovenko
Date: 2008-06-25 12:19:38 -0700 (Wed, 25 Jun 2008)
Log Message:
-----------
fix tester
Modified Paths:
--------------
pyplusplus_dev/unittests/data/global_variables_to_be_exported.cpp
pyplusplus_dev/unittests/data/global_variables_to_be_exported.hpp
pyplusplus_dev/unittests/global_variables_tester.py
Modified: pyplusplus_dev/unittests/data/global_variables_to_be_exported.cpp
===================================================================
--- pyplusplus_dev/unittests/data/global_variables_to_be_exported.cpp 2008-06-25 17:52:00 UTC (rev 1352)
+++ pyplusplus_dev/unittests/data/global_variables_to_be_exported.cpp 2008-06-25 19:19:38 UTC (rev 1353)
@@ -20,3 +20,5 @@
}
}
+
+const char someSin[3] = "AB";
\ No newline at end of file
Modified: pyplusplus_dev/unittests/data/global_variables_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/global_variables_to_be_exported.hpp 2008-06-25 17:52:00 UTC (rev 1352)
+++ pyplusplus_dev/unittests/data/global_variables_to_be_exported.hpp 2008-06-25 19:19:38 UTC (rev 1353)
@@ -22,6 +22,6 @@
}
-extern const char someSin[256];
+extern const char someSin[3];
#endif//__global_variables_to_be_exported_hpp__
Modified: pyplusplus_dev/unittests/global_variables_tester.py
===================================================================
--- pyplusplus_dev/unittests/global_variables_tester.py 2008-06-25 17:52:00 UTC (rev 1352)
+++ pyplusplus_dev/unittests/global_variables_tester.py 2008-06-25 19:19:38 UTC (rev 1353)
@@ -27,7 +27,10 @@
self.failUnless( 10 == len( module.garray ) )
for index in range( 10 ):
self.failUnless( -index == module.garray[index].value )
-
+ self.failUnless( 3 == len( module.someSin )
+ and module.someSin[0] == 'A'
+ and module.someSin[1] == 'B'
+ and module.someSin[2] == '\0' )
def create_suite():
suite = unittest.TestSuite()
suite.addTest( unittest.makeSuite(tester_t))
@@ -37,4 +40,4 @@
unittest.TextTestRunner(verbosity=2).run( create_suite() )
if __name__ == "__main__":
- run_suite()
\ No newline at end of file
+ run_suite()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-06-27 19:24:28
|
Revision: 1362
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1362&view=rev
Author: roman_yakovenko
Date: 2008-06-27 12:24:37 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
fixing small bug. for the following class
struct map_iterator_t{
map_iterator_t( int i ){}
map_iterator_t( const map_iterator_t& ){}
private:
map_iterator_t(){};
};
py++ generated wrong code
Modified Paths:
--------------
pygccxml_dev/unittests/copy_constructor_tester.py
pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
pyplusplus_dev/unittests/data/no_init_to_be_exported.hpp
pyplusplus_dev/unittests/ogre_generate_tester.py
pyplusplus_dev/unittests/test_all.py
Modified: pygccxml_dev/unittests/copy_constructor_tester.py
===================================================================
--- pygccxml_dev/unittests/copy_constructor_tester.py 2008-06-27 15:22:04 UTC (rev 1361)
+++ pygccxml_dev/unittests/copy_constructor_tester.py 2008-06-27 19:24:37 UTC (rev 1362)
@@ -19,7 +19,7 @@
def setUp(self):
if not self.global_ns:
- xml_file = os.path.join( autoconfig.data_directory, 'ogre1.4.xml' )
+ xml_file = os.path.join( autoconfig.data_directory, 'ogre.1.7.xml' )
reader = parser.source_reader_t( autoconfig.cxx_parsers_cfg.gccxml )
self.global_ns = declarations.get_global_namespace( reader.read_xml_file(xml_file) )
self.global_ns.init_optimizer()
Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-27 15:22:04 UTC (rev 1361)
+++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2008-06-27 19:24:37 UTC (rev 1362)
@@ -228,12 +228,14 @@
if cs and len(cs) == 1 and cs[0].is_trivial_constructor and self.declaration.find_noncopyable_vars():
has_suitable_constructor = False
+ trivial_constructor = self.declaration.find_trivial_constructor()
+
if has_nonpublic_destructor \
or ( self.declaration.is_abstract and not self.wrapper ) \
or not has_suitable_constructor:
result.append( ", " )
result.append( algorithm.create_identifier( self, '::boost::python::no_init' ) )
- elif not self.declaration.find_trivial_constructor():
+ elif not trivial_constructor or trivial_constructor.access_type != 'public':
if inits:
used_init = inits[0]
result.append( ", " )
Modified: pyplusplus_dev/unittests/data/no_init_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/no_init_to_be_exported.hpp 2008-06-27 15:22:04 UTC (rev 1361)
+++ pyplusplus_dev/unittests/data/no_init_to_be_exported.hpp 2008-06-27 19:24:37 UTC (rev 1362)
@@ -48,6 +48,13 @@
event_t( TData& ){};
};
+struct map_iterator_t{
+ map_iterator_t( int i ){}
+ map_iterator_t( const map_iterator_t& ){}
+private:
+ map_iterator_t(){};
+};
+
}
#endif//__no_init_to_be_exported_hpp__
Modified: pyplusplus_dev/unittests/ogre_generate_tester.py
===================================================================
--- pyplusplus_dev/unittests/ogre_generate_tester.py 2008-06-27 15:22:04 UTC (rev 1361)
+++ pyplusplus_dev/unittests/ogre_generate_tester.py 2008-06-27 19:24:37 UTC (rev 1362)
@@ -24,7 +24,7 @@
messages.disable( *messages.all_warning_msgs )
ogre_file = autoconfig.data_directory.replace( 'pyplusplus_dev', 'pygccxml_dev' )
- ogre_file = parser.create_gccxml_fc( os.path.join( ogre_file, 'ogre1.4.xml' ) )
+ ogre_file = parser.create_gccxml_fc( os.path.join( ogre_file, 'ogre.1.7.xml' ) )
mb = module_builder.module_builder_t(
[ ogre_file ]
Modified: pyplusplus_dev/unittests/test_all.py
===================================================================
--- pyplusplus_dev/unittests/test_all.py 2008-06-27 15:22:04 UTC (rev 1361)
+++ pyplusplus_dev/unittests/test_all.py 2008-06-27 19:24:37 UTC (rev 1362)
@@ -105,6 +105,7 @@
import inner_tmpl_class_tester
import bug_covariant_returns_tester
import embeded_tester
+#import ogre_generate_tester
testers = [
algorithms_tester
@@ -197,6 +198,7 @@
, inner_tmpl_class_tester
, bug_covariant_returns_tester
, embeded_tester
+# , ogre_generate_tester too much time
]
class module_runner_t( object ):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2008-07-06 19:29:31
|
Revision: 1366
http://pygccxml.svn.sourceforge.net/pygccxml/?rev=1366&view=rev
Author: roman_yakovenko
Date: 2008-07-06 12:29:39 -0700 (Sun, 06 Jul 2008)
Log Message:
-----------
add new unit test
Added Paths:
-----------
pyplusplus_dev/unittests/bool_by_ref_tester.py
pyplusplus_dev/unittests/data/bool_by_ref_to_be_exported.hpp
Added: pyplusplus_dev/unittests/bool_by_ref_tester.py
===================================================================
--- pyplusplus_dev/unittests/bool_by_ref_tester.py (rev 0)
+++ pyplusplus_dev/unittests/bool_by_ref_tester.py 2008-07-06 19:29:39 UTC (rev 1366)
@@ -0,0 +1,51 @@
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+import os
+import sys
+import math
+import unittest
+import fundamental_tester_base
+from pygccxml import declarations
+from pyplusplus import function_transformers as ft
+from pyplusplus.module_builder import call_policies
+
+
+class tester_t(fundamental_tester_base.fundamental_tester_base_t):
+ EXTENSION_NAME = 'bool_by_ref'
+
+ def __init__( self, *args ):
+ fundamental_tester_base.fundamental_tester_base_t.__init__(
+ self
+ , tester_t.EXTENSION_NAME
+ , *args )
+
+ def customize( self, mb ):
+ set_flag = mb.mem_fun( '::tests::listener::listen' )
+ set_flag.add_transformation( ft.inout(2) )
+
+
+ def run_tests(self, module):
+ class list1 ( module.listener ):
+ def __init__ ( self ):
+ module.listener.__init__(self)
+ def listen( self, id, name, skip):
+ print "Python: listen called with", id, name, skip
+ return True ## Test always returns True...
+
+ c = list1()
+ ret = module.callListener( c )
+ print ret
+
+def create_suite():
+ suite = unittest.TestSuite()
+ suite.addTest( unittest.makeSuite(tester_t))
+ return suite
+
+def run_suite():
+ unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+ run_suite()
Added: pyplusplus_dev/unittests/data/bool_by_ref_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/bool_by_ref_to_be_exported.hpp (rev 0)
+++ pyplusplus_dev/unittests/data/bool_by_ref_to_be_exported.hpp 2008-07-06 19:29:39 UTC (rev 1366)
@@ -0,0 +1,21 @@
+#include <stdexcept>
+#include <iostream>
+
+namespace tests{
+
+class listener {
+ public:
+ virtual void listen(int id, const std::string& name, bool& skip) {
+ throw std::runtime_error ( std::string ("Virtual function listener::listen called!") );
+ }
+};
+
+bool callListener ( listener* myListener) {
+ bool skip = false;
+ std::cout << "C++: Calling myListener->listen\n";
+ myListener->listen(100, "test", skip);
+ std::cout << "C++: Called OK " << skip <<"\n";
+ return skip;
+}
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2006-06-18 17:32:44
|
Revision: 229 Author: roman_yakovenko Date: 2006-06-18 10:32:31 -0700 (Sun, 18 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=229&view=rev Log Message: ----------- adding test for default args Added Paths: ----------- pyplusplus_dev/unittests/data/default_args_to_be_exported.hpp pyplusplus_dev/unittests/default_args_tester.py Added: pyplusplus_dev/unittests/data/default_args_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/default_args_to_be_exported.hpp (rev 0) +++ pyplusplus_dev/unittests/data/default_args_to_be_exported.hpp 2006-06-18 17:32:31 UTC (rev 229) @@ -0,0 +1,18 @@ +// Copyright 2004 Roman Yakovenko. +// Distributed under the Boost Software License, Version 1.0. (See +// accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#ifndef __default_args_to_be_exported_hpp__ +#define __default_args_to_be_exported_hpp__ + +namespace default_args{ + +struct data{ + int sum( int i=0 ){ return i; } + int sum( int i, int j, int k=3 ){ return i + j + k; } +}; + +} + +#endif//__default_args_to_be_exported_hpp__ Added: pyplusplus_dev/unittests/default_args_tester.py =================================================================== --- pyplusplus_dev/unittests/default_args_tester.py (rev 0) +++ pyplusplus_dev/unittests/default_args_tester.py 2006-06-18 17:32:31 UTC (rev 229) @@ -0,0 +1,37 @@ +# Copyright 2004 Roman Yakovenko. +# Distributed under the Boost Software License, Version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import os +import sys +import unittest +import fundamental_tester_base +from pygccxml import declarations +from pyplusplus import module_builder + + +class tester_t(fundamental_tester_base.fundamental_tester_base_t): + EXTENSION_NAME = 'default_args' + + def __init__( self, *args ): + fundamental_tester_base.fundamental_tester_base_t.__init__( + self + , tester_t.EXTENSION_NAME + , *args ) + + def run_tests( self, module): + d = module.data() + self.failUnless( d.sum() == 0 ) + self.failUnless( d.sum( 1, 2 ) == 6 ) + +def create_suite(): + suite = unittest.TestSuite() + suite.addTest( unittest.makeSuite(tester_t)) + return suite + +def run_suite(): + unittest.TextTestRunner(verbosity=2).run( create_suite() ) + +if __name__ == "__main__": + run_suite() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-06-28 20:16:33
|
Revision: 261 Author: roman_yakovenko Date: 2006-06-28 13:16:11 -0700 (Wed, 28 Jun 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=261&view=rev Log Message: ----------- indexing suite - value traits Modified Paths: -------------- pygccxml_dev/pygccxml/declarations/__init__.py pygccxml_dev/pygccxml/declarations/type_traits.py pygccxml_dev/unittests/data/core_cache.hpp pyplusplus_dev/pyplusplus/code_creators/__init__.py pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py pyplusplus_dev/pyplusplus/module_creator/creator.py pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp pyplusplus_dev/unittests/indexing_suites2_tester.py Modified: pygccxml_dev/pygccxml/declarations/__init__.py =================================================================== --- pygccxml_dev/pygccxml/declarations/__init__.py 2006-06-28 14:32:24 UTC (rev 260) +++ pygccxml_dev/pygccxml/declarations/__init__.py 2006-06-28 20:16:11 UTC (rev 261) @@ -105,12 +105,17 @@ from type_traits import is_enum from type_traits import enum_declaration +from type_traits import enum_traits +from type_traits import is_class +from type_traits import class_traits +from type_traits import is_class_declaration +from type_traits import class_declaration_traits + + from type_traits import is_same from type_traits import is_void from type_traits import is_void_pointer -from type_traits import is_class -from type_traits import is_class_declaration from type_traits import is_const from type_traits import base_type from type_traits import is_array Modified: pygccxml_dev/pygccxml/declarations/type_traits.py =================================================================== --- pygccxml_dev/pygccxml/declarations/type_traits.py 2006-06-28 14:32:24 UTC (rev 260) +++ pygccxml_dev/pygccxml/declarations/type_traits.py 2006-06-28 20:16:11 UTC (rev 261) @@ -260,35 +260,37 @@ , cpptypes.fundamental_t , (cpptypes.const_t, cpptypes.volatile_t) ) -def is_enum(type): - """returns True if type represents C++ enum type""" - nake_type = remove_alias( type ) - nake_type = remove_cv( nake_type ) +class declaration_xxx_traits: + sequence = [ remove_alias, remove_cv, remove_declarated ] + def __init__( self, declaration_class ): + self.declaration_class = declaration_class + + def apply_sequence( self, type ): + for f in self.sequence: + type = f( type ) + return type - return isinstance( nake_type, cpptypes.declarated_t ) \ - and isinstance( nake_type.declaration, enumeration.enumeration_t ) + def is_my_case( self, type ): + return isinstance( self.apply_sequence( type ), self.declaration_class ) + + def get_declaration( self, type ): + assert self.is_my_case( type ) + return self.apply_sequence( type ) -def enum_declaration(type): - if not is_enum( type ): - raise TypeError( 'Type "%s" is not enumeration' % type.decl_string ) - nake_type = remove_alias( type ) - nake_type = remove_cv( nake_type ) - return remove_declarated( nake_type ) +enum_traits = declaration_xxx_traits( enumeration.enumeration_t ) -def is_class(type): - """returns True if type represents C++ class""" - nake_type = remove_alias( type ) - nake_type = remove_cv( nake_type ) - nake_type = remove_declarated( nake_type ) - return isinstance( nake_type, class_declaration.class_t) +is_enum = enum_traits.is_my_case +#backward computability +enum_declaration = enum_traits.get_declaration -def is_class_declaration(type): - """returns True if type represents C++ class""" - nake_type = remove_alias( type ) - nake_type = remove_cv( nake_type ) - nake_type = remove_declarated( nake_type ) - return isinstance( nake_type, class_declaration.class_declaration_t) +class_traits = declaration_xxx_traits( class_declaration.class_t ) +#backward computability +is_class = class_traits.is_my_case +class_declaration_traits = declaration_xxx_traits( class_declaration.class_declaration_t ) +#backward computability +is_class_declaration = class_declaration_traits.is_my_case + def find_trivial_constructor( type ): """returns reference to trivial constructor or None""" assert isinstance( type, class_declaration.class_t ) Modified: pygccxml_dev/unittests/data/core_cache.hpp =================================================================== --- pygccxml_dev/unittests/data/core_cache.hpp 2006-06-28 14:32:24 UTC (rev 260) +++ pygccxml_dev/unittests/data/core_cache.hpp 2006-06-28 20:16:11 UTC (rev 261) @@ -22,4 +22,4 @@ #endif//__core_cache_hpp__ -//touch//touch \ No newline at end of file +//touch//touch//touch \ No newline at end of file Modified: pyplusplus_dev/pyplusplus/code_creators/__init__.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/__init__.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/pyplusplus/code_creators/__init__.py 2006-06-28 20:16:11 UTC (rev 261) @@ -107,3 +107,4 @@ from indexing_suites import indexing_suite1_t from indexing_suites import indexing_suite2_t +from indexing_suites import value_traits_t \ No newline at end of file Modified: pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/pyplusplus/code_creators/indexing_suites.py 2006-06-28 20:16:11 UTC (rev 261) @@ -103,6 +103,51 @@ answer.append( ';' ) return ''.join( answer ) +class value_traits_t( declaration_based.declaration_based_t ): + def __init__( self, value_class, parent=None ): + declaration_based.declaration_based_t.__init__( self, declaration=value_class, parent=parent ) + def generate_value_traits( self ): + tmpl = os.linesep.join([ + "namespace boost { namespace python { namespace indexing {" + , "" + , "template<>" + , "struct value_traits<%(value_class)s>{" + , "" + , self.indent( "static bool const equality_comparable = %(has_equal)s;" ) + , self.indent( "static bool const less_than_comparable = %(has_lessthan)s;" ) + , "" + , self.indent( "template<typename PythonClass, typename Policy>" ) + , self.indent( "static void visit_container_class(PythonClass &, Policy const &){" ) + , self.indent( "%(visitor_helper_body)s", 2 ) + , self.indent( "}" ) + , "" + , "};" + , "" + , "}/*indexing*/ } /*python*/ } /*boost*/" + ]) + return tmpl % { 'value_class' : self.decl_identifier + , 'has_equal' : str( bool( self.declaration.equality_comparable ) ) .lower() + , 'has_lessthan' : str( bool( self.declaration.less_than_comparable ) ).lower() + , 'visitor_helper_body' : '' } + def generate_value_class_fwd_declaration( self ): + pass # for inner class this code will generate error :-(((( + + def _create_impl( self ): + return self.generate_value_traits() + + + + + + + + + + + + + + Modified: pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py =================================================================== --- pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/pyplusplus/decl_wrappers/__init__.py 2006-06-28 20:16:11 UTC (rev 261) @@ -89,7 +89,6 @@ from indexing_suite1 import indexing_suite1_t from indexing_suite2 import indexing_suite2_t - class dwfactory_t( declarations.decl_factory_t ): """ declarations factory class Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py =================================================================== --- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2006-06-28 20:16:11 UTC (rev 261) @@ -16,7 +16,7 @@ self._always_expose_using_scope = False self._indexing_suite = None self._equality_comparable = None - self._lessthan_comparable = None + self._less_than_comparable = None self._isuite_version = 1 def _get_indexing_suite_version( self ): @@ -49,6 +49,7 @@ indexing_suite = property( _get_indexing_suite ) def _get_equality_comparable( self ): + return False if None is self._equality_comparable: self._equality_comparable = declarations.has_public_equal( self ) return self._equality_comparable @@ -58,15 +59,16 @@ equality_comparable = property( _get_equality_comparable, _set_equality_comparable ) - def _get_lessthan_comparable( self ): - if None is self._lessthan_comparable: - self._lessthan_comparable = declarations.has_public_less( self ) - return self._lessthan_comparable + def _get_less_than_comparable( self ): + return False + if None is self._less_than_comparable: + self._less_than_comparable = declarations.has_public_less( self ) + return self._less_than_comparable - def _set_lessthan_comparable( self, value ): - self._lessthan_comparable = value + def _set_less_than_comparable( self, value ): + self._less_than_comparable = value - lessthan_comparable = property( _get_lessthan_comparable, _set_lessthan_comparable ) + less_than_comparable = property( _get_less_than_comparable, _set_less_than_comparable ) #this will only be exported if indexing suite is not None and only when needed Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-06-28 20:16:11 UTC (rev 261) @@ -392,7 +392,7 @@ else: isuite = isuite2 - if not isuite1.has_key( container_name ): + if not isuite.has_key( container_name ): continue #not supported if isuite is isuite2 and not container_suite_header_was_used: @@ -401,17 +401,23 @@ self.__extmodule.add_include( container_suite_header ) if not isuite[ container_name ][1]: - isuite1[ container_name ][1] = True + isuite[ container_name ][1] = True self.__extmodule.add_system_header( isuite[ container_name ][0] ) self.__extmodule.add_include( header=isuite[ container_name ][0] ) cls_creator = create_cls_cc( cls ) + value_type = cls.indexing_suite.value_type() if isuite is isuite1: - value_type = cls.indexing_suite.value_type() if declarations.is_class( value_type ) and not declarations.has_public_equal( value_type ): cls_creator.adopt_creator( create_explanation( cls ) ) cls_creator.adopt_creator( code_creators.indexing_suite1_t(cls) ) else: + class_traits = declarations.class_traits + if class_traits.is_my_case( value_type ): + value_cls = class_traits.get_declaration( value_type ) + if not ( value_cls.equality_comparable and value_cls.less_than_comparable ): + value_type_cc = code_creators.value_traits_t( value_cls ) + self.__extmodule.adopt_creator( value_type_cc, self.__extmodule.creators.index( self.__module_body ) ) cls_creator.adopt_creator( code_creators.indexing_suite2_t(cls) ) self.__module_body.adopt_creator( cls_creator ) Modified: pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp 2006-06-28 20:16:11 UTC (rev 261) @@ -10,34 +10,34 @@ namespace indexing_suites2 { -//~ struct item_t{ - //~ item_t() : value( -1 ){} +struct item_t{ + item_t() : value( -1 ){} - //~ bool operator==(item_t const& item) const { - //~ return value == item.value; - //~ } + bool operator==(item_t const& item) const { + return value == item.value; + } - //~ bool operator!=(item_t const& item) const { - //~ return value != item.value; - //~ } + bool operator!=(item_t const& item) const { + return value != item.value; + } - //~ int value; -//~ }; + int value; +}; -//~ typedef std::vector<item_t> items_t; +typedef std::vector<item_t> items_t; -//~ inline item_t get_value( const std::vector<item_t>& vec, unsigned int index ){ - //~ return vec.at(index); -//~ } +inline item_t get_value( const std::vector<item_t>& vec, unsigned int index ){ + return vec.at(index); +} -//~ inline void set_value( std::vector<item_t>& vec, unsigned int index, item_t value ){ - //~ vec.at(index); - //~ vec[index] = value; -//~ } +inline void set_value( std::vector<item_t>& vec, unsigned int index, item_t value ){ + vec.at(index); + vec[index] = value; +} -typedef std::vector<int> ivector; -ivector empty_ivector(){ return ivector(); } +typedef std::vector<float> fvector; +fvector empty_fvector(){ return fvector(); } } Modified: pyplusplus_dev/unittests/indexing_suites2_tester.py =================================================================== --- pyplusplus_dev/unittests/indexing_suites2_tester.py 2006-06-28 14:32:24 UTC (rev 260) +++ pyplusplus_dev/unittests/indexing_suites2_tester.py 2006-06-28 20:16:11 UTC (rev 261) @@ -31,14 +31,17 @@ #~ return False def customize(self, generator): - ivector = generator.global_ns.typedef( 'ivector' ) - ivector = declarations.remove_declarated( ivector.type ) - ivector.indexing_suite.disable_method( 'extend' ) - ivector.indexing_suite.disable_methods_group( 'reorder' ) - #ivector.indexing_suite.call_policies = module_builder.call_policies.default_call_policies() + fvector = generator.global_ns.typedef( 'fvector' ) + fvector = declarations.remove_declarated( fvector.type ) + fvector.indexing_suite.disable_method( 'extend' ) + fvector.indexing_suite.disable_methods_group( 'reorder' ) + #fvector.indexing_suite.call_policies = module_builder.call_policies.default_call_policies() def run_tests( self, module): - iv = module.ivector() + fv = module.fvector() + self.failUnless( not hasattr( fv, 'extend' ) ) + self.failUnless( not hasattr( fv, 'sort' ) ) + self.failUnless( not hasattr( fv, 'reverse' ) ) #~ items = module.items_t() #~ item = module.item_t() #~ item.value = 1977 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-08-02 12:47:22
|
Revision: 376 Author: roman_yakovenko Date: 2006-08-02 05:46:56 -0700 (Wed, 02 Aug 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=376&view=rev Log Message: ----------- adding add_declaration_code functionality Modified Paths: -------------- pyplusplus_dev/docs/documentation/inserting_code.rest pyplusplus_dev/pyplusplus/code_creators/class_declaration.py pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py pyplusplus_dev/pyplusplus/module_creator/creator.py pyplusplus_dev/unittests/data/module_body_to_be_exported.hpp pyplusplus_dev/unittests/module_body_tester.py pyplusplus_dev/unittests/user_text_tester.py pyplusplus_dev/unittests/vector3_tester.py Modified: pyplusplus_dev/docs/documentation/inserting_code.rest =================================================================== --- pyplusplus_dev/docs/documentation/inserting_code.rest 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/docs/documentation/inserting_code.rest 2006-08-02 12:46:56 UTC (rev 376) @@ -97,16 +97,11 @@ * ``add_declaration_code( self, code )`` - **Not implemented.** - - **Feedback is wanted.** - - **Please consider the relationship between this code and class wrapper code.** - This method will add the code to the declaration section within the module. - If you split your module to few files, `pyplusplus`_ will generate code, in a - way, that declarations you added, will be visible to registration code. + If you split your module to few files, `pyplusplus`_ will add this code to the + cpp file, class registration code will be written in. + * ``add_registration_code( self, code, works_on_instance=True )`` This method will add the code to the registration section of the class. Modified: pyplusplus_dev/pyplusplus/code_creators/class_declaration.py =================================================================== --- pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/pyplusplus/code_creators/class_declaration.py 2006-08-02 12:46:56 UTC (rev 376) @@ -85,13 +85,19 @@ def __init__(self, class_inst, wrapper=None ): scoped.scoped_t.__init__( self, declaration=class_inst ) self._wrapper = wrapper - self.works_on_instance = False + self.works_on_instance = False + self._declaration_ccs = [] def _get_wrapper( self ): return self._wrapper def _set_wrapper( self, new_wrapper ): self._wrapper = new_wrapper wrapper = property( _get_wrapper, _set_wrapper ) + + @property + def declaration_code_creators( self ): + """ references to class declaration code creators. """ + return self._declaration_ccs def _get_held_type(self): return self.declaration.held_type Modified: pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py =================================================================== --- pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/pyplusplus/decl_wrappers/class_wrapper.py 2006-08-02 12:46:56 UTC (rev 376) @@ -90,8 +90,9 @@ self._held_type = None self._noncopyable = None self._wrapper_alias = self._generate_valid_name() + "_wrapper" - self._user_code = [] - self._wrapper_user_code = [] + self._registration_code = [] + self._declaration_code = [] + self._wrapper_code = [] self._null_constructor_body = '' self._copy_constructor_body = '' @@ -130,19 +131,31 @@ def _finalize_impl( self, error_behavior ): for decl in self.declarations: decl.finalize( error_behavior ) + + @property + def declaration_code( self ): + """ + List of strings, that contains valid C++ code, that will be added to + the class registration section + """ + return self._declaration_code + + @property + def registration_code( self ): + """ + List of strings, that contains valid C++ code, that will be added to + the class registration section + """ + return self._registration_code + + @property + def wrapper_code( self ): + """ + List of strings, that contains valid C++ code, that will be added to + the class wrapper. + """ + return self._wrapper_code - def _get_user_code( self ): - return self._user_code - def _set_user_code( self, value ): - self._user_code = value - user_code = property( _get_user_code, _set_user_code ) - - def _get_wrapper_user_code( self ): - return self._wrapper_user_code - def _set_wrapper_user_code( self, value ): - self._wrapper_user_code = value - wrapper_user_code = property( _get_wrapper_user_code, _set_wrapper_user_code ) - def _get_null_constructor_body(self): return self._null_constructor_body def _set_null_constructor_body(self, body): @@ -154,16 +167,21 @@ def _set_copy_constructor_body(self, body): self._copy_constructor_body = body copy_constructor_body = property( _get_copy_constructor_body, _set_copy_constructor_body ) + + def add_declaration_code( self, code ): + self.declaration_code.append( user_text.user_text_t( code ) ) - def add_code( self, code, works_on_instance=True ): + def add_registration_code( self, code, works_on_instance=True ): """works_on_instance: If true, the custom code can be applied directly to obj inst. Ex: ObjInst."CustomCode" """ - self.user_code.append( user_text.class_user_text_t( code, works_on_instance ) ) - + self.registration_code.append( user_text.class_user_text_t( code, works_on_instance ) ) + #preserving backward computability + add_code = add_registration_code + def add_wrapper_code( self, code ): - self.wrapper_user_code.append( user_text.user_text_t( code ) ) - + self.wrapper_code.append( user_text.user_text_t( code ) ) + def set_constructors_body( self, body ): """Sets the body for all constructors""" self.constructors().body = body Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-08-02 12:46:56 UTC (rev 376) @@ -320,10 +320,10 @@ def _is_wrapper_needed(self, class_inst, exportable_members): if isinstance( self.curr_decl, declarations.class_t ) \ - and self.curr_decl.wrapper_user_code: + and self.curr_decl.wrapper_code: return True elif isinstance( self.curr_code_creator, declarations.class_t ) \ - and self.curr_code_creator.wrapper_user_code: + and self.curr_code_creator.wrapper_code: return True else: pass @@ -417,12 +417,12 @@ ctext_t = code_creators.custom_text_t for creator in code_creators.make_flatten( self.__extmodule ): if isinstance( creator, code_creators.class_t ): - for user_code in creator.declaration.user_code: + for user_code in creator.declaration.registration_code: creator.adopt_creator( ctext_t( user_code.text , works_on_instance=user_code.works_on_instance ) ) elif isinstance( creator, code_creators.class_wrapper_t ): - for user_code in creator.declaration.wrapper_user_code: + for user_code in creator.declaration.wrapper_code: creator.adopt_creator( ctext_t( user_code.text ) ) else: pass Modified: pyplusplus_dev/unittests/data/module_body_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/module_body_to_be_exported.hpp 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/unittests/data/module_body_to_be_exported.hpp 2006-08-02 12:46:56 UTC (rev 376) @@ -5,6 +5,10 @@ #ifndef __module_body_to_be_exported_hpp__ #define __module_body_to_be_exported_hpp__ + +namespace mb{ + struct item_t{}; +} #endif//__module_body_to_be_exported_hpp__ Modified: pyplusplus_dev/unittests/module_body_tester.py =================================================================== --- pyplusplus_dev/unittests/module_body_tester.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/unittests/module_body_tester.py 2006-08-02 12:46:56 UTC (rev 376) @@ -23,6 +23,11 @@ mb.add_declaration_code( "//this is a comment", False ) mb.add_registration_code( 'bp::def( "get1", &get1 );' ) mb.add_registration_code( '//this is another comment', False ) + + item = mb.class_( 'item_t' ) + item.add_declaration_code( "int get11( const mb::item_t& item ){ return 11;}" ) + item.add_registration_code( 'def( "get11", &get11 )' ) + item.add_wrapper_code( '//this is wrapper code' ) def run_tests(self, module): self.failUnless( 1 == module.get1() ) Modified: pyplusplus_dev/unittests/user_text_tester.py =================================================================== --- pyplusplus_dev/unittests/user_text_tester.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/unittests/user_text_tester.py 2006-08-02 12:46:56 UTC (rev 376) @@ -20,7 +20,7 @@ def customize(self, mb ): data = mb.class_( 'data' ) class_code = "/*class code*/" - data.add_code( class_code, False ) + data.add_registration_code( class_code, False ) wrapper_code = "/*wrapper code*/" data.add_wrapper_code( wrapper_code ) mb.build_code_creator( self.EXTENSION_NAME ) Modified: pyplusplus_dev/unittests/vector3_tester.py =================================================================== --- pyplusplus_dev/unittests/vector3_tester.py 2006-08-01 15:13:12 UTC (rev 375) +++ pyplusplus_dev/unittests/vector3_tester.py 2006-08-02 12:46:56 UTC (rev 376) @@ -22,10 +22,10 @@ vec3 = mb.class_( 'Vector3' ) vec3.always_expose_using_scope = True #mb.calldefs().use_keywords = False - vec3.add_code( 'add_property( "val", &vector3::Vector3::val)' ) - vec3.add_code( 'add_property( "x", &vector3::Vector3::x)' ) - vec3.add_code( 'add_property( "y", &vector3::Vector3::y)' ) - vec3.add_code( 'add_property( "z", &vector3::Vector3::z)' ) + vec3.add_registration_code( 'add_property( "val", &vector3::Vector3::val)' ) + vec3.add_registration_code( 'add_property( "x", &vector3::Vector3::x)' ) + vec3.add_registration_code( 'add_property( "y", &vector3::Vector3::y)' ) + vec3.add_registration_code( 'add_property( "z", &vector3::Vector3::z)' ) def run_tests( self, module): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-08-09 06:07:07
|
Revision: 388 Author: roman_yakovenko Date: 2006-08-08 23:06:50 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=388&view=rev Log Message: ----------- abstract classes could not have held_type Modified Paths: -------------- pyplusplus_dev/docs/documentation/architecture.rest pyplusplus_dev/pyplusplus/module_creator/creator.py pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.cpp pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.hpp pyplusplus_dev/unittests/smart_pointers_tester.py Modified: pyplusplus_dev/docs/documentation/architecture.rest =================================================================== --- pyplusplus_dev/docs/documentation/architecture.rest 2006-08-08 07:58:31 UTC (rev 387) +++ pyplusplus_dev/docs/documentation/architecture.rest 2006-08-09 06:06:50 UTC (rev 388) @@ -141,9 +141,79 @@ Code generation engine ---------------------- -Code generation for `boost.python`_ library is a difficult process. +Code generation for `boost.python`_ library is a difficult process. I don't know +what about you, but when I have to solve some complex task, I prefer to use +`divide and conquer`_ paradigm. There are 2 different problems code generation +engine should solve: +* What code should be created in order to export a declaration? + I mean what `boost.python`_ code should be generated if you want to export this + or that declaration. + + Code creators is the solution to this problem. + +* How it should be written to files? + + Remember, `pyplusplus`_ is targeting big projects. It can not generate all code + in one file - this will not work, not at all. + + Code creators and file writers provides solution to this problem. + + +.. _`divide and conquer` : http://en.wikipedia.org/wiki/Divide_and_conquer_algorithm + + +Code creators +------------- + +Do you know how many ways exist to export member function? It is up to you to +find the answer to the question. Please consider next use cases: + +* function is non virtual, virtual or pure virtual + +* function is public, protected or private + +* function could be static + +* function could be an ``operator()`` or an ``operator[]`` + +As you see, there are a lot of use cases. How does code creators solves the +problem? There is almost a direct mapping between code creators and use cases. +Code creator knows what code should be generated, in order to export this or that +declaration. That is the only job of code creators. For example: + +* ``code_creators.enum_t`` generates code, that will export named enum + +* ``code_creators.indexing_suite2_t`` generates code, that will export stl container + +There are primary 2 kinds of code creators: declaration based and others. +Declaration based code creator creates code or part of it, that will export the +declaration. For example: in order to export virtual function, `pyplusplus`_ +creates 3 code creators: + +( I will reuse example from `boost.python`_ `tutorials`__.) + +.. __ : http://boost.org/libs/python/doc/tutorial/doc/html/python/exposing.html#python.virtual_functions_with_default_implementations + +1. ``BaseWrap::f`` + +2. ``BaseWrap::default_f`` + +3. ``f`` registration code + +Now when you understand, what code creator is, it is a time to move on - composite +code creator. Composite code creator is a creator, that contains other creators. +For example: ``code_creators.class_t`` or ``code_creators.module_t``. They embed +the code created by internal code creators within the code they create. + + + + + + + + .. _`pyplusplus` : ./../pyplusplus.html .. _`pygccxml` : ./../../pygccxml/pygccxml.html .. _`boost.python`: http://www.boost.org/libs/python/doc/index.html Modified: pyplusplus_dev/pyplusplus/module_creator/creator.py =================================================================== --- pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-08-08 07:58:31 UTC (rev 387) +++ pyplusplus_dev/pyplusplus/module_creator/creator.py 2006-08-09 06:06:50 UTC (rev 388) @@ -405,8 +405,9 @@ , recursive=True ) registrators_db = [] for creator in class_creators: - if None is creator.held_type: - creator.held_type = self.__types_db.create_holder( creator.declaration ) + if None is creator.held_type: + if not creator.declaration.is_abstract: + creator.held_type = self.__types_db.create_holder( creator.declaration ) registrators = self.__types_db.create_registrators( creator ) for r in registrators: if not self._is_registered_smart_pointer_creator( r, registrators_db ): Modified: pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.cpp =================================================================== --- pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.cpp 2006-08-08 07:58:31 UTC (rev 387) +++ pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.cpp 2006-08-09 06:06:50 UTC (rev 388) @@ -28,5 +28,17 @@ int const_ref_auto_base_value( const base_a_ptr& a ){ return a->get_base_value(); } int const_ref_shared_base_value( const base_s_ptr& a ){ return a->get_base_value(); } - + + +int ref_auto_some_value( base_a_ptr& a ){ return a->get_some_value(); } +int ref_shared_some_value( base_s_ptr& a ){ return a->get_some_value(); } + +int val_auto_some_value( base_a_ptr a ){ return a->get_some_value(); } +int val_shared_some_value( base_s_ptr a ){ return a->get_some_value(); } + +int const_ref_auto_some_value( const base_a_ptr& a ){ return a->get_some_value(); } +int const_ref_shared_some_value( const base_s_ptr& a ){ return a->get_some_value(); } + + + } Modified: pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.hpp 2006-08-08 07:58:31 UTC (rev 387) +++ pyplusplus_dev/unittests/data/smart_pointers_to_be_exported.hpp 2006-08-09 06:06:50 UTC (rev 388) @@ -13,13 +13,15 @@ struct base{ base() : base_value(19) {} int base_value; - virtual int get_base_value(){ return base_value; } + virtual int get_base_value(){ return base_value; } + virtual int get_some_value() = 0; }; struct data : base{ data() : value(11){} int value; - virtual int get_value(){ return value; } + virtual int get_value(){ return value; } + virtual int get_some_value(){ return 23; } }; typedef std::auto_ptr< base > base_a_ptr; @@ -48,7 +50,17 @@ int const_ref_auto_base_value( const base_a_ptr& a ); int const_ref_shared_base_value( const base_s_ptr& a ); - + +int ref_auto_some_value( base_a_ptr& a ); +int ref_shared_some_value( base_s_ptr& a ); + +int val_auto_some_value( base_a_ptr a ); +int val_shared_some_value( base_s_ptr a ); + +int const_ref_auto_some_value( const base_a_ptr& a ); +int const_ref_shared_some_value( const base_s_ptr& a ); + + } #endif//__smart_pointers_to_be_exported_hpp__ Modified: pyplusplus_dev/unittests/smart_pointers_tester.py =================================================================== --- pyplusplus_dev/unittests/smart_pointers_tester.py 2006-08-08 07:58:31 UTC (rev 387) +++ pyplusplus_dev/unittests/smart_pointers_tester.py 2006-08-09 06:06:50 UTC (rev 388) @@ -17,23 +17,42 @@ self , tester_t.EXTENSION_NAME , *args ) - + + def customize( self, mb ): + base = mb.class_( 'base' ) + #base.held_type = '' + + def create_py_derived( self, module ): + class py_derived_t( module.base ): + def __init__( self ): + module.base.__init__( self ) + + def get_some_value( self ): + return 28 + + return py_derived_t() + def run_tests( self, module): - da = module.create_auto() + da = module.create_auto() + py_derived = self.create_py_derived( module ) + self.failUnless( 11 == da.value ) ds = module.create_shared() self.failUnless( 11 == ds.value ) self.failUnless( 11 == module.ref_auto(da) ) - self.failUnless( 11 == module.ref_shared(ds) ) + self.failUnless( 11 == module.ref_shared(ds) ) + + #why? because in this case held type could not be set + #self.failUnless( 11 == module.ref_shared(py_derived) ) self.failUnless( 11 == module.val_auto(da) ) - self.failUnless( 11 == module.val_shared(ds) ) + self.failUnless( 11 == module.val_shared(ds) ) da = module.create_auto() self.failUnless( 11 == module.const_ref_auto(da) ) - self.failUnless( 11 == module.const_ref_shared(ds) ) + self.failUnless( 11 == module.const_ref_shared(ds) ) #TODO: find out why this fails #self.failUnless( 19 == module.ref_auto_base_value(da) ) @@ -42,13 +61,26 @@ da = module.create_auto() self.failUnless( 19 == module.const_ref_auto_base_value(da) ) - self.failUnless( 19 == module.const_ref_shared_base_value(ds) ) + self.failUnless( 19 == module.const_ref_shared_base_value(ds) ) + self.failUnless( 19 == module.const_ref_shared_base_value(py_derived) ) da = module.create_auto() self.failUnless( 19 == module.val_auto_base_value(da) ) - self.failUnless( 19 == module.val_shared_base_value(ds) ) - + self.failUnless( 19 == module.val_shared_base_value(ds) ) + self.failUnless( 19 == module.val_shared_base_value(py_derived) ) + + da = module.create_auto() + + self.failUnless( 23 == module.val_auto_some_value(da) ) + self.failUnless( 28 == module.val_shared_some_value(py_derived) ) + + da = module.create_auto() + + self.failUnless( 23 == module.const_ref_auto_some_value(da) ) + self.failUnless( 28 == module.const_ref_shared_some_value(py_derived) ) + + def create_suite(): suite = unittest.TestSuite() suite.addTest( unittest.makeSuite(tester_t)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <rom...@us...> - 2006-08-13 08:46:47
|
Revision: 396 Author: roman_yakovenko Date: 2006-08-13 01:46:39 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/pygccxml/?rev=396&view=rev Log Message: ----------- adding new test case Modified Paths: -------------- pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp pyplusplus_dev/unittests/indexing_suites2_tester.py Modified: pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp =================================================================== --- pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp 2006-08-13 08:27:03 UTC (rev 395) +++ pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp 2006-08-13 08:46:39 UTC (rev 396) @@ -8,6 +8,7 @@ #include <vector> #include <string> +#include <map> namespace indexing_suites2 { @@ -43,6 +44,16 @@ typedef std::vector<float> fvector; fvector empty_fvector(){ return fvector(); } + +typedef std::map< std::string, std::string > name2value_t; +inline std::string get_first_name( name2value_t const * names ){ + if( !names ){ + return ""; + } + else{ + return names->begin()->first; + } +} } Modified: pyplusplus_dev/unittests/indexing_suites2_tester.py =================================================================== --- pyplusplus_dev/unittests/indexing_suites2_tester.py 2006-08-13 08:27:03 UTC (rev 395) +++ pyplusplus_dev/unittests/indexing_suites2_tester.py 2006-08-13 08:46:39 UTC (rev 396) @@ -21,15 +21,6 @@ , indexing_suite_version=2 , *args) - #~ @staticmethod - #~ def matcher( item, decl ): - #~ if not declarations.vector_traits.is_my_case( decl ): - #~ return False - #~ value_type = declarations.vector_traits.value_type(decl) - #~ if item is value_type: - #~ return True - #~ return False - def customize(self, generator): fvector = generator.global_ns.typedef( 'fvector' ) fvector = declarations.remove_declarated( fvector.type ) @@ -42,13 +33,17 @@ self.failUnless( not hasattr( fv, 'extend' ) ) self.failUnless( not hasattr( fv, 'sort' ) ) self.failUnless( not hasattr( fv, 'reverse' ) ) - #~ items = module.items_t() - #~ item = module.item_t() - #~ item.value = 1977 - #~ items.append( item ) - #~ self.failUnless( module.get_value( items, 0 ).value == 1977 ) - #~ self.failUnless( len( items ) == 1 ) - + items = module.items_t() + item = module.item_t() + item.value = 1977 + items.append( item ) + self.failUnless( module.get_value( items, 0 ).value == 1977 ) + self.failUnless( len( items ) == 1 ) + + name2value = module.name2value_t() + name2value[ "x" ] = "y" + self.failUnless( "x" == module.get_first_name( name2value ) ) + def create_suite(): suite = unittest.TestSuite() suite.addTest( unittest.makeSuite(tester_t)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
