[Boost-commit] svn:boost r40942 - branches/proto/v3/libs/xpressive/proto3/test

From: eric_at_[hidden]
Date: 2007-11-08 14:49:48

Author: eric_niebler
Date: 2007-11-08 14:49:47 EST (Thu, 08 Nov 2007)
New Revision: 40942
URL: http://svn.boost.org/trac/boost/changeset/40942

Log:
ah-ha! -std=gnu++0x fixes the build problems on cygwin
Text files modified: 
   branches/proto/v3/libs/xpressive/proto3/test/Jamfile.v2    |     4 ++--                                    
   branches/proto/v3/libs/xpressive/proto3/test/examples2.cpp |    31 ++++++++++++++-----------------         
   branches/proto/v3/libs/xpressive/proto3/test/main.cpp      |     1 -                                       
   branches/proto/v3/libs/xpressive/proto3/test/matches.cpp   |     4 +---                                    
   4 files changed, 17 insertions(+), 23 deletions(-)

Modified: branches/proto/v3/libs/xpressive/proto3/test/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/xpressive/proto3/test/Jamfile.v2	(original)
+++ branches/proto/v3/libs/xpressive/proto3/test/Jamfile.v2	2007-11-08 14:49:47 EST (Thu, 08 Nov 2007)
@@ -12,8 +12,8 @@
         <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
-        #<library>/boost/test//boost_unit_test_framework
-        #<link>static
+        <library>/boost/test//boost_unit_test_framework
+        <link>static
     ;
 
 test-suite "proto"

Modified: branches/proto/v3/libs/xpressive/proto3/test/examples2.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto3/test/examples2.cpp	(original)
+++ branches/proto/v3/libs/xpressive/proto3/test/examples2.cpp	2007-11-08 14:49:47 EST (Thu, 08 Nov 2007)
@@ -5,9 +5,6 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-// for cygwin
-#undef __STRICT_ANSI__
-
 #include <iostream>
 #include <boost/config.hpp>
 #include <boost/mpl/min_max.hpp>
@@ -19,7 +16,7 @@
 #include <boost/utility/result_of.hpp>
 #include <boost/fusion/include/cons.hpp>
 #include <boost/fusion/include/pop_front.hpp>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost::proto;
 using namespace transform;
@@ -135,8 +132,8 @@
 struct one  : mpl::int_<1> {};
 struct two  : mpl::int_<2> {};
 
-terminal< placeholder1 >::type const _1_ = {{}};
-terminal< placeholder2 >::type const _2_ = {{}};
+terminal< placeholder1 >::type const _1 = {{}};
+terminal< placeholder2 >::type const _2 = {{}};
 
 //[ CalculatorArityGrammar
 struct CalculatorArity
@@ -206,14 +203,14 @@
 //]
 
 //[ FoldTreeToList
-// This transform matches expressions of the form (_1_=1,'a',"b")
+// This transform matches expressions of the form (_1=1,'a',"b")
 // (note the use of the comma operator) and transforms it into a
 // Fusion cons list of their arguments. In this case, the result
 // would be cons(1, cons('a', cons("b", nil()))).
 struct FoldTreeToList
   : or_<
         // This grammar describes what counts as the terminals in expressions
-        // of the form (_1_=1,'a',"b"), which will be flattened using
+        // of the form (_1=1,'a',"b"), which will be flattened using
         // reverse_fold_tree<> below.
         case_<assign<_, terminal<_> >
              , _arg(_right)
@@ -264,7 +261,7 @@
         function<terminal<make_pair_tag>, terminal<_>, terminal<_> >
       /*<< Return `std::pair<F,S>(f,s)` where `f` and `s` are the
       first and second arguments to the lazy `make_pair_()` function >>*/
-      , std::pair<typeof_<_arg(_arg1)>, typeof_<_arg(_arg2)> >(_arg(_arg1), _arg(_arg2))
+      , std::pair<_arg(_arg1), _arg(_arg2)>(_arg(_arg1), _arg(_arg2))
     >
 {};
 //]
