+ creating a branch for a xpressive extension that allows nesting

of regular expressions [SVN r38759]
Update for V2
2026-01-21 04:52:25 +00:00 · 2007-08-19 15:07:44 +00:00 · 2007-08-08 19:16:43 +00:00 · 2007-07-29 20:33:46 +00:00 · 2007-01-07 23:50:56 +00:00 · 2006-11-29 19:21:46 +00:00
10 changed files with 189 additions and 56 deletions
--- a/doc/detail/lambda_doc.xml
+++ b/doc/detail/lambda_doc.xml
@@ -163,8 +163,8 @@ The STL contains predefined function objects for some common cases (such as <lit
 As an example, one possible implementation for the standard <literal>plus</literal> template is:

 <programlisting>
-<![CDATA[template <class T> : public binary_function<T, T, T>
-struct plus {
+<![CDATA[template <class T>
+struct plus : public binary_function<T, T, T> {
  T operator()(const T& i, const T& j) const {
    return i + j; 
  }
--- a/doc/index.html
+++ b/doc/index.html
@@ -3,6 +3,10 @@
 <meta http-equiv="refresh" content="0; URL=../../../doc/html/lambda.html">
 </head>
 <body>
-Automatic redirection failed, please go to <a href="../../../doc/html/lambda.html">www.boost.org/doc/html/lambda.html</a>
+Automatic redirection failed, please go to <a href="../../../doc/html/lambda.html">www.boost.org/doc/html/lambda.html</a>&nbsp;<hr>
+<p>© Copyright Beman Dawes, 2001</p>
+<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
+file <a href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
+at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
 </body>
-</html>
+</html>
--- a/doc/lambda.xml
+++ b/doc/lambda.xml
@@ -2640,6 +2640,7 @@ which require that the argument types are references.
 <row><entry><literal><![CDATA[&]]></literal></entry><entry><literal><![CDATA[other_action<address_of_action>]]></literal></entry></row>
 <row><entry><literal><![CDATA[*]]></literal></entry><entry><literal><![CDATA[other_action<contents_of_action>]]></literal></entry></row>
 <row><entry><literal><![CDATA[,]]></literal></entry><entry><literal><![CDATA[other_action<comma_action>]]></literal></entry></row>
+<row><entry><literal><![CDATA[->*]]></literal></entry><entry><literal><![CDATA[other_action<member_pointer_action>]]></literal></entry></row>

 </tbody>
 </tgroup>
--- a/0
+++ b/0
--- a/include/boost/lambda/detail/lambda_functors.hpp
+++ b/include/boost/lambda/detail/lambda_functors.hpp
@@ -148,6 +148,14 @@ public:
    >(a, cnull_type(), cnull_type(), cnull_type());
  }

+  template<class A>
+  typename inherited::template sig<tuple<A const&> >::type
+  operator()(A const& a) const { 
+    return inherited::template call<
+      typename inherited::template sig<tuple<A const&> >::type
+    >(a, cnull_type(), cnull_type(), cnull_type());
+  }
+
  template<class A, class B>
  typename inherited::template sig<tuple<A&, B&> >::type
  operator()(A& a, B& b) const { 
@@ -156,6 +164,30 @@ public:
    >(a, b, cnull_type(), cnull_type()); 
  }

+  template<class A, class B>
+  typename inherited::template sig<tuple<A const&, B&> >::type
+  operator()(A const& a, B& b) const { 
+    return inherited::template call<
+      typename inherited::template sig<tuple<A const&, B&> >::type
+    >(a, b, cnull_type(), cnull_type()); 
+  }
+
+  template<class A, class B>
+  typename inherited::template sig<tuple<A&, B const&> >::type
+  operator()(A& a, B const& b) const { 
+    return inherited::template call<
+      typename inherited::template sig<tuple<A&, B const&> >::type
+    >(a, b, cnull_type(), cnull_type()); 
+  }
+
+  template<class A, class B>
+  typename inherited::template sig<tuple<A const&, B const&> >::type
+  operator()(A const& a, B const& b) const { 
+    return inherited::template call<
+      typename inherited::template sig<tuple<A const&, B const&> >::type
+    >(a, b, cnull_type(), cnull_type()); 
+  }
+
  template<class A, class B, class C>
  typename inherited::template sig<tuple<A&, B&, C&> >::type
  operator()(A& a, B& b, C& c) const
@@ -165,6 +197,15 @@ public:
    >(a, b, c, cnull_type()); 
  }

+  template<class A, class B, class C>
+  typename inherited::template sig<tuple<A const&, B const&, C const&> >::type
+  operator()(A const& a, B const& b, C const& c) const
+  { 
+    return inherited::template call<
+      typename inherited::template sig<tuple<A const&, B const&, C const&> >::type
+    >(a, b, c, cnull_type()); 
+  }
+
  // for internal calls with env
  template<CALL_TEMPLATE_ARGS>
  typename inherited::template sig<tuple<CALL_REFERENCE_TYPES> >::type
@@ -207,6 +248,28 @@ public:
 } // namespace lambda
 } // namespace boost

+// is_placeholder
+
+#include <boost/is_placeholder.hpp>
+
+namespace boost
+{
+
+template<> struct is_placeholder< lambda::lambda_functor< lambda::placeholder<lambda::FIRST> > >
+{
+    enum _vt { value = 1 };
+};
+
+template<> struct is_placeholder< lambda::lambda_functor< lambda::placeholder<lambda::SECOND> > >
+{
+    enum _vt { value = 2 };
+};
+
+template<> struct is_placeholder< lambda::lambda_functor< lambda::placeholder<lambda::THIRD> > >
+{
+    enum _vt { value = 3 };
+};
+
+} // namespace boost
+
 #endif
-
-
--- a/include/boost/lambda/detail/operator_return_type_traits.hpp
+++ b/include/boost/lambda/detail/operator_return_type_traits.hpp
@@ -859,7 +859,7 @@ struct return_type_2<other_action<subscript_action>, A, B> {


 // Forward declarations are incompatible with the libstdc++ debug mode.
-#if BOOST_WORKAROUND(__GNUC__, >= 3) && _GLIBCXX_DEBUG
+#if BOOST_WORKAROUND(__GNUC__, >= 3) && defined(_GLIBCXX_DEBUG)
 #include <string>
 #include <vector>
 #include <map>
--- a/index.html
+++ b/index.html
@@ -3,6 +3,10 @@
 <meta http-equiv="refresh" content="0; URL=../../doc/html/lambda.html">
 </head>
 <body>
-Automatic redirection failed, please go to <a href="../../doc/html/lambda.html">www.boost.org/doc/html/lambda.html</a>
+Automatic redirection failed, please go to <a href="../../doc/html/lambda.html">www.boost.org/doc/html/lambda.html</a>&nbsp;<hr>
+<p>© Copyright Beman Dawes, 2001</p>
+<p>Distributed under the Boost Software License, Version 1.0. (See accompanying 
+file <a href="../../LICENSE_1_0.txt">LICENSE_1_0.txt</a> or copy 
+at <a href="http://www.boost.org/LICENSE_1_0.txt">www.boost.org/LICENSE_1_0.txt</a>)</p>
 </body>
 </html>
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -8,52 +8,26 @@

 # For more information, see http://www.boost.org/

+import testing ;

-subproject libs/lambda/test ;
-
-# bring in rules for testing
-SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
-include testing.jam ;
-
-# Make tests run by default.
-DEPENDS all : test ;
-
-{
-  # look in BOOST_ROOT for sources first, just in this Jamfile
-  local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
-
-  test-suite lambda
-    : 
-  [ run libs/lambda/test/algorithm_test.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/bind_tests_simple.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/bind_tests_advanced.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/bind_tests_simple_f_refs.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/bll_and_function.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/cast_test.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/constructor_tests.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/control_structures.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/exception_test.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/extending_rt_traits.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/is_instance_of_test.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/member_pointer_test.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/operator_tests_simple.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/phoenix_control_structures.cpp :  :  :  :  ]
-
-  [ run libs/lambda/test/switch_construct.cpp :  :  :  :  ]
- ;
-
-}
-      
+project 
+  : requirements <library>/boost/test//boost_test_exec_monitor
+  ;
+          
+test-suite lambda
+  : [ run algorithm_test.cpp ]
+    [ run bind_tests_simple.cpp ]
+    [ run bind_tests_advanced.cpp ]
+    [ run bind_tests_simple_f_refs.cpp ]
+    [ run bll_and_function.cpp ]
+    [ run cast_test.cpp : : : : lambda_cast_test ]
+    [ run constructor_tests.cpp ]
+    [ run control_structures.cpp ]
+    [ run exception_test.cpp ]
+    [ run extending_rt_traits.cpp ]
+    [ run is_instance_of_test.cpp ]
+    [ run member_pointer_test.cpp ]
+    [ run operator_tests_simple.cpp ]
+    [ run phoenix_control_structures.cpp ]
+    [ run switch_construct.cpp ]
+  ;      
--- a/test/istreambuf_test.cpp
+++ b/test/istreambuf_test.cpp
@@ -0,0 +1,30 @@
+// istreambuf_test - test lambda function objects with istreambuf_iterator
+//
+// Copyright (c) 2007 Peter Dimov
+//
+// 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 <boost/lambda/lambda.hpp>
+#include <boost/detail/lightweight_test.hpp>
+#include <iterator>
+#include <sstream>
+#include <algorithm>
+
+int main()
+{
+    using namespace boost::lambda;
+
+    std::stringstream is( "ax2" );
+
+    std::istreambuf_iterator<char> b2( is );
+    std::istreambuf_iterator<char> e2;
+
+    std::istreambuf_iterator<char> i = std::find_if( b2, e2, _1 == 'x' );
+
+    BOOST_TEST( *i == 'x' );
+    BOOST_TEST( std::distance( i, e2 ) == 2 );
+
+    return boost::report_errors();
+}
--- a/test/rvalue_test.cpp
+++ b/test/rvalue_test.cpp
@@ -0,0 +1,57 @@
+// rvalue_test - test lambda function objects with rvalue arguments
+//
+// Copyright (c) 2007 Peter Dimov
+//
+// 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 <boost/lambda/lambda.hpp>
+#include <boost/detail/lightweight_test.hpp>
+
+int main()
+{
+    using namespace boost::lambda;
+
+    int x = 0;
+    int const y = 1;
+    int const z = 2;
+
+    BOOST_TEST( _1( x ) == 0 );
+    BOOST_TEST( _1( y ) == 1 );
+    BOOST_TEST( _1( 2 ) == 2 );
+
+    BOOST_TEST( _2( x, x ) == 0 );
+    BOOST_TEST( _2( x, y ) == 1 );
+    BOOST_TEST( _2( x, 2 ) == 2 );
+
+    BOOST_TEST( _2( 4, x ) == 0 );
+    BOOST_TEST( _2( 4, y ) == 1 );
+    BOOST_TEST( _2( 4, 2 ) == 2 );
+
+    (_1 = _2)( x, y );
+    BOOST_TEST( x == y );
+
+    (_1 = _2)( x, 3 );
+    BOOST_TEST( x == 3 );
+
+    (_2 = _1)( z, x );
+    BOOST_TEST( x == z );
+
+    (_2 = _1)( 4, x );
+    BOOST_TEST( x == 4 );
+
+    BOOST_TEST( _3( x, x, x ) == x );
+    BOOST_TEST( _3( x, x, y ) == y );
+    BOOST_TEST( _3( x, x, 2 ) == 2 );
+
+    BOOST_TEST( _3( x, 5, x ) == x );
+    BOOST_TEST( _3( x, 5, y ) == y );
+    BOOST_TEST( _3( x, 5, 2 ) == 2 );
+
+    BOOST_TEST( _3( 9, 5, x ) == x );
+    BOOST_TEST( _3( 9, 5, y ) == y );
+    BOOST_TEST( _3( 9, 5, 2 ) == 2 );
+
+    return boost::report_errors();
+}
Author	SHA1	Message	Date
Andreas Pokorny	718eb7eefd	+ creating a branch for a xpressive extension that allows nesting of regular expressions [SVN r38759]	2007-08-19 15:07:44 +00:00
Vladimir Prus	797b5756cf	Update for V2 [SVN r38520]	2007-08-08 19:16:43 +00:00
Peter Dimov	bd4da55f0f	Rvalue support [SVN r38299]	2007-07-29 20:33:46 +00:00
Daniel James	47bf3df0ae	Merge fixed links from RC_1_34_0. [SVN r36660]	2007-01-07 23:50:56 +00:00
Jaakko Järvi	ff0929e6e3	fixed bug 1444052 [SVN r36200]	2006-11-29 19:21:46 +00:00
Jaakko Järvi	9b925abaff	added ->* to the table of actions for return types deduction [SVN r36199]	2006-11-29 18:54:18 +00:00
Beman Dawes	bf50f2fe7f	Add copyright, license [SVN r35905]	2006-11-07 19:11:57 +00:00
Daryle Walker	85630d55a6	Correct placement of base class declaration [SVN r34533]	2006-07-14 08:04:08 +00:00
Peter Dimov	2e8c4eb8f3	is_placeholder, is_bind_expression added. [SVN r34468]	2006-07-06 13:47:26 +00:00