Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r71731 - trunk/libs/spirit/test/qi
From: hartmut.kaiser_at_[hidden]
Date: 2011-05-04 22:10:17


Author: hkaiser
Date: 2011-05-04 22:10:16 EDT (Wed, 04 May 2011)
New Revision: 71731
URL: http://svn.boost.org/trac/boost/changeset/71731

Log:
Spirit: adding more test cases
Text files modified:
   trunk/libs/spirit/test/qi/regression_adapt_adt.cpp | 55 ++++++++++++++++++++++++++++++++++-----
   1 files changed, 47 insertions(+), 8 deletions(-)

Modified: trunk/libs/spirit/test/qi/regression_adapt_adt.cpp
==============================================================================
--- trunk/libs/spirit/test/qi/regression_adapt_adt.cpp (original)
+++ trunk/libs/spirit/test/qi/regression_adapt_adt.cpp 2011-05-04 22:10:16 EDT (Wed, 04 May 2011)
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 Philip Roji
+// Copyright (c) 2011 Roji Philip
 // Copyright (c) 2001-2011 Hartmut Kaiser
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -16,23 +16,47 @@
 #include "test.hpp"
 
 ///////////////////////////////////////////////////////////////////////////////
-struct test
+struct test1
 {
     unsigned var;
     boost::optional<unsigned> opt;
 
+ unsigned& getvar() { return var; }
     unsigned const& getvar() const { return var; }
     void setvar(unsigned val) { var = val; }
 
+ boost::optional<unsigned>& getopt() { return opt; }
     boost::optional<unsigned> const& getopt() const { return opt; }
     void setopt(boost::optional<unsigned> const& val) { opt = val; }
 };
 
 BOOST_FUSION_ADAPT_ADT(
- test,
- (unsigned const&, unsigned const&, obj.getvar(), obj.setvar(val) )
- (boost::optional<unsigned> const&, boost::optional<unsigned> const&,
- obj.getopt(), obj.setopt(val) )
+ test1,
+ (unsigned&, unsigned const&, obj.getvar(), obj.setvar(val))
+ (boost::optional<unsigned>&, boost::optional<unsigned> const&,
+ obj.getopt(), obj.setopt(val))
+)
+
+///////////////////////////////////////////////////////////////////////////////
+struct test2
+{
+ std::string str;
+ boost::optional<std::string> optstr;
+
+ std::string& getstring() { return str; }
+ std::string const& getstring() const { return str; }
+ void setstring(std::string const& val) { str = val; }
+
+ boost::optional<std::string>& getoptstring() { return optstr; }
+ boost::optional<std::string> const& getoptstring() const { return optstr; }
+ void setoptstring(boost::optional<std::string> const& val) { optstr = val; }
+};
+
+BOOST_FUSION_ADAPT_ADT(
+ test2,
+ (std::string&, std::string const&, obj.getstring(), obj.setstring(val))
+ (boost::optional<std::string>&, boost::optional<std::string> const&,
+ obj.getoptstring(), obj.setoptstring(val))
 )
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -42,16 +66,31 @@
     namespace qi = boost::spirit::qi;
 
     {
- test data;
+ test1 data;
         BOOST_TEST(test_attr("123_at_999", qi::uint_ >> -('@' >> qi::uint_), data) &&
             data.var == 123 && data.opt && data.opt.get() == 999);
     }
 
     {
- test data;
+ test1 data;
         BOOST_TEST(test_attr("123", qi::uint_ >> -('@' >> qi::uint_), data) &&
             data.var == 123 && !data.opt);
     }
 
+ {
+ test2 data;
+ BOOST_TEST(test_attr("Hello:OptionalHello",
+ +qi::alnum >> -(':' >> +qi::alnum), data) &&
+ data.str == "Hello" &&
+ data.optstr && data.optstr.get() == "OptionalHello");
+ }
+
+ {
+ test2 data;
+ BOOST_TEST(test_attr("Hello",
+ +qi::alnum >> -(':' >> +qi::alnum), data) &&
+ data.str == "Hello" && !data.optstr);
+ }
+
     return boost::report_errors();
 }


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk