mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved some components into a detail sub-directory

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@478 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-22 06:51:19 +00:00
parent dc2d66245f
commit 4a128a0221
28 changed files with 188 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/boost/test/Jamfile.jam
View file

@ -8,7 +8,7 @@
import testing ; import testing ;
run [ glob test_*.cpp ] /boost//unit_test_framework ; run [ glob test_*.cpp detail/test_*.cpp ] /boost//unit_test_framework ;
compile-fail fail_ambiguous_mock_method.cpp ; compile-fail fail_ambiguous_mock_method.cpp ;
compile-fail fail_constraint_functor_not_compatible.cpp ; compile-fail fail_constraint_functor_not_compatible.cpp ;

3
build/build.xml
View file

@ -141,6 +141,9 @@
<replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g"> <replaceregexp match='"([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp"/> <fileset dir="${boost.dir}" includes="**/*.hpp"/>
</replaceregexp> </replaceregexp>
<replaceregexp match='"\.\./([^"]+\.hpp)"' replace="&lt;boost/mock/\1&gt;" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp"/>
</replaceregexp>
<replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g"> <replaceregexp match="&lt;turtle/([^&gt;]+)" replace="&lt;boost/mock/\1" flags="g">
<fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/> <fileset dir="${boost.dir}" includes="**/*.hpp,**/*.cpp"/>
</replaceregexp> </replaceregexp>

21
build/vc100/turtle.vcxproj
View file

@ -20,33 +20,34 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\turtle\action.hpp" /> <ClInclude Include="..\..\turtle\action.hpp" />
<ClInclude Include="..\..\turtle\args.hpp" />
<ClInclude Include="..\..\turtle\boost_test_error.hpp" /> <ClInclude Include="..\..\turtle\boost_test_error.hpp" />
<ClInclude Include="..\..\turtle\check.hpp" /> <ClInclude Include="..\..\turtle\check.hpp" />
<ClInclude Include="..\..\turtle\child.hpp" />
<ClInclude Include="..\..\turtle\cleanup.hpp" /> <ClInclude Include="..\..\turtle\cleanup.hpp" />
<ClInclude Include="..\..\turtle\config.hpp" /> <ClInclude Include="..\..\turtle\config.hpp" />
<ClInclude Include="..\..\turtle\constraint.hpp" /> <ClInclude Include="..\..\turtle\constraint.hpp" />
<ClInclude Include="..\..\turtle\constraints.hpp" /> <ClInclude Include="..\..\turtle\constraints.hpp" />
<ClInclude Include="..\..\turtle\context.hpp" />
<ClInclude Include="..\..\turtle\default_error.hpp" /> <ClInclude Include="..\..\turtle\default_error.hpp" />
<ClInclude Include="..\..\turtle\detail\args.hpp" />
<ClInclude Include="..\..\turtle\detail\child.hpp" />
<ClInclude Include="..\..\turtle\detail\context.hpp" />
<ClInclude Include="..\..\turtle\detail\group.hpp" />
<ClInclude Include="..\..\turtle\detail\lambda.hpp" />
<ClInclude Include="..\..\turtle\detail\parent.hpp" />
<ClInclude Include="..\..\turtle\detail\root.hpp" />
<ClInclude Include="..\..\turtle\detail\signature.hpp" />
<ClInclude Include="..\..\turtle\detail\type_name.hpp" />
<ClInclude Include="..\..\turtle\detail\verifiable.hpp" />
<ClInclude Include="..\..\turtle\detail\yes_no_type.hpp" />
<ClInclude Include="..\..\turtle\error.hpp" /> <ClInclude Include="..\..\turtle\error.hpp" />
<ClInclude Include="..\..\turtle\expectation.hpp" /> <ClInclude Include="..\..\turtle\expectation.hpp" />
<ClInclude Include="..\..\turtle\function.hpp" /> <ClInclude Include="..\..\turtle\function.hpp" />
<ClInclude Include="..\..\turtle\group.hpp" />
<ClInclude Include="..\..\turtle\invocation.hpp" /> <ClInclude Include="..\..\turtle\invocation.hpp" />
<ClInclude Include="..\..\turtle\is_functor.hpp" /> <ClInclude Include="..\..\turtle\is_functor.hpp" />
<ClInclude Include="..\..\turtle\lambda.hpp" />
<ClInclude Include="..\..\turtle\log.hpp" /> <ClInclude Include="..\..\turtle\log.hpp" />
<ClInclude Include="..\..\turtle\mock.hpp" /> <ClInclude Include="..\..\turtle\mock.hpp" />
<ClInclude Include="..\..\turtle\object.hpp" /> <ClInclude Include="..\..\turtle\object.hpp" />
<ClInclude Include="..\..\turtle\operators.hpp" /> <ClInclude Include="..\..\turtle\operators.hpp" />
<ClInclude Include="..\..\turtle\parent.hpp" />
<ClInclude Include="..\..\turtle\root.hpp" />
<ClInclude Include="..\..\turtle\sequence.hpp" /> <ClInclude Include="..\..\turtle\sequence.hpp" />
<ClInclude Include="..\..\turtle\type_name.hpp" />
<ClInclude Include="..\..\turtle\verifiable.hpp" />
<ClInclude Include="..\..\turtle\yes_no_type.hpp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}</ProjectGuid> <ProjectGuid>{831F2DEE-1E35-4533-A3B2-12C01BA8DA1D}</ProjectGuid>

66
build/vc100/turtle.vcxproj.filters
View file

@ -5,6 +5,9 @@
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter> </Filter>
<Filter Include="Source Files\detail">
<UniqueIdentifier>{b9cb2ff2-1351-456d-985e-cb0dd3f4e12d}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\turtle\config.hpp"> <ClInclude Include="..\..\turtle\config.hpp">
@ -16,9 +19,6 @@
<ClInclude Include="..\..\turtle\constraints.hpp"> <ClInclude Include="..\..\turtle\constraints.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\context.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\default_error.hpp"> <ClInclude Include="..\..\turtle\default_error.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -31,18 +31,12 @@
<ClInclude Include="..\..\turtle\function.hpp"> <ClInclude Include="..\..\turtle\function.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\group.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\invocation.hpp"> <ClInclude Include="..\..\turtle\invocation.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\is_functor.hpp"> <ClInclude Include="..\..\turtle\is_functor.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\lambda.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\log.hpp"> <ClInclude Include="..\..\turtle\log.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
@ -55,41 +49,53 @@
<ClInclude Include="..\..\turtle\operators.hpp"> <ClInclude Include="..\..\turtle\operators.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\parent.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\root.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\sequence.hpp"> <ClInclude Include="..\..\turtle\sequence.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\type_name.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\verifiable.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\yes_no_type.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\action.hpp"> <ClInclude Include="..\..\turtle\action.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\args.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\boost_test_error.hpp"> <ClInclude Include="..\..\turtle\boost_test_error.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\check.hpp"> <ClInclude Include="..\..\turtle\check.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\child.hpp">
<Filter>Source Files</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\cleanup.hpp"> <ClInclude Include="..\..\turtle\cleanup.hpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\turtle\detail\signature.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\lambda.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\args.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\child.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\group.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\context.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\parent.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\root.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\type_name.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\verifiable.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\turtle\detail\yes_no_type.hpp">
<Filter>Source Files\detail</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

8
build/vc100/turtle_bench.vcxproj
View file

@ -79,7 +79,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -106,7 +106,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -133,7 +133,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -161,7 +161,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

13
build/vc100/turtle_test.vcxproj
View file

@ -22,7 +22,9 @@
<ClInclude Include="..\..\test\mock_error.hpp" /> <ClInclude Include="..\..\test\mock_error.hpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\test\test_args.cpp" /> <ClCompile Include="..\..\test\detail\test_args.cpp" />
<ClCompile Include="..\..\test\detail\test_signature.cpp" />
<ClCompile Include="..\..\test\detail\test_type_name.cpp" />
<ClCompile Include="..\..\test\test_constraints.cpp" /> <ClCompile Include="..\..\test\test_constraints.cpp" />
<ClCompile Include="..\..\test\test_error.cpp" /> <ClCompile Include="..\..\test\test_error.cpp" />
<ClCompile Include="..\..\test\test_function.cpp" /> <ClCompile Include="..\..\test\test_function.cpp" />
@ -34,7 +36,6 @@
<ClCompile Include="..\..\test\test_mock.cpp" /> <ClCompile Include="..\..\test\test_mock.cpp" />
<ClCompile Include="..\..\test\test_object.cpp" /> <ClCompile Include="..\..\test\test_object.cpp" />
<ClCompile Include="..\..\test\test_sequence.cpp" /> <ClCompile Include="..\..\test\test_sequence.cpp" />
<ClCompile Include="..\..\test\test_type_name.cpp" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{74810A2A-33D8-47D6-9A50-71261F1683F5}</ProjectGuid> <ProjectGuid>{74810A2A-33D8-47D6-9A50-71261F1683F5}</ProjectGuid>
@ -84,7 +85,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm172 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm172 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -117,7 +118,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm172 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm172 %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -150,7 +151,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm162 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm162 %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -183,7 +184,7 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/Zm162 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm162 %(AdditionalOptions)</AdditionalOptions>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>../../../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../..; ../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks> <BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

16
build/vc100/turtle_test.vcxproj.filters
View file

@ -5,6 +5,9 @@
<UniqueIdentifier>{7b7d91a4-7b1e-441a-ac3f-2f93e73ae2ac}</UniqueIdentifier> <UniqueIdentifier>{7b7d91a4-7b1e-441a-ac3f-2f93e73ae2ac}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd</Extensions> <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter> </Filter>
<Filter Include="Source Files\detail">
<UniqueIdentifier>{214599f8-6837-4d60-96ae-b913798819ae}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\test\mock_error.hpp"> <ClInclude Include="..\..\test\mock_error.hpp">
@ -12,9 +15,6 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\test\test_args.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\test\test_constraints.cpp"> <ClCompile Include="..\..\test\test_constraints.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
@ -48,8 +48,14 @@
<ClCompile Include="..\..\test\test_sequence.cpp"> <ClCompile Include="..\..\test\test_sequence.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\test\test_type_name.cpp"> <ClCompile Include="..\..\test\detail\test_signature.cpp">
<Filter>Source Files</Filter> <Filter>Source Files\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\test\detail\test_args.cpp">
<Filter>Source Files\detail</Filter>
</ClCompile>
<ClCompile Include="..\..\test\detail\test_type_name.cpp">
<Filter>Source Files\detail</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
test/test_args.cpp → test/detail/test_args.cpp
View file

@ -6,7 +6,7 @@
// (See accompanying file LICENSE_1_0.txt or copy at // (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
#include <turtle/args.hpp> #include <turtle/detail/args.hpp>
#include <boost/test/auto_unit_test.hpp> #include <boost/test/auto_unit_test.hpp>
#include <boost/mpl/assert.hpp> #include <boost/mpl/assert.hpp>

27
test/detail/test_signature.cpp Normal file
View file

@ -0,0 +1,27 @@
// http://turtle.sourceforge.net
//
// Copyright Mathieu Champlon 2012
//
// 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)
#include <turtle/detail/signature.hpp>
#include <boost/test/auto_unit_test.hpp>
#include <boost/mpl/assert.hpp>
namespace
{
struct base
{
void method_1();
float method_2( int ) const;
};
typedef base base_type;
BOOST_MPL_ASSERT((
boost::is_same< void(), MOCK_SIGNATURE( method_1 ) > ));
BOOST_MPL_ASSERT((
boost::is_same< float( int ), MOCK_SIGNATURE( method_2 ) > ));
}

0
test/test_type_name.cpp → test/detail/test_type_name.cpp
View file

20
test/test_mock.cpp
View file

@ -12,26 +12,6 @@
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
namespace
{
struct s
{
void m1();
float m2( int );
};
BOOST_MPL_ASSERT((
boost::is_same<
void(),
mock::detail::signature< BOOST_TYPEOF( &s::m1 ) >::type
> ));
BOOST_MPL_ASSERT((
boost::is_same<
float( int ),
mock::detail::signature< BOOST_TYPEOF( &s::m2 ) >::type
> ));
}
namespace namespace
{ {
template< typename T > template< typename T >

2
turtle/action.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_ACTION_HPP_INCLUDED #ifndef MOCK_ACTION_HPP_INCLUDED
#define MOCK_ACTION_HPP_INCLUDED #define MOCK_ACTION_HPP_INCLUDED
#include "lambda.hpp" #include "detail/lambda.hpp"
#include <boost/type_traits/remove_reference.hpp> #include <boost/type_traits/remove_reference.hpp>
#include <boost/type_traits/remove_const.hpp> #include <boost/type_traits/remove_const.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>

2
turtle/cleanup.hpp
View file

@ -13,7 +13,7 @@
#ifdef MOCK_USE_BOOST_TEST #ifdef MOCK_USE_BOOST_TEST
#include "root.hpp" #include "detail/root.hpp"
#include <boost/test/unit_test_suite.hpp> #include <boost/test/unit_test_suite.hpp>
namespace mock namespace mock

0
turtle/args.hpp → turtle/detail/args.hpp
View file

4
turtle/child.hpp → turtle/detail/child.hpp
View file

@ -9,8 +9,8 @@
#ifndef MOCK_CHILD_HPP_INCLUDED #ifndef MOCK_CHILD_HPP_INCLUDED
#define MOCK_CHILD_HPP_INCLUDED #define MOCK_CHILD_HPP_INCLUDED
#include "parent.hpp" #include "detail/type_name.hpp"
#include "type_name.hpp" #include "detail/parent.hpp"
#include <boost/test/utils/basic_cstring/basic_cstring.hpp> #include <boost/test/utils/basic_cstring/basic_cstring.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <ostream> #include <ostream>

2
turtle/context.hpp → turtle/detail/context.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_CONTEXT_HPP_INCLUDED #ifndef MOCK_CONTEXT_HPP_INCLUDED
#define MOCK_CONTEXT_HPP_INCLUDED #define MOCK_CONTEXT_HPP_INCLUDED
#include "type_name.hpp" #include "detail/type_name.hpp"
#include <boost/noncopyable.hpp> #include <boost/noncopyable.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/test/utils/basic_cstring/basic_cstring.hpp> #include <boost/test/utils/basic_cstring/basic_cstring.hpp>

2
turtle/group.hpp → turtle/detail/group.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_GROUP_HPP_INCLUDED #ifndef MOCK_GROUP_HPP_INCLUDED
#define MOCK_GROUP_HPP_INCLUDED #define MOCK_GROUP_HPP_INCLUDED
#include "verifiable.hpp" #include "detail/verifiable.hpp"
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>

2
turtle/lambda.hpp → turtle/detail/lambda.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_LAMBDA_HPP_INCLUDED #ifndef MOCK_LAMBDA_HPP_INCLUDED
#define MOCK_LAMBDA_HPP_INCLUDED #define MOCK_LAMBDA_HPP_INCLUDED
#include "config.hpp" #include "../config.hpp"
#ifdef MOCK_USE_BOOST_PHOENIX #ifdef MOCK_USE_BOOST_PHOENIX
#include <boost/spirit/home/phoenix/bind.hpp> #include <boost/spirit/home/phoenix/bind.hpp>
#else #else

2
turtle/parent.hpp → turtle/detail/parent.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_PARENT_HPP_INCLUDED #ifndef MOCK_PARENT_HPP_INCLUDED
#define MOCK_PARENT_HPP_INCLUDED #define MOCK_PARENT_HPP_INCLUDED
#include "type_name.hpp" #include "detail/type_name.hpp"
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <boost/test/utils/basic_cstring/io.hpp> #include <boost/test/utils/basic_cstring/io.hpp>
#include <ostream> #include <ostream>

9
turtle/root.hpp → turtle/detail/root.hpp
View file

@ -9,11 +9,10 @@
#ifndef MOCK_ROOT_HPP_INCLUDED #ifndef MOCK_ROOT_HPP_INCLUDED
#define MOCK_ROOT_HPP_INCLUDED #define MOCK_ROOT_HPP_INCLUDED
#include "group.hpp" #include "detail/parent.hpp"
#include "context.hpp" #include "detail/group.hpp"
#include "parent.hpp" #include "detail/context.hpp"
#include "child.hpp" #include "detail/child.hpp"
#include "function.hpp"
#include <boost/test/utils/trivial_singleton.hpp> #include <boost/test/utils/trivial_singleton.hpp>
#include <ostream> #include <ostream>
#include <map> #include <map>

62
turtle/detail/signature.hpp Normal file
View file

@ -0,0 +1,62 @@
// http://turtle.sourceforge.net
//
// Copyright Mathieu Champlon 2012
//
// 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 MOCK_SIGNATURE_HPP_INCLUDED
#define MOCK_SIGNATURE_HPP_INCLUDED
#include <boost/function_types/parameter_types.hpp>
#include <boost/function_types/function_type.hpp>
#include <boost/function_types/result_type.hpp>
#include <boost/mpl/single_view.hpp>
#include <boost/mpl/joint_view.hpp>
#include <boost/mpl/pop_front.hpp>
#define BOOST_TYPEOF_SILENT
#include <boost/typeof/typeof.hpp>
namespace mock
{
namespace detail
{
template< typename M >
struct signature :
boost::function_types::function_type<
boost::mpl::joint_view<
boost::mpl::single_view<
BOOST_DEDUCED_TYPENAME
boost::function_types::result_type< M >::type
>,
BOOST_DEDUCED_TYPENAME boost::mpl::pop_front<
BOOST_DEDUCED_TYPENAME
boost::function_types::parameter_types< M >
>::type
>
>
{};
template< typename T >
struct base
{
typedef T base_type;
};
}
// if an error is generated by the line below it means
// the method is ambiguous : use MOCK_METHOD_EXT instead
template< typename T >
T& ambiguous_method_name_use_MOCK_METHOD_EXT_instead( const T& );
} // mock
#define MOCK_SIGNATURE(M) \
mock::detail::signature< \
BOOST_TYPEOF( \
mock::ambiguous_method_name_use_MOCK_METHOD_EXT_instead( \
&base_type::M ) ) \
>::type
#endif // MOCK_SIGNATURE_HPP_INCLUDED

0
turtle/type_name.hpp → turtle/detail/type_name.hpp
View file

0
turtle/verifiable.hpp → turtle/detail/verifiable.hpp
View file

0
turtle/yes_no_type.hpp → turtle/detail/yes_no_type.hpp
View file

8
turtle/function.hpp
View file

@ -11,12 +11,12 @@
#include "config.hpp" #include "config.hpp"
#include "error.hpp" #include "error.hpp"
#include "context.hpp"
#include "expectation.hpp" #include "expectation.hpp"
#include "verifiable.hpp"
#include "log.hpp" #include "log.hpp"
#include "args.hpp" #include "detail/verifiable.hpp"
#include "type_name.hpp" #include "detail/type_name.hpp"
#include "detail/context.hpp"
#include "detail/args.hpp"
#include <boost/function_types/result_type.hpp> #include <boost/function_types/result_type.hpp>
#include <boost/function_types/function_arity.hpp> #include <boost/function_types/function_arity.hpp>
#include <boost/function_types/parameter_types.hpp> #include <boost/function_types/parameter_types.hpp>

2
turtle/is_functor.hpp
View file

@ -9,7 +9,7 @@
#ifndef MOCK_IS_FUNCTOR_HPP_INCLUDED #ifndef MOCK_IS_FUNCTOR_HPP_INCLUDED
#define MOCK_IS_FUNCTOR_HPP_INCLUDED #define MOCK_IS_FUNCTOR_HPP_INCLUDED
#include "yes_no_type.hpp" #include "detail/yes_no_type.hpp"
#include <boost/function_types/is_callable_builtin.hpp> #include <boost/function_types/is_callable_builtin.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/mpl/or.hpp> #include <boost/mpl/or.hpp>

48
turtle/mock.hpp
View file

@ -13,46 +13,16 @@
#include "cleanup.hpp" #include "cleanup.hpp"
#include "object.hpp" #include "object.hpp"
#include "function.hpp" #include "function.hpp"
#include "args.hpp" #include "detail/type_name.hpp"
#include "type_name.hpp" #include "detail/args.hpp"
#include "detail/signature.hpp"
#include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/repetition/repeat.hpp>
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
#include <boost/function_types/parameter_types.hpp>
#include <boost/function_types/function_type.hpp>
#include <boost/function_types/result_type.hpp>
#include <boost/mpl/joint_view.hpp>
#include <boost/mpl/single_view.hpp>
#include <boost/mpl/pop_front.hpp>
#define BOOST_TYPEOF_SILENT
#include <boost/typeof/typeof.hpp>
#include <boost/type_traits.hpp>
namespace mock namespace mock
{ {
namespace detail namespace detail
{ {
template< typename M >
struct signature :
boost::function_types::function_type<
boost::mpl::joint_view<
boost::mpl::single_view<
BOOST_DEDUCED_TYPENAME
boost::function_types::result_type< M >::type
>,
BOOST_DEDUCED_TYPENAME boost::mpl::pop_front<
BOOST_DEDUCED_TYPENAME
boost::function_types::parameter_types< M >
>::type
>
>
{};
template< typename T >
struct base
{
typedef T base_type;
};
template< typename S > template< typename S >
struct functor : mock::function< S > struct functor : mock::function< S >
{ {
@ -69,11 +39,6 @@ namespace detail
} }
}; };
} }
// if an error is generated by the line below it means
// the method is ambiguous : use MOCK_METHOD_EXT instead
template< typename T >
T& ambiguous_method_name_use_MOCK_METHOD_EXT_instead( const T& );
} // mock } // mock
#define MOCK_BASE_CLASS(T, I) \ #define MOCK_BASE_CLASS(T, I) \
@ -101,13 +66,6 @@ namespace detail
return t##_mock_; \ return t##_mock_; \
} }
#define MOCK_SIGNATURE(M) \
mock::detail::signature< \
BOOST_TYPEOF( \
mock::ambiguous_method_name_use_MOCK_METHOD_EXT_instead( \
&base_type::M ) ) \
>::type
#define MOCK_METHOD_AUX(M, n, S, t, c, tpn) \ #define MOCK_METHOD_AUX(M, n, S, t, c, tpn) \
MOCK_DECL(M, n, S, c, tpn) \ MOCK_DECL(M, n, S, c, tpn) \
{ \ { \

10
turtle/object.hpp
View file

@ -9,11 +9,11 @@
#ifndef MOCK_OBJECT_HPP_INCLUDED #ifndef MOCK_OBJECT_HPP_INCLUDED
#define MOCK_OBJECT_HPP_INCLUDED #define MOCK_OBJECT_HPP_INCLUDED
#include "root.hpp" #include "detail/root.hpp"
#include "context.hpp" #include "detail/parent.hpp"
#include "parent.hpp" #include "detail/type_name.hpp"
#include "child.hpp" #include "detail/context.hpp"
#include "type_name.hpp" #include "detail/child.hpp"
#include <boost/test/utils/basic_cstring/basic_cstring.hpp> #include <boost/test/utils/basic_cstring/basic_cstring.hpp>
#include <boost/enable_shared_from_this.hpp> #include <boost/enable_shared_from_this.hpp>
#include <boost/type_traits/is_base_of.hpp> #include <boost/type_traits/is_base_of.hpp>