Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17591
Modified Files:
basic_regex.hpp match_results.hpp regex_compiler.hpp
regex_primitives.hpp sub_match.hpp
Log Message:
rename proto::op to proto::functional, work toward better support in xpressive
for non-char data
Index: basic_regex.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/basic_regex.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- basic_regex.hpp 17 Apr 2007 05:02:31 -0000 1.16
+++ basic_regex.hpp 24 May 2007 23:25:40 -0000 1.17
@@ -46,7 +46,7 @@
public:
typedef BidiIter iterator_type;
typedef typename iterator_value<BidiIter>::type char_type;
- typedef std::basic_string<char_type> string_type;
+ typedef typename detail::string_type<char_type>::type string_type;
typedef regex_constants::syntax_option_type flag_type;
/// \post regex_id() == 0
Index: match_results.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/match_results.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- match_results.hpp 7 May 2007 04:41:25 -0000 1.18
+++ match_results.hpp 24 May 2007 23:25:40 -0000 1.19
@@ -236,7 +236,7 @@
public:
typedef typename iterator_value<BidiIter>::type char_type;
- typedef std::basic_string<char_type> string_type;
+ typedef typename detail::string_type<char_type>::type string_type;
typedef std::size_t size_type;
typedef sub_match<BidiIter> value_type;
typedef typename iterator_difference<BidiIter>::type difference_type;
Index: regex_compiler.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_compiler.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- regex_compiler.hpp 7 May 2007 04:41:25 -0000 1.15
+++ regex_compiler.hpp 24 May 2007 23:25:40 -0000 1.16
@@ -45,11 +45,11 @@
{
typedef BidiIter iterator_type;
typedef typename iterator_value<BidiIter>::type char_type;
- typedef std::basic_string<char_type> string_type;
typedef regex_constants::syntax_option_type flag_type;
typedef RegexTraits traits_type;
- typedef typename traits_type::char_class_type char_class_type;
+ typedef typename traits_type::string_type string_type;
typedef typename traits_type::locale_type locale_type;
+ typedef typename traits_type::char_class_type char_class_type;
explicit regex_compiler(RegexTraits const &traits = RegexTraits())
: mark_count_(0)
Index: regex_primitives.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_primitives.hpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- regex_primitives.hpp 24 May 2007 20:03:26 -0000 1.32
+++ regex_primitives.hpp 24 May 2007 23:25:40 -0000 1.33
@@ -433,7 +433,7 @@
}
#else
// Re-use proto's as_expr function object as xpressive's as_xpr() function.
-proto::op::as_expr const as_xpr = {};
+proto::functional::as_expr const as_xpr = {};
#endif
///////////////////////////////////////////////////////////////////////////////
@@ -467,7 +467,7 @@
/// \brief Make a sub-expression optional. Equivalent to !as_xpr(expr).
///
/// \param expr The sub-expression to make optional.
-proto::op::make_expr<proto::tag::logical_not> const optional = {};
+proto::functional::make_expr<proto::tag::logical_not> const optional = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Repeat a sub-expression multiple times.
@@ -506,7 +506,7 @@
/// \attention keep(expr) is equivalent to the perl (?>...) extension.
///
/// \param expr The sub-expression to modify.
-proto::op::make_expr<detail::keeper_tag> const keep = {};
+proto::functional::make_expr<detail::keeper_tag> const keep = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Look-ahead assertion.
@@ -521,7 +521,7 @@
/// perl (?!...) extension.
///
/// \param expr The sub-expression to put in the look-ahead assertion.
-proto::op::make_expr<detail::lookahead_tag> const before = {};
+proto::functional::make_expr<detail::lookahead_tag> const before = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Look-behind assertion.
@@ -538,7 +538,7 @@
/// \param expr The sub-expression to put in the look-ahead assertion.
///
/// \pre expr cannot match a variable number of characters.
-proto::op::make_expr<detail::lookbehind_tag> const after = {};
+proto::functional::make_expr<detail::lookbehind_tag> const after = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Specify a regex traits or a std::locale.
Index: sub_match.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/sub_match.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sub_match.hpp 17 Apr 2007 07:23:38 -0000 1.7
+++ sub_match.hpp 24 May 2007 23:25:40 -0000 1.8
@@ -21,6 +21,7 @@
#include <iterator>
#include <algorithm>
#include <boost/iterator/iterator_traits.hpp>
+#include <boost/xpressive/detail/detail_fwd.hpp>
//{{AFX_DOC_COMMENT
///////////////////////////////////////////////////////////////////////////////
@@ -66,7 +67,7 @@
public:
typedef typename iterator_value<BidiIter>::type value_type;
typedef typename iterator_difference<BidiIter>::type difference_type;
- typedef std::basic_string<value_type> string_type;
+ typedef typename detail::string_type<value_type>::type string_type;
typedef BidiIter iterator;
explicit sub_match(BidiIter first = BidiIter(), BidiIter second =
BidiIter(), bool matched_ = false)
@@ -177,13 +178,13 @@
template<typename BidiIter>
bool operator >= (sub_match<BidiIter> const &lhs, sub_match<BidiIter> const
&rhs)
{
- return lhs.compare(rhs)>= 0;
+ return lhs.compare(rhs) >= 0;
}
template<typename BidiIter>
-bool operator> (sub_match<BidiIter> const &lhs, sub_match<BidiIter> const &rhs)
+bool operator > (sub_match<BidiIter> const &lhs, sub_match<BidiIter> const
&rhs)
{
- return lhs.compare(rhs)> 0;
+ return lhs.compare(rhs) > 0;
}
template<typename BidiIter>
@@ -205,7 +206,7 @@
}
template<typename BidiIter>
-bool operator> (typename iterator_value<BidiIter>::type const *lhs,
sub_match<BidiIter> const &rhs)
+bool operator > (typename iterator_value<BidiIter>::type const *lhs,
sub_match<BidiIter> const &rhs)
{
return lhs> rhs.str();
}
@@ -241,15 +242,15 @@
}
template<typename BidiIter>
-bool operator> (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const *rhs)
+bool operator > (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const *rhs)
{
- return lhs.str()> rhs;
+ return lhs.str() > rhs;
}
template<typename BidiIter>
bool operator >= (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const *rhs)
{
- return lhs.str()>= rhs;
+ return lhs.str() >= rhs;
}
template<typename BidiIter>
@@ -277,7 +278,7 @@
}
template<typename BidiIter>
-bool operator> (typename iterator_value<BidiIter>::type const &lhs,
sub_match<BidiIter> const &rhs)
+bool operator > (typename iterator_value<BidiIter>::type const &lhs,
sub_match<BidiIter> const &rhs)
{
return lhs> rhs.str();
}
@@ -313,15 +314,15 @@
}
template<typename BidiIter>
-bool operator> (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const &rhs)
+bool operator > (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const &rhs)
{
- return lhs.str()> rhs;
+ return lhs.str() > rhs;
}
template<typename BidiIter>
bool operator >= (sub_match<BidiIter> const &lhs, typename
iterator_value<BidiIter>::type const &rhs)
{
- return lhs.str()>= rhs;
+ return lhs.str() >= rhs;
}
template<typename BidiIter>
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
