Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12679
Modified Files:
regex_actions.hpp regex_primitives.hpp
Log Message:
rename check() to validate() and if_() to check()
Index: regex_actions.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_actions.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- regex_actions.hpp 24 Mar 2007 21:50:23 -0000 1.7
+++ regex_actions.hpp 27 Mar 2007 05:05:26 -0000 1.8
@@ -20,6 +20,7 @@
#include <boost/xpressive/detail/core/state.hpp>
#include <boost/xpressive/detail/core/matcher/action_matcher.hpp>
#include <boost/xpressive/detail/core/matcher/predicate_matcher.hpp>
+#include <boost/xpressive/detail/utility/ignore_unused.hpp>
namespace boost { namespace xpressive
{
@@ -328,7 +329,7 @@
template<typename Predicate>
typename proto::terminal<detail::predicate_placeholder<Predicate> >::type
- if_(Predicate const &pred)
+ check(Predicate const &pred)
{
detail::predicate_placeholder<Predicate> p = {pred};
return proto::as_expr(p);
@@ -406,6 +407,27 @@
return that;
}
+ namespace detail
+ {
+ inline void ignore_unused_regex_actions()
+ {
+ ignore_unused(repeat_max);
+ ignore_unused(push);
+ ignore_unused(push_back);
+ ignore_unused(push_front);
+ ignore_unused(pop);
+ ignore_unused(pop_back);
+ ignore_unused(pop_front);
+ ignore_unused(top);
+ ignore_unused(back);
+ ignore_unused(front);
+ ignore_unused(first);
+ ignore_unused(second);
+ ignore_unused(length);
+ ignore_unused(str);
+ }
+ }
+
}}
#endif // BOOST_XPRESSIVE_ACTIONS_HPP_EAN_03_22_2007
Index: regex_primitives.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_primitives.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- regex_primitives.hpp 22 Mar 2007 17:37:16 -0000 1.26
+++ regex_primitives.hpp 27 Mar 2007 05:05:26 -0000 1.27
@@ -639,18 +639,18 @@
///////////////////////////////////////////////////////////////////////////////
/// \brief For checking if an expression matches xpressive's grammar
///
-/// checker\<\> can be used to see if a given expression is a valid
+/// validator\<\> can be used to see if a given expression is a valid
/// xpressive regular expression. If it is, it will simply return it.
/// If it isn't, it will cause a simple and short compile-time error.
/// You may use it as follows:
-/// checker\<char\> check;
-/// sregex rx = check( _ << "oops" );
+/// validator\<char\> validate;
+/// sregex rx = validate( _ << "oops" );
///
-/// See also xpressive::check and xpressive::wcheck.
+/// See also xpressive::validate and xpressive::wvalidate.
///
/// \param Char The character type of the regular expression.
template<typename Char>
-struct checker
+struct validator
{
private:
struct some_valid_expression
@@ -688,22 +688,22 @@
///////////////////////////////////////////////////////////////////////////////
/// \brief For checking if an expression matches xpressive's grammar
///
-/// check() can be used to see if a given expression is a valid narrow
+/// validate() can be used to see if a given expression is a valid narrow
/// xpressive regular expression. If it is, it will simply return it.
/// If it isn't, it will cause a simple and short compile-time error.
/// You may use it as follows:
-/// sregex rx = check( _ << "oops" );
-checker<char> const check = {};
+/// sregex rx = validate( _ << "oops" );
+validator<char> const validate = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief For checking if an expression matches xpressive's grammar
///
-/// wcheck() can be used to see if a given expression is a valid wide
+/// wvalidate() can be used to see if a given expression is a valid wide
/// xpressive regular expression. If it is, it will simply return it.
/// If it isn't, it will cause a simple and short compile-time error.
/// You may use it as follows:
-/// wsregex rx = wcheck( _ << L"oops" );
-checker<wchar_t> const wcheck = {};
+/// wsregex rx = wvalidate( _ << L"oops" );
+validator<wchar_t> const wvalidate = {};
namespace detail
{
@@ -739,8 +739,8 @@
ignore_unused(s7);
ignore_unused(s8);
ignore_unused(s9);
- ignore_unused(check);
- ignore_unused(wcheck);
+ ignore_unused(validate);
+ ignore_unused(wvalidate);
}
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
