|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r57390 - trunk/libs/spirit/doc/qi
From: joel_at_[hidden]
Date: 2009-11-04 18:35:09
Author: djowel
Date: 2009-11-04 18:35:09 EST (Wed, 04 Nov 2009)
New Revision: 57390
URL: http://svn.boost.org/trac/boost/changeset/57390
Log:
Patches froPatches from Chris Hoeppler
Text files modified:
trunk/libs/spirit/doc/qi/operator.qbk | 21 +++++++++++----------
trunk/libs/spirit/doc/qi/roman.qbk | 1 -
trunk/libs/spirit/doc/qi/stream.qbk | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
Modified: trunk/libs/spirit/doc/qi/operator.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/operator.qbk (original)
+++ trunk/libs/spirit/doc/qi/operator.qbk 2009-11-04 18:35:09 EST (Wed, 04 Nov 2009)
@@ -20,9 +20,9 @@
This module includes different parsers which get instantiated if one of
the overloaded operators is used with more primitive parser constructs.
It includes Alternative (`|`), And predicate (unary `&`), Difference
-(`-`), Expect (`>`), Kleene star (unary `*`), Lists (unary `%`), Not
-predicate (unary `!`), Optional (`-`), Permutation (`^`), Plus (unary
-`+`), Sequence (`>>`) and Sequential-Or (`||`).
+(`-`), Expect (`>`), Kleene star (unary `*`), Lists (`%`), Not
+predicate (`!`), Optional (unary `-`), Permutation (`^`), Plus (unary
+`+`), Sequence (`>>`), and Sequential-Or (`||`).
[heading Module Header]
@@ -266,7 +266,7 @@
[variablelist Notation
[[`a`, `b`] [A __parser_concept__]]
- [[`Iter`] [a __fwditer__ type.]]
+ [[`Iter`] [A __fwditer__ type]]
]
[heading Expectation Failure]
@@ -433,7 +433,7 @@
[table
[[Expression] [Attribute]]
- [[`a - b`]
+ [[`a % b`]
[``a: A, b: B --> (a % b): vector<A>
a: Unused, b: B --> (a % b): Unused``]]
]
@@ -612,7 +612,8 @@
[table
[[Expression] [Semantics]]
[[`a ^ b`] [Match `a` or `b` in any order. Each operand
- may match zero or one time.]]
+ may match zero or one time as long as at least
+ one operand matches.]]
]
[heading Attributes]
@@ -712,7 +713,7 @@
[heading Description]
-The sequence operator, `a >> b`, which parses two or more operands (`a`,
+The sequence operator, `a >> b`, parses two or more operands (`a`,
`b`, ... etc.), in sequence:
a >> b >> ...
@@ -784,9 +785,9 @@
[heading Description]
-The sequential-or operator, `a || b`, where the expression `a || b`
-reads as match `a` or `b` and in sequence. That is, if both `a` and `b`
-match, it must be in sequence; this is equivalent to `a >> -b | b`:
+The sequential-or operator, `a || b`, matches `a` or `b` or `a` followed
+by `b`. That is, if both `a` and `b` match, it must be in sequence; this
+is equivalent to `a >> -b | b`:
a || b || ...
Modified: trunk/libs/spirit/doc/qi/roman.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/roman.qbk (original)
+++ trunk/libs/spirit/doc/qi/roman.qbk 2009-11-04 18:35:09 EST (Wed, 04 Nov 2009)
@@ -24,7 +24,6 @@
Traditionally, symbol table management is maintained seperately outside the BNF
grammar through semantic actions. Contrary to standard practice, the Spirit
-symbol table class symbols is-a parser. An object of which may be used
symbol table class `symbols` is a parser, an object of which may be used
anywhere in the EBNF grammar specification. It is an example of a dynamic
parser. A dynamic parser is characterized by its ability to modify its behavior
Modified: trunk/libs/spirit/doc/qi/stream.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/stream.qbk (original)
+++ trunk/libs/spirit/doc/qi/stream.qbk 2009-11-04 18:35:09 EST (Wed, 04 Nov 2009)
@@ -83,16 +83,16 @@
[table
[[Expression] [Description]]
[[`stream`] [Call the streaming `operator>>()` for the type
- of the mandory attribute. The input recognized
+ of the mandatory attribute. The input recognized
by this operator will be the result of the
`stream` parser. This parser never fails
(unless the underlying input stream reports an
error). The character type of the I/O istream
is assumed to be `char`.]]
[[`wstream`] [Call the streaming `operator>>()` for the type
- of the mandory attribute. The input recognized
+ of the mandatory attribute. The input recognized
by this operator will be the result of the
- `stream` parser. This parser never fails
+ `wstream` parser. This parser never fails
(unless the underlying input stream reports an
error). The character type of the I/O istream
is assumed to be `wchar_t`.]]
@@ -155,7 +155,7 @@
[important The attribute type `spirit::hold_any` exposed by some of the stream
parsers is semantically and syntactically equivalent to
the type implemented by __boost_any__. It has been added to /Spirit/
- as it has better a performance and a smaller footprint if compared to
+ as it has better performance and a smaller footprint than
__boost_any__.
]
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