Update of /cvsroot/boost/boost/boost/xpressive
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5561/boost/xpressive
Modified Files:
basic_regex.hpp regex_primitives.hpp xpressive_fwd.hpp
Log Message:
proto::meta namespace is dead
Index: basic_regex.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/basic_regex.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- basic_regex.hpp 18 Nov 2006 22:04:20 -0000 1.11
+++ basic_regex.hpp 3 Feb 2007 00:14:32 -0000 1.12
@@ -134,17 +134,17 @@
// for binding actions to this regex when it is nested statically in
another regex
/// INTERNAL ONLY
template<typename Action>
- typename proto::meta::right_shift
+ typename proto::right_shift
<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Action>::type
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Action>::type
>::type const
operator [](detail::action_matcher<Action> const &action) const
{
- typename proto::meta::right_shift
+ typename proto::right_shift
<
- typename proto::meta::terminal<basic_regex<BidiIter> >::type
- , typename proto::meta::terminal<Action>::type
+ typename proto::terminal<basic_regex<BidiIter> >::type
+ , typename proto::terminal<Action>::type
>::type that = {{*this}, {*static_cast<Action const *>(&action)}};
return that;
}
Index: regex_primitives.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/regex_primitives.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- regex_primitives.hpp 30 Dec 2006 06:29:55 -0000 1.20
+++ regex_primitives.hpp 3 Feb 2007 00:14:32 -0000 1.21
@@ -86,14 +86,14 @@
unsigned int const inf = UINT_MAX-1;
/// INTERNAL ONLY (for backwards compatibility)
-proto::meta::terminal<detail::epsilon_matcher>::type const epsilon = {};
+proto::terminal<detail::epsilon_matcher>::type const epsilon = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Successfully matches nothing.
///
/// Successfully matches a zero-width sequence. nil always succeeds and
/// never consumes any characters.
-proto::meta::terminal<detail::epsilon_matcher>::type const nil = {};
+proto::terminal<detail::epsilon_matcher>::type const nil = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches an alpha-numeric character.
@@ -103,7 +103,7 @@
///
/// \attention alnum is equivalent to /[[:alnum:]]/ in perl. ~alnum is
equivalent
/// to /[[:^alnum:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const alnum =
{{"alnum", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const alnum =
{{"alnum", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches an alphabetic character.
@@ -113,7 +113,7 @@
///
/// \attention alpha is equivalent to /[[:alpha:]]/ in perl. ~alpha is
equivalent
/// to /[[:^alpha:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const alpha =
{{"alpha", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const alpha =
{{"alpha", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a blank (horizonal white-space) character.
@@ -123,7 +123,7 @@
///
/// \attention blank is equivalent to /[[:blank:]]/ in perl. ~blank is
equivalent
/// to /[[:^blank:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const blank =
{{"blank", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const blank =
{{"blank", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a control character.
@@ -133,7 +133,7 @@
///
/// \attention cntrl is equivalent to /[[:cntrl:]]/ in perl. ~cntrl is
equivalent
/// to /[[:^cntrl:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const cntrl =
{{"cntrl", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const cntrl =
{{"cntrl", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a digit character.
@@ -143,7 +143,7 @@
///
/// \attention digit is equivalent to /[[:digit:]]/ in perl. ~digit is
equivalent
/// to /[[:^digit:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const digit =
{{"digit", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const digit =
{{"digit", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a graph character.
@@ -153,7 +153,7 @@
///
/// \attention graph is equivalent to /[[:graph:]]/ in perl. ~graph is
equivalent
/// to /[[:^graph:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const graph =
{{"graph", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const graph =
{{"graph", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a lower-case character.
@@ -163,7 +163,7 @@
///
/// \attention lower is equivalent to /[[:lower:]]/ in perl. ~lower is
equivalent
/// to /[[:^lower:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const lower =
{{"lower", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const lower =
{{"lower", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a printable character.
@@ -173,7 +173,7 @@
///
/// \attention print is equivalent to /[[:print:]]/ in perl. ~print is
equivalent
/// to /[[:^print:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const print =
{{"print", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const print =
{{"print", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a punctuation character.
@@ -183,7 +183,7 @@
///
/// \attention punct is equivalent to /[[:punct:]]/ in perl. ~punct is
equivalent
/// to /[[:^punct:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const punct =
{{"punct", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const punct =
{{"punct", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a space character.
@@ -193,7 +193,7 @@
///
/// \attention space is equivalent to /[[:space:]]/ in perl. ~space is
equivalent
/// to /[[:^space:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const space =
{{"space", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const space =
{{"space", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches an upper-case character.
@@ -203,7 +203,7 @@
///
/// \attention upper is equivalent to /[[:upper:]]/ in perl. ~upper is
equivalent
/// to /[[:^upper:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const upper =
{{"upper", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const upper =
{{"upper", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a hexadecimal digit character.
@@ -213,14 +213,14 @@
///
/// \attention xdigit is equivalent to /[[:xdigit:]]/ in perl. ~xdigit is
equivalent
/// to /[[:^xdigit:]]/ in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const xdigit =
{{"xdigit", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const xdigit =
{{"xdigit", false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Beginning of sequence assertion.
///
/// For the character sequence [begin, end), 'bos' matches the
/// zero-width sub-sequence [begin, begin).
-proto::meta::terminal<detail::assert_bos_matcher>::type const bos = {};
+proto::terminal<detail::assert_bos_matcher>::type const bos = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief End of sequence assertion.
@@ -231,7 +231,7 @@
/// \attention Unlike the perl end of sequence assertion \$, 'eos' will
/// not match at the position [end-1, end-1) if *(end-1) is '\\n'. To
/// get that behavior, use (!_n >> eos).
-proto::meta::terminal<detail::assert_eos_matcher>::type const eos = {};
+proto::terminal<detail::assert_eos_matcher>::type const eos = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Beginning of line assertion.
@@ -239,7 +239,7 @@
/// 'bol' matches the zero-width sub-sequence
/// immediately following a logical newline sequence. The regex traits
/// is used to determine what constitutes a logical newline sequence.
-proto::meta::terminal<detail::assert_bol_placeholder>::type const bol = {};
+proto::terminal<detail::assert_bol_placeholder>::type const bol = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief End of line assertion.
@@ -247,7 +247,7 @@
/// 'eol' matches the zero-width sub-sequence
/// immediately preceeding a logical newline sequence. The regex traits
/// is used to determine what constitutes a logical newline sequence.
-proto::meta::terminal<detail::assert_eol_placeholder>::type const eol = {};
+proto::terminal<detail::assert_eol_placeholder>::type const eol = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Beginning of word assertion.
@@ -255,7 +255,7 @@
/// 'bow' matches the zero-width sub-sequence
/// immediately following a non-word character and preceeding a word character.
/// The regex traits are used to determine what constitutes a word character.
-proto::meta::terminal<detail::assert_word_begin>::type const bow = {};
+proto::terminal<detail::assert_word_begin>::type const bow = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief End of word assertion.
@@ -263,7 +263,7 @@
/// 'eow' matches the zero-width sub-sequence
/// immediately following a word character and preceeding a non-word character.
/// The regex traits are used to determine what constitutes a word character.
-proto::meta::terminal<detail::assert_word_end>::type const eow = {};
+proto::terminal<detail::assert_word_end>::type const eow = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Word boundary assertion.
@@ -273,7 +273,7 @@
/// constitutes a word character. To match a non-word boundary, use ~_b.
///
/// \attention _b is like \\b in perl. ~_b is like \\B in perl.
-proto::meta::terminal<detail::assert_word_boundary>::type const _b = {};
+proto::terminal<detail::assert_word_boundary>::type const _b = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a word character.
@@ -283,7 +283,7 @@
/// character.
///
/// \attention _w is like \\w in perl. ~_w is like \\W in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const _w =
{{"w", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const _w = {{"w",
false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a digit character.
@@ -293,7 +293,7 @@
/// character.
///
/// \attention _d is like \\d in perl. ~_d is like \\D in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const _d =
{{"d", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const _d = {{"d",
false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a space character.
@@ -303,7 +303,7 @@
/// character.
///
/// \attention _s is like \\s in perl. ~_s is like \\S in perl.
-proto::meta::terminal<detail::posix_charset_placeholder>::type const _s =
{{"s", false}};
+proto::terminal<detail::posix_charset_placeholder>::type const _s = {{"s",
false}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a literal newline character, '\\n'.
@@ -312,7 +312,7 @@
/// that is not a newline.
///
/// \attention ~_n is like '.' in perl without the /s modifier.
-proto::meta::terminal<detail::literal_placeholder<char> >::type const _n =
{{'\n'}};
+proto::terminal<detail::literal_placeholder<char> >::type const _n = {{'\n'}};
///////////////////////////////////////////////////////////////////////////////
/// \brief Matches a logical newline sequence.
@@ -330,7 +330,7 @@
/// '_' matches any one character, including the newline.
///
/// \attention To match any character except the newline, use ~_n
-proto::meta::terminal<detail::any_matcher>::type const _ = {};
+proto::terminal<detail::any_matcher>::type const _ = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Reference to the current regex object
@@ -339,7 +339,7 @@
/// identifier is a short-hand for the current regex object. For instance,
/// sregex rx = '(' >> (self | nil) >> ')'; will create a regex object that
/// matches balanced parens such as "((()))".
-proto::meta::terminal<detail::self_placeholder>::type const self = {};
+proto::terminal<detail::self_placeholder>::type const self = {};
///////////////////////////////////////////////////////////////////////////////
/// \brief Used to create character sets.
@@ -415,7 +415,7 @@
/// "foo" >> icase(set['b'] >> "ar") will match "foo" exactly followed by
/// "bar" irrespective of case.
template<typename Expr>
-inline typename proto::meta::binary_expr<
+inline typename proto::binary_expr<
modifier_tag
, detail::icase_modifier
, typename detail::as_xpr_type<Expr>::type
@@ -423,7 +423,7 @@
icase(Expr const &expr)
{
detail::icase_modifier mod;
- typename proto::meta::binary_expr<
+ typename proto::binary_expr<
modifier_tag
, detail::icase_modifier
, typename detail::as_xpr_type<Expr>::type
@@ -437,7 +437,7 @@
///
/// \param rex The basic_regex object to embed by reference.
template<typename BidiIter>
-inline typename proto::meta::terminal<detail::regex_placeholder<BidiIter,
mpl::true_> >::type const
+inline typename proto::terminal<detail::regex_placeholder<BidiIter,
mpl::true_> >::type const
by_ref(basic_regex<BidiIter> const &rex)
{
typedef detail::core_access<BidiIter> access;
@@ -453,10 +453,10 @@
/// \param ch_min The lower end of the range to match.
/// \param ch_max The upper end of the range to match.
template<typename Char>
-inline typename proto::meta::terminal<detail::range_placeholder<Char> >::type
const
+inline typename proto::terminal<detail::range_placeholder<Char> >::type const
range(Char ch_min, Char ch_max)
{
- typename proto::meta::terminal<detail::range_placeholder<Char> >::type
that = {{ch_min, ch_max, false}};
+ typename proto::terminal<detail::range_placeholder<Char> >::type that =
{{ch_min, ch_max, false}};
return that;
}
@@ -465,12 +465,12 @@
///
/// \param expr The sub-expression to make optional.
template<typename Expr>
-inline typename proto::meta::logical_not<
+inline typename proto::logical_not<
typename detail::as_xpr_type<Expr>::type
>::type const
optional(Expr const &expr)
{
- typename proto::meta::logical_not<
+ typename proto::logical_not<
typename detail::as_xpr_type<Expr>::type
>::type that = {as_xpr(expr)};
return that;
@@ -488,14 +488,14 @@
///
/// \param expr The sub-expression to repeat.
template<unsigned int Min, unsigned int Max, typename Expr>
-inline typename proto::meta::unary_expr
+inline typename proto::unary_expr
<
detail::generic_quant_tag<Min, Max>
, typename detail::as_xpr_type<Expr>::type
>::type const
repeat(Expr const &expr)
{
- typename proto::meta::unary_expr
+ typename proto::unary_expr
<
detail::generic_quant_tag<Min, Max>
, typename detail::as_xpr_type<Expr>::type
@@ -506,14 +506,14 @@
/// \overload
///
template<unsigned int Count, typename Xpr2>
-inline typename proto::meta::unary_expr
+inline typename proto::unary_expr
<
detail::generic_quant_tag<Count, Count>
, typename detail::as_xpr_type<Xpr2>::type
>::type const
repeat(Xpr2 const &expr)
{
- typename proto::meta::unary_expr
+ typename proto::unary_expr
<
detail::generic_quant_tag<Count, Count>
, typename detail::as_xpr_type<Xpr2>::type
@@ -532,14 +532,14 @@
///
/// \param expr The sub-expression to modify.
template<typename Expr>
-inline typename proto::meta::unary_expr
+inline typename proto::unary_expr
<
detail::keeper_tag
, typename detail::as_xpr_type<Expr>::type
>::type const
keep(Expr const &expr)
{
- typename proto::meta::unary_expr
+ typename proto::unary_expr
<
detail::keeper_tag
, typename detail::as_xpr_type<Expr>::type
@@ -561,14 +561,14 @@
///
/// \param expr The sub-expression to put in the look-ahead assertion.
template<typename Expr>
-inline typename proto::meta::unary_expr
+inline typename proto::unary_expr
<
detail::lookahead_tag<true>
, typename detail::as_xpr_type<Expr>::type
>::type const
before(Expr const &expr)
{
- typename proto::meta::unary_expr
+ typename proto::unary_expr
<
detail::lookahead_tag<true>
, typename detail::as_xpr_type<Expr>::type
@@ -592,14 +592,14 @@
///
/// \pre expr cannot match a variable number of characters.
template<typename Expr>
-inline typename proto::meta::unary_expr
+inline typename proto::unary_expr
<
detail::lookbehind_tag<true>
, typename detail::as_xpr_type<Expr>::type
>::type const
after(Expr const &expr)
{
- typename proto::meta::unary_expr
+ typename proto::unary_expr
<
detail::lookbehind_tag<true>
, typename detail::as_xpr_type<Expr>::type
@@ -647,7 +647,7 @@
{
private:
struct some_valid_expression
- : proto::extends<typename proto::meta::terminal<Char>::type,
some_valid_expression>
+ : proto::extends<typename proto::terminal<Char>::type,
some_valid_expression>
{
template<typename Xpr>
some_valid_expression(Xpr const &);
Index: xpressive_fwd.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/xpressive_fwd.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- xpressive_fwd.hpp 7 Nov 2006 05:03:51 -0000 1.11
+++ xpressive_fwd.hpp 3 Feb 2007 00:14:32 -0000 1.12
@@ -65,7 +65,7 @@
};
struct mark_placeholder;
- typedef proto::meta::terminal<mark_placeholder>::type basic_mark_tag;
+ typedef proto::terminal<mark_placeholder>::type basic_mark_tag;
struct mark_tag;
} // namespace detail
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
