Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r59721 - trunk/libs/spirit/doc/qi
From: joel_at_[hidden]
Date: 2010-02-16 21:53:32


Author: djowel
Date: 2010-02-16 21:53:31 EST (Tue, 16 Feb 2010)
New Revision: 59721
URL: http://svn.boost.org/trac/boost/changeset/59721

Log:
Doc updates. Clarified the logical meaning of 'lexeme'.
Text files modified:
   trunk/libs/spirit/doc/qi/directive.qbk | 26 +++++++++++++-------------
   trunk/libs/spirit/doc/qi/quick_reference.qbk | 2 +-
   2 files changed, 14 insertions(+), 14 deletions(-)

Modified: trunk/libs/spirit/doc/qi/directive.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/directive.qbk (original)
+++ trunk/libs/spirit/doc/qi/directive.qbk 2010-02-16 21:53:31 EST (Tue, 16 Feb 2010)
@@ -80,7 +80,7 @@
 
 [table
     [[Expression] [Semantics]]
- [[`lexeme[a]`] [Turns off white space skipping for the
+ [[`lexeme[a]`] [Pre-skip and turn off white space skipping for the
                         subject parser, `a` (and all its children).]]
 ]
 
@@ -119,9 +119,9 @@
 
 [heading Description]
 
-The `no_skip[]` directive turns off white space skipping. The difference to
+The `no_skip[]` directive turns off white space skipping. The difference to
 __qi_lexeme__ is that it does not do pre-skipping in any case. Otherwise it is
-completely equivalent to the __qi_lexeme__ directive.
+completely equivalent to the __qi_lexeme__ directive.
 
 [heading Header]
 
@@ -152,8 +152,8 @@
 
 [table
     [[Expression] [Semantics]]
- [[`no_skip[a]`] [Turns off white space skipping for the
- subject parser, `a` (and all its children). This
+ [[`no_skip[a]`] [Turns off white space skipping for the
+ subject parser, `a` (and all its children). This
                          directive does not pre-skips.]]
 ]
 
@@ -163,7 +163,7 @@
 
 [table
     [[Expression] [Attribute]]
- [[`no_skip[a]`]
+ [[`no_skip[a]`]
 [``a: A --> no_skip[a]: A
 a: Unused --> no_skip[a]: Unused``]]
 ]
@@ -582,10 +582,10 @@
 
 [heading Description]
 
-The `skip` directive is the inverse of __qi_lexeme__. While the
-__qi_lexeme__ directive turns off white space skipping, the `skip`
-directive turns it on again. This is simply done by wrapping the parts
-inside the `skip` directive:
+The `skip` directive is the inverse of __qi_lexeme__ or [qi_no_skip
+`no_skip`]. While the __qi_lexeme__ directive turns off white space
+skipping, the `skip` directive turns it on again. This is simply done by
+wrapping the parts inside the `skip` directive:
 
     skip[a]
 
@@ -629,7 +629,7 @@
 [table
     [[Expression] [Semantics]]
 
- [[`skip[a]`] [Re-establish the skipper that got inhibited by lexeme]]
+ [[`skip[a]`] [Re-establish the skipper that got inhibited by lexeme or no_skip]]
     [[`skip(p)[a]`] [Use `p` as a skipper for parsing `a`]]
 ]
 
@@ -641,10 +641,10 @@
     [[Expression] [Attribute]]
     [[`skip[a]`]
 [``a: A --> skip[a]: A
-a: Unused --> lexeme[a]: Unused``]]
+a: Unused --> skip[a]: Unused``]]
     [[`skip(p)[a]`]
 [``a: A --> skip(p)[a]: A
-a: Unused --> lexeme[a]: Unused``]]
+a: Unused --> skip(p)[a]: Unused``]]
 ]
 
 [heading Complexity]

Modified: trunk/libs/spirit/doc/qi/quick_reference.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/quick_reference.qbk (original)
+++ trunk/libs/spirit/doc/qi/quick_reference.qbk 2010-02-16 21:53:31 EST (Tue, 16 Feb 2010)
@@ -201,7 +201,7 @@
     [[[qi_repeat `repeat(N, M)[a]`]] [`vector<A>`] [Repeat `a` `N` to `M` times]]
     [[[qi_repeat `repeat(N, inf)[a]`]] [`vector<A>`] [Repeat `a` `N` or more times]]
 
- [[__qi_skip__`[a]`] [`A`] [Re-establish the skipper that got inhibited by lexeme]]
+ [[__qi_skip__`[a]`] [`A`] [Re-establish the skipper that got inhibited by lexeme or no_skip.]]
     [[__qi_skip__`(p)[a]`] [`A`] [Use `p` as a skipper for parsing `a`]]
 ]
 


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