Update of /cvsroot/boost/boost/libs/xpressive/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5021/libs/xpressive/doc
Modified Files:
concepts.qbk grammars.qbk matching.qbk preface.qbk
tips_n_tricks.qbk tokenization.qbk traits.qbk xpressive.qbk
Log Message:
move applyN and always transforms into the apply.hpp header
Index: concepts.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/concepts.qbk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- concepts.qbk 5 Mar 2007 21:54:01 -0000 1.2
+++ concepts.qbk 23 Jun 2007 17:12:49 -0000 1.3
@@ -80,12 +80,12 @@
]
[h2 Traits Requirements]
-In the following table `X` denotes a traits class defining types and functions
-for the character container type `CharT`; `u` is an object of type `X`; `v` is
an
-object of type `const X`; `p` is a value of type `const CharT*`; `I1` and `I2`
are
-`Input Iterators`; `c` is a value of type `const CharT`; `s` is an object of
type
-`X::string_type`; `cs` is an object of type `const X::string_type`; `b` is a
value of
-type `bool`; `i` is a value of type `int`; `F1` and `F2` are values of type
`const CharT*`;
+In the following table `X` denotes a traits class defining types and functions
+for the character container type `CharT`; `u` is an object of type `X`; `v` is
an
+object of type `const X`; `p` is a value of type `const CharT*`; `I1` and `I2`
are
+`Input Iterators`; `c` is a value of type `const CharT`; `s` is an object of
type
+`X::string_type`; `cs` is an object of type `const X::string_type`; `b` is a
value of
+type `bool`; `i` is a value of type `int`; `F1` and `F2` are values of type
`const CharT*`;
`loc` is an object of type `X::locale_type`; and `ch` is an object of `const
char`.
[table Traits Requirements
@@ -120,7 +120,7 @@
`std::basic_string<CharT>` or `std::vector<CharT>`
]
[
-
+
]
]
[
@@ -142,7 +142,7 @@
['Implementation defined]
]
[
- A bitmask type representing a particular character classification.
Multiple
+ A bitmask type representing a particular character classification.
Multiple
values of this type can be bitwise-or'ed together to obtain a
new valid value.
]
]
@@ -201,7 +201,7 @@
`X::char_type`
]
[
- Returns a character such that for any character `d` that is to be
considered
+ Returns a character such that for any character `d` that is to be
considered
equivalent to `c` then `v.translate(c) == v.translate(d)`.
]
]
@@ -213,8 +213,8 @@
`X::char_type`
]
[
- For all characters `C` that are to be considered
- equivalent to `c` when comparisons are to be performed without
regard to case,
+ For all characters `C` that are to be considered
+ equivalent to `c` when comparisons are to be performed without
regard to case,
then `v.translate_nocase(c) == v.translate_nocase(C)`.
]
]
@@ -226,9 +226,9 @@
`X::string_type`
]
[
- Returns a sort key for the character sequence designated by the
iterator range
- `[F1, F2)` such that if the character sequence `[G1, G2)`
sorts before the
- character sequence `[H1, H2)` then `v.transform(G1, G2) <
v.transform(H1, H2)`.
+ Returns a sort key for the character sequence designated by the
iterator range
+ `[F1, F2)` such that if the character sequence `[G1, G2)`
sorts before the
+ character sequence `[H1, H2)` then `v.transform(G1, G2) <
v.transform(H1, H2)`.
]
]
[
@@ -239,9 +239,9 @@
`X::string_type`
]
[
- Returns a sort key for the character sequence designated by the
iterator range
- `[F1, F2)` such that if the character sequence `[G1, G2)`
sorts before the
- character sequence `[H1, H2)` when character case is not
considered then
+ Returns a sort key for the character sequence designated by the
iterator range
+ `[F1, F2)` such that if the character sequence `[G1, G2)`
sorts before the
+ character sequence `[H1, H2)` when character case is not
considered then
`v.transform_primary(G1, G2) < v.transform_primary(H1, H2)`.
]
]
@@ -253,11 +253,11 @@
`X::char_class_type`
]
[
- Converts the character sequence designated by the iterator range
`[F1,F2)` into a
- bitmask type that can subsequently be passed to `isctype`.
Values returned from
- `lookup_classname` can be safely bitwise or'ed together.
Returns `0` if the
- character sequence is not the name of a character class
recognized by `X`. The
- value returned shall be independent of the case of the
characters in the
+ Converts the character sequence designated by the iterator range
`[F1,F2)` into a
+ bitmask type that can subsequently be passed to `isctype`.
Values returned from
+ `lookup_classname` can be safely bitwise or'ed together.
Returns `0` if the
+ character sequence is not the name of a character class
recognized by `X`. The
+ value returned shall be independent of the case of the
characters in the
sequence.
]
]
@@ -269,9 +269,9 @@
`X::string_type`
]
[
- Returns a sequence of characters that represents the collating
element
- consisting of the character sequence designated by the
iterator range `[F1, F2)`.
- Returns an empty string if the character sequence is not a
valid collating
+ Returns a sequence of characters that represents the collating
element
+ consisting of the character sequence designated by the
iterator range `[F1, F2)`.
+ Returns an empty string if the character sequence is not a
valid collating
element.
]
]
@@ -283,7 +283,7 @@
`bool`
]
[
- Returns `true` if character `c` is a member of the character class
designated by
+ Returns `true` if character `c` is a member of the character class
designated by
the iterator range `[F1, F2)`, `false` otherwise.
]
]
@@ -295,7 +295,7 @@
`int`
]
[
- Returns the value represented by the digit `c` in base `i` if the
character `c` is a
+ Returns the value represented by the digit `c` in base `i` if the
character `c` is a
valid digit in base `i`; otherwise returns `-1`.\n
\[Note: the value of `i` will only be `8`, `10`, or `16`. -end
note\]
]
@@ -308,8 +308,8 @@
`X::locale_type`
]
[
- Imbues `u` with the locale `loc`, returns the previous
- locale used by `u`.
+ Imbues `u` with the locale `loc`, returns the previous
+ locale used by `u`.
]
]
[
@@ -320,7 +320,7 @@
`X::locale_type`
]
[
- Returns the current locale used by `v`.
+ Returns the current locale used by `v`.
]
]
]
Index: grammars.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/grammars.qbk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- grammars.qbk 5 Mar 2007 21:54:01 -0000 1.4
+++ grammars.qbk 23 Jun 2007 17:12:49 -0000 1.5
@@ -130,7 +130,7 @@
_regex_compiler_ instance keeps a mapping from names to regexes that have been
created
with it.
-You can create a named dynamic regex by prefacing your regex with
`"(?$name=)"`, where
+You can create a named dynamic regex by prefacing your regex with
`"(?$name=)"`, where
/name/ is the name of the regex. You can refer to a named regex from another
regex with
`"(?$name)"`. The named regex does not need to exist yet at the time it is
referenced
in another regex, but it must exist by the time you use the regex.
@@ -163,8 +163,8 @@
}
As with static regex grammars, nested regex invocations create nested
-match results (see /Nested Results/ below). The result is a complete parse
tree
-for string that matched. Unlike static regexes, dynamic regexes are always
+match results (see /Nested Results/ below). The result is a complete parse tree
+for string that matched. Unlike static regexes, dynamic regexes are always
embedded by reference, not by value.
[h2 Cyclic Patterns, Copying and Memory Management, Oh My!]
@@ -261,7 +261,7 @@
sregex name = +alpha;
sregex integer = +_d;
- sregex re = *( *_s >> ( name | integer ) );
+ sregex re = *( *_s >> ( name | integer ) );
smatch what;
std::string str( "marsha 123 jan 456 cindy 789" );
Index: matching.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/matching.qbk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- matching.qbk 5 Mar 2007 21:54:01 -0000 1.4
+++ matching.qbk 23 Jun 2007 17:12:49 -0000 1.5
@@ -34,14 +34,14 @@
{ /*...*/ }
if( regex_match( std::string("hello"), sre ) ) // OK
- { /*...*/ }
+ { /*...*/ }
if( regex_match( "hello", sre ) ) // ERROR! iterator
mis-match!
{ /*...*/ }
The _regex_match_ algorithm optionally accepts a _match_results_ struct as an
out parameter. If given, the _regex_match_
algorithm fills in the _match_results_ struct with information about which
parts of the regex matched which
-parts of the input.
+parts of the input.
cmatch what;
cregex cre = +(s1= _w);
@@ -78,7 +78,7 @@
In all other regards, _regex_search_ behaves like _regex_match_ ['(see
above)]. In particular, it can operate on `std::string`,
C-style null-terminated strings or iterator ranges. The same care must be
taken to ensure that the iterator
type of your regex matches the iterator type of your input sequence. As with
_regex_match_, you can optionally
-provide a _match_results_ struct to receive the results of the search, and a
_match_flag_type_ bitmask to
+provide a _match_results_ struct to receive the results of the search, and a
_match_flag_type_ bitmask to
control how the match is evaluated.
Click [link
boost_xpressive.user_s_guide.examples.see_if_a_string_contains_a_sub_string_that_matches_a_regex
here] to see a complete
Index: preface.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/preface.qbk,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- preface.qbk 5 Mar 2007 21:54:01 -0000 1.5
+++ preface.qbk 23 Jun 2007 17:12:49 -0000 1.6
@@ -41,7 +41,7 @@
_regexpp_, representing regular expressions as strings. Or you can use it as
you would use _spirit_,
writing your regexes as C++ expressions, enjoying all the benefits of an
embedded language
dedicated to text manipulation. What's more, you can mix the two to get the
benefits of
-both, writing regular expression ['grammars] in which some of the regular
expressions are
+both, writing regular expression ['grammars] in which some of the regular
expressions are
statically bound -- hard-coded and syntax\-checked by the compiler \-- and
others are dynamically
bound and specified at runtime. These regular expressions can refer to each
other recursively,
matching patterns in strings that ordinary regular expressions cannot.
Index: tips_n_tricks.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/tips_n_tricks.qbk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tips_n_tricks.qbk 5 Mar 2007 21:54:01 -0000 1.2
+++ tips_n_tricks.qbk 23 Jun 2007 17:12:49 -0000 1.3
@@ -46,8 +46,8 @@
[h2 Compile Patterns Once And Reuse Them]
-Compiling a regex (dynamic or static) is more expensive than executing a
-match or search. If you have the option, prefer to compile a pattern into
+Compiling a regex (dynamic or static) is more expensive than executing a
+match or search. If you have the option, prefer to compile a pattern into
a _basic_regex_ object once and reuse it rather than recreating it over
and over.
Index: tokenization.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/tokenization.qbk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tokenization.qbk 5 Mar 2007 21:54:01 -0000 1.2
+++ tokenization.qbk 23 Jun 2007 17:12:49 -0000 1.3
@@ -49,7 +49,7 @@
[h2 Example 2: Simple Tokenization, Reloaded]
This example also uses _regex_token_iterator_ to chop a sequence into a series
of tokens consisting of words,
-but it uses the regex as a delimiter. When we pass a `-1` as the last
parameter to the _regex_token_iterator_
+but it uses the regex as a delimiter. When we pass a `-1` as the last
parameter to the _regex_token_iterator_
constructor, it instructs the token iterator to consider as tokens those parts
of the input that ['didn't]
match the regex.
@@ -132,6 +132,6 @@
The `sub_matches` array instructs the _regex_token_iterator_ to first take the
value of the 2nd sub-match, then
the 1st sub-match, and finally the 3rd. Incrementing the iterator again
instructs it to use _regex_search_ again
to find the next match. At that point, the process repeats -- the token
iterator takes the value of the 2nd
-sub-match, then the 1st, et cetera.
+sub-match, then the 1st, et cetera.
[endsect]
Index: traits.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/traits.qbk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- traits.qbk 5 Mar 2007 21:54:01 -0000 1.3
+++ traits.qbk 23 Jun 2007 17:12:49 -0000 1.4
@@ -68,7 +68,7 @@
You can search for patterns in raw bytes, integers, or anything that conforms
to the
[link boost_xpressive.user_s_guide.concepts.chart_requirements Char Concept].
The `null_regex_traits<>` makes it simple. It is a
stub implementation of the [link
boost_xpressive.user_s_guide.concepts.traits_requirements Regex Traits
Concept]. It recognizes
-no character classes and does no case-sensitive mappings.
+no character classes and does no case-sensitive mappings.
For example, with `null_regex_traits<>`, you can write a static regex to find
a pattern in a
sequence of integers as follows:
Index: xpressive.qbk
===================================================================
RCS file: /cvsroot/boost/boost/libs/xpressive/doc/xpressive.qbk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xpressive.qbk 2 May 2007 07:35:01 -0000 1.7
+++ xpressive.qbk 23 Jun 2007 17:12:49 -0000 1.8
@@ -12,7 +12,7 @@
[category string-text]
[id xpressive]
[dirname xpressive]
- [purpose
+ [purpose
Regular expressions that can be written as strings or as expression
templates,
and that can refer to each other and themselves recursively with the
power of
context-free grammars
-------------------------------------------------------------------------
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