@@ -293,27 +290,27 @@
     int i = 0; // not used, dummy state and visitor parameter
 
     std::cout << CalculatorArity::call( lit(100) * 200, i, i) << '\n';
-    std::cout << CalculatorArity::call( (_1_ - _1_) / _1_ * 100, i, i) << '\n';
-    std::cout << CalculatorArity::call( (_2_ - _1_) / _2_ * 100, i, i) << '\n';
+    std::cout << CalculatorArity::call( (_1 - _1) / _1 * 100, i, i) << '\n';
+    std::cout << CalculatorArity::call( (_2 - _1) / _2 * 100, i, i) << '\n';
     //]
 
     BOOST_CHECK_EQUAL(0, CalculatorArity::call( lit(100) * 200, i, i));
-    BOOST_CHECK_EQUAL(1, CalculatorArity::call( (_1_ - _1_) / _1_ * 100, i, i));
-    BOOST_CHECK_EQUAL(2, CalculatorArity::call( (_2_ - _1_) / _2_ * 100, i, i));
+    BOOST_CHECK_EQUAL(1, CalculatorArity::call( (_1 - _1) / _1 * 100, i, i));
+    BOOST_CHECK_EQUAL(2, CalculatorArity::call( (_2 - _1) / _2 * 100, i, i));
 
     BOOST_CHECK_EQUAL(0, CalcArity2::call( lit(100) * 200, i, i));
-    BOOST_CHECK_EQUAL(1, CalcArity2::call( (_1_ - _1_) / _1_ * 100, i, i));
-    BOOST_CHECK_EQUAL(2, CalcArity2::call( (_2_ - _1_) / _2_ * 100, i, i));
+    BOOST_CHECK_EQUAL(1, CalcArity2::call( (_1 - _1) / _1 * 100, i, i));
+    BOOST_CHECK_EQUAL(2, CalcArity2::call( (_2 - _1) / _2 * 100, i, i));
 
     using boost::fusion::cons;
     using boost::fusion::nil;
     // TODO
-    //cons<int, cons<char, cons<char const (&)[2]> > > args(ArgsAsList::call( _1_(1, 'a', "b"), i, i ));
+    //cons<int, cons<char, cons<char const (&)[2]> > > args(ArgsAsList::call( _1(1, 'a', "b"), i, i ));
     //BOOST_CHECK_EQUAL(args.car, 1);
     //BOOST_CHECK_EQUAL(args.cdr.car, 'a');
     //BOOST_CHECK_EQUAL(args.cdr.cdr.car, std::string("b"));
 
-    //cons<int, cons<char, cons<char const (&)[2]> > > lst(FoldTreeToList::call( (_1_ = 1, 'a', "b"), i, i ));
+    //cons<int, cons<char, cons<char const (&)[2]> > > lst(FoldTreeToList::call( (_1 = 1, 'a', "b"), i, i ));
     //BOOST_CHECK_EQUAL(lst.car, 1);
     //BOOST_CHECK_EQUAL(lst.cdr.car, 'a');
     //BOOST_CHECK_EQUAL(lst.cdr.cdr.car, std::string("b"));

Modified: branches/proto/v3/libs/xpressive/proto3/test/main.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto3/test/main.cpp	(original)
+++ branches/proto/v3/libs/xpressive/proto3/test/main.cpp	2007-11-08 14:49:47 EST (Thu, 08 Nov 2007)
@@ -1,4 +1,3 @@
-#undef __STRICT_ANSI__
 //#define BOOST_STRICT_CONFIG
 
 #include <cstdio>

Modified: branches/proto/v3/libs/xpressive/proto3/test/matches.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto3/test/matches.cpp	(original)
+++ branches/proto/v3/libs/xpressive/proto3/test/matches.cpp	2007-11-08 14:49:47 EST (Thu, 08 Nov 2007)
@@ -5,15 +5,13 @@
 //  Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#undef __STRICT_ANSI__
-
 #include <string>
 #include <iostream>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/xpressive/proto3/proto.hpp>
-#include <boost/test/included/unit_test.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace boost;
 using namespace proto;