Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r53964 - in trunk/libs/spirit/doc: abstracts html html/spirit html/spirit/abstracts html/spirit/lex html/spirit/lex/abstracts html/spirit/lex/reference html/spirit/lex/tutorials html/spirit/qi html/spirit/qi/quick_reference
From: joel_at_[hidden]
Date: 2009-06-15 23:59:02

Next message: christian.schladetsch_at_[hidden]: "[Boost-commit] svn:boost r53965 - sandbox/monotonic/boost/monotonic"
Previous message: christian.schladetsch_at_[hidden]: "[Boost-commit] svn:boost r53963 - sandbox/monotonic/boost/monotonic"

Author: djowel
Date: 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
New Revision: 53964
URL: http://svn.boost.org/trac/boost/changeset/53964

Log:
Doc updates
Text files modified:
   trunk/libs/spirit/doc/abstracts/syntax_diagram.qbk | 45 ++++++++
   trunk/libs/spirit/doc/html/index.html | 29 ++--
   trunk/libs/spirit/doc/html/spirit/abstracts.html | 99 +++++++++++++++++-
   trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html | 10
   trunk/libs/spirit/doc/html/spirit/acknowledgments.html | 2
   trunk/libs/spirit/doc/html/spirit/faq.html | 2
   trunk/libs/spirit/doc/html/spirit/introduction.html | 8
   trunk/libs/spirit/doc/html/spirit/karma.html | 6
   trunk/libs/spirit/doc/html/spirit/lex.html | 8
   trunk/libs/spirit/doc/html/spirit/lex/abstracts.html | 6
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html | 6
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html | 4
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html | 213 ++++++++++++++++++++++++++++++++++++++-
   trunk/libs/spirit/doc/html/spirit/lex/reference.html | 6
   trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html | 8
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html | 16 +-
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html | 165 ++++++++++++++++++++++++++----
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html | 43 ++++---
   trunk/libs/spirit/doc/html/spirit/qi.html | 68 ++++++------
   trunk/libs/spirit/doc/html/spirit/qi/quick_reference.html | 4
   trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html | 2
   trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html | 2
   trunk/libs/spirit/doc/html/spirit/what_s_new.html | 8
   23 files changed, 602 insertions(+), 158 deletions(-)

Modified: trunk/libs/spirit/doc/abstracts/syntax_diagram.qbk
==============================================================================
--- trunk/libs/spirit/doc/abstracts/syntax_diagram.qbk (original)
+++ trunk/libs/spirit/doc/abstracts/syntax_diagram.qbk 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -13,6 +13,11 @@
[def __sd_sequence__ [$../images/sequence.png]]
[def __sd_choice__ [$../images/alternative.png]]
[def __sd_optional__ [$../images/optional.png]]
+[def __sd_plus__ [$../images/plus.png]]
+[def __sd_kleene__ [$../images/kleene.png]]
+[def __sd_predicate__ [$../images/predicate.png]]
+[def __sd_and_predicate__ [$../images/and_predicate.png]]
+[def __sd_not_predicate__ [$../images/not_predicate.png]]

In the following section, we will deal with Parsing Expression Grammars
(PEG), a variant of Extended Backus-Naur Form (EBNF) with a different
@@ -24,7 +29,7 @@
charts. Also, the one to one mapping between the diagrams and functions
make it ideal for representing __rd__ parsers.

-[heading Elements of a Syntax Diagram]
+[heading Elements]

All diagrams have one entry and exit point. Arrows connect all possible
paths through the grammar from the entry point to the exit point.
@@ -43,6 +48,8 @@

[:__sd_non_terminals__]

+[heading Constructs]
+
The most basic composition is the Sequence. B follows A:

[:__sd_sequence__]
@@ -58,6 +65,42 @@

[:__sd_optional__]

+Now, the loops. We have the zero-or-more and one-or-more:
+
+[:__sd_kleene__]
+[:__sd_plus__]
+
+Take note that, as in PEG, these behave greedily. If there is another
+'A' just before the end-point, it will always fail because the preceding
+loop has already exhausted all the 'A's and there is nothing more to
+get. This is a crucial difference between PEG and general Context Free
+Grammars (PEGs). This behavior is quite obvious with syntax diagrams as
+they resemble flow-charts.
+
+[heading Predicates]
+
+Now, the following are Syntax Diagram versions PEG predicates. While
+these are not really included in usual Syntax Diagrams, we have it here
+to closely follow PEGs.
+
+First, we introduce a new element, the Predicate:
+
+[:__sd_predicate__]
+
+This is similar to the conditionals in flow charts where the 'No' branch
+is absent and always signals a failed parse.
+
+We have two versions of the predicate, the /And-Predicate/ and the
+/Not-Predicate/:
+
+[:__sd_and_predicate__]
+[:__sd_not_predicate__]
+
+The /And-Predicate/ tries the predicate, P, and succeeds if P succeeds,
+or otherwise fail. The opposite is true with the /Not-Predicate/. It
+tries the predicate, P, and fails if P succeeds, or otherwise succeeds.
+Both versions do a look-ahead but do not consume any input regardless if
+P succeeds or not.

[endsect]

Modified: trunk/libs/spirit/doc/html/index.html
==============================================================================
--- trunk/libs/spirit/doc/html/index.html (original)
+++ trunk/libs/spirit/doc/html/index.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -55,7 +55,7 @@
<dt><a href="spirit/abstracts/parsing_expression_grammar.html">Parsing
 Expression Grammar</a></dt>
</dl></dd>
-<dt>Qi</dt>
+<dt> Qi</dt>
<dd><dl>
<dt>Tutorials</dt>
<dd><dl>
@@ -93,7 +93,7 @@
<dt>Phoenix</dt>
</dl></dd>
</dl></dd>
-<dt>Karma</dt>
+<dt> Karma</dt>
<dd><dl>
<dt>Quick Reference</dt>
<dd><dl>
@@ -178,11 +178,11 @@
 
</blockquote></div>
<a name="spirit.preface.history"></a><h3>
-<a name="id397994"></a>
+<a name="id355261"></a>
 <a href="index.html#spirit.preface.history">History</a>
 </h3>
<a name="spirit.preface._emphasis_80s__emphasis_"></a><h3>
-<a name="id398008"></a>
+<a name="id398000"></a>
 <a href="index.html#spirit.preface._emphasis_80s__emphasis_">80s</a>
 </h3>

@@ -196,7 +196,7 @@
 recursive-descent parser. This worked very well.
 
<a name="spirit.preface._emphasis_90s__emphasis_"></a><h3>
-<a name="id398038"></a>
+<a name="id398029"></a>
 <a href="index.html#spirit.preface._emphasis_90s__emphasis_">90s</a>
 </h3>

@@ -240,7 +240,7 @@
 here: pre-Spirit.
 
<a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h3>
-<a name="id353884"></a>
+<a name="id353888"></a>
 <a href="index.html#spirit.preface._emphasis_2001_to_2006__emphasis_">2001
 to 2006</a>
 </h3>
@@ -270,7 +270,7 @@
 for design and implementation quality, robustness, and reusability.
 
<a name="spirit.preface._emphasis_2007__emphasis_"></a><h3>
-<a name="id353937"></a>
+<a name="id355419"></a>
 <a href="index.html#spirit.preface._emphasis_2007__emphasis_">2007</a>
 </h3>

@@ -300,7 +300,7 @@
 Templates</a> library called Boost.Proto.
 
<a name="spirit.preface.new_ideas__spirit_v2"></a><h3>
-<a name="id355536"></a>
+<a name="id355529"></a>
 <a href="index.html#spirit.preface.new_ideas__spirit_v2">New Ideas: Spirit V2</a>
 </h3>

@@ -338,13 +338,12 @@
 same underlying component library as for the parser and generator libraries.
 
<a name="spirit.preface.how_to_use_this_manual"></a><h3>
-<a name="id355606"></a>
+<a name="id355599"></a>
 <a href="index.html#spirit.preface.how_to_use_this_manual">How to use this manual</a>
 </h3>

- Each major section (there are two: <a href="">Qi and
- Karma</a>, and Lex) is roughly divided
- into 3 parts:
+ Each major section (there are 3: Qi, Karma, and Lex)
+ is roughly divided into 3 parts:
 
<div class="orderedlist"><ol type="1">
<li>
@@ -369,7 +368,7 @@
 icons precede some text to indicate:
 
<div class="table">
-<a name="id355672"></a>Table 1. Icons
+<a name="id355670"></a>Table 1. Icons
<table class="table" summary="Icons">
<colgroup>
<col>
@@ -454,7 +453,7 @@
 Tools</a>.
 
<a name="spirit.preface.support"></a><h3>
-<a name="id353447"></a>
+<a name="id353462"></a>
 <a href="index.html#spirit.preface.support">Support</a>
 </h3>

@@ -470,7 +469,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: June 13, 2009 at 05:01:54 GMT</td>
+<td align="left">Last revised: June 16, 2009 at 03:57:03 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: trunk/libs/spirit/doc/html/spirit/abstracts.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/abstracts.html (original)
+++ trunk/libs/spirit/doc/html/spirit/abstracts.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -47,16 +47,15 @@
 a variant of Extended Backus-Naur Form (EBNF) with a different interpretation.
 It is easier to understand PEG using Syntax Diagrams. Syntax diagrams represent
 a grammar graphically. It was used extensibly by Niklaus Wirth
- [<a name="id414438" href="#ftn.id414438">1</a>]
+ [<a name="id414442" href="#ftn.id414442">1</a>]
 in the "Pascal User Manual". Syntax Diagrams are easily understandable
 with programmers due to its similarity to flow charts. Also, the one to one
 mapping between the diagrams and functions make it ideal for representing
 [Recursive Descent parsers.
 
-<a name="spirit.abstracts.syntax_diagram.elements_of_a_syntax_diagram"></a><h4>
-<a name="id414455"></a>
- <a href="abstracts.html#spirit.abstracts.syntax_diagram.elements_of_a_syntax_diagram">Elements
- of a Syntax Diagram</a>
+<a name="spirit.abstracts.syntax_diagram.elements"></a><h4>
+<a name="id414460"></a>
+ Elements
 </h4>

 All diagrams have one entry and exit point. Arrows connect all possible paths
@@ -98,6 +97,10 @@

 
</blockquote></div>
+<a name="spirit.abstracts.syntax_diagram.constructs"></a><h4>
+<a name="id414579"></a>
+ Constructs
+ </h4>

 The most basic composition is the Sequence. B follows A:
 
@@ -126,7 +129,7 @@
 
</blockquote></div>

- The optional (can be thought of as zero-or-one):
+ The optional (zero-or-one):
 
<div class="blockquote"><blockquote class="blockquote">

@@ -137,10 +140,92 @@

 
</blockquote></div>
+
+ Now, the loops. We have the zero-or-more and one-or-more:
+ 
+<div class="blockquote"><blockquote class="blockquote">
+
+ 
+
+ <img src="../images/kleene.png" alt="kleene">
+ 
+
+ 
+</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
+
+ 
+
+ <img src="../images/plus.png" alt="plus">
+ 
+
+ 
+</blockquote></div>
+
+ Take note that, as in PEG, these behave greedily. If there is another 'A'
+ just before the end-point, it will always fail because the preceding loop
+ has already exhausted all the 'A's and there is nothing more to get. This
+ is a crucial difference between PEG and general Context Free Grammars (PEGs).
+ This behavior is quite obvious with syntax diagrams as they resemble flow-charts.
+ 
+<a name="spirit.abstracts.syntax_diagram.predicates"></a><h4>
+<a name="id414757"></a>
+ Predicates
+ </h4>
+
+ Now, the following are Syntax Diagram versions PEG predicates. While these
+ are not really included in usual Syntax Diagrams, we have it here to closely
+ follow PEGs.
+ 
+
+ First, we introduce a new element, the Predicate:
+ 
+<div class="blockquote"><blockquote class="blockquote">
+
+ 
+
+ <img src="../images/predicate.png" alt="predicate">
+ 
+
+ 
+</blockquote></div>
+
+ This is similar to the conditionals in flow charts where the 'No' branch
+ is absent and always signals a failed parse.
+ 
+
+ We have two versions of the predicate, the And-Predicate
+ and the Not-Predicate:
+ 
+<div class="blockquote"><blockquote class="blockquote">
+
+ 
+
+ <img src="../images/and_predicate.png" alt="and_predicate">
+ 
+
+ 
+</blockquote></div>
+<div class="blockquote"><blockquote class="blockquote">
+
+ 
+
+ <img src="../images/not_predicate.png" alt="not_predicate">
+ 
+
+ 
+</blockquote></div>
+
+ The And-Predicate tries the predicate, P, and succeeds
+ if P succeeds, or otherwise fail. The opposite is true with the Not-Predicate.
+ It tries the predicate, P, and fails if P succeeds, or otherwise succeeds.
+ Both versions do a look-ahead but do not consume any input regardless if
+ P succeeds or not.
+ 
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id414438" href="#id414438">1</a>] 
+<div class="footnote">[<a name="ftn.id414442" href="#id414442">1</a>] 
 Niklaus Wirth: The Programming Language Pascal. (July 1973)
 </div>
</div>

Modified: trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html (original)
+++ trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -8,7 +8,7 @@
<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="previous" href="../abstracts.html" title="Abstracts">
-<link rel="next" href="../qi.html" title="Qi">
+<link rel="next" href="../qi.html" title=" Qi">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -45,7 +45,7 @@
 [Abstract Syntax Tree) for each PEG grammar.
 
<a name="spirit.abstracts.parsing_expression_grammar.sequences"></a><h4>
-<a name="id414705"></a>
+<a name="id414933"></a>
 <a href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.sequences">Sequences</a>
 </h4>

@@ -74,7 +74,7 @@
 </td></tr>
</table></div>
<a name="spirit.abstracts.parsing_expression_grammar.alternatives"></a><h4>
-<a name="id414824"></a>
+<a name="id415052"></a>
 <a href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.alternatives">Alternatives</a>
 </h4>

@@ -107,7 +107,7 @@
 about this $$$).
 
<a name="spirit.abstracts.parsing_expression_grammar.loops"></a><h4>
-<a name="id414981"></a>
+<a name="id415210"></a>
 <a href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.loops">Loops</a>
 </h4>

@@ -149,7 +149,7 @@
 We will see more of these other mechanisms shortly.
 
<a name="spirit.abstracts.parsing_expression_grammar.difference"></a><h4>
-<a name="id415102"></a>
+<a name="id415330"></a>
 <a href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.difference">Difference</a>
 </h4>

Modified: trunk/libs/spirit/doc/html/spirit/acknowledgments.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/acknowledgments.html (original)
+++ trunk/libs/spirit/doc/html/spirit/acknowledgments.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -50,7 +50,7 @@
 FIXME: Add more people
 
<a name="spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation"></a><h3>
-<a name="id482395"></a>
+<a name="id487188"></a>
 <a href="acknowledgments.html#spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation">Acknowledgements
 from the Spirit V1 classic Documentation</a>
 </h3>

Modified: trunk/libs/spirit/doc/html/spirit/faq.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/faq.html (original)
+++ trunk/libs/spirit/doc/html/spirit/faq.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -30,7 +30,7 @@
<div></div>
</div>
<a name="spirit.faq.i_m_very_confused_about_the_header_hell_in_my_boost_spirit_directory__what_s_all_this_about_"></a><h3>
-<a name="id480837"></a>
+<a name="id485631"></a>
 <a href="faq.html#spirit.faq.i_m_very_confused_about_the_header_hell_in_my_boost_spirit_directory__what_s_all_this_about_">I'm
 very confused about the header hell in my boost/spirit directory. What's all
 this about?</a>

Modified: trunk/libs/spirit/doc/html/spirit/introduction.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/introduction.html (original)
+++ trunk/libs/spirit/doc/html/spirit/introduction.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -137,7 +137,7 @@

 
<a name="spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_"></a><h3>
-<a name="id411293"></a>
+<a name="id411298"></a>
 <a href="introduction.html#spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_">A
 Quick Overview of Parsing with Spirit.Qi</a>
 </h3>
@@ -227,7 +227,7 @@
 <tt class="computeroutput">;</tt>.
 
<a name="spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_"></a><h3>
-<a name="id412500"></a>
+<a name="id412505"></a>
 <a href="introduction.html#spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_">A
 Quick Overview of Output Generation with Spirit.Karma</a>
 </h3>
@@ -260,7 +260,7 @@
 of the same <tt class="computeroutput">std::vector<int></tt>:
 
<div class="table">
-<a name="id412938"></a>Table 2. Different output formats for `std::vector<int>`
+<a name="id412942"></a>Table 2. Different output formats for `std::vector<int>`
<table class="table" summary="Different output formats for `std::vector<int>`">
<colgroup>
<col>
@@ -345,7 +345,7 @@
 next table gives some related examples.
 
<div class="table">
-<a name="id413384"></a>Table 3. Different data types usable with the output format
+<a name="id413388"></a>Table 3. Different data types usable with the output format
 `*(int_ << eol)`
<table class="table" summary="Different data types usable with the output format
 `*(int_ << eol)`">

Modified: trunk/libs/spirit/doc/html/spirit/karma.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -1,7 +1,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Karma</title>
+<title> Karma</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
<link rel="home" href="../index.html" title="Spirit 2.1">
@@ -25,7 +25,7 @@
<div class="section" lang="en">
<div class="titlepage">
<div><div><h2 class="title" style="clear: both">
-<a name="spirit.karma"></a>Karma
+<a name="spirit.karma"></a> Karma
</h2></div></div>
<div></div>
</div>
@@ -1002,7 +1002,7 @@
b</tt> will be <tt class="computeroutput">tuple<A, B></tt>.

<div class="table">
-<a name="id456301"></a>Table 5. /Spirit.Karma/ compound generator attribute types
+<a name="id456546"></a>Table 5. /Spirit.Karma/ compound generator attribute types
<table class="table" summary="/Spirit.Karma/ compound generator attribute types">
<colgroup>
<col>

Modified: trunk/libs/spirit/doc/html/spirit/lex.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
<link rel="home" href="../index.html" title="Spirit 2.1">
<link rel="up" href="../index.html" title="Spirit 2.1">
-<link rel="previous" href="karma.html" title="Karma">
+<link rel="previous" href="karma.html" title=" Karma">
<link rel="next" href="lex/tutorials.html" title=" Spirit.Lex
 Tutorials">
</head>
@@ -105,7 +105,7 @@
 </li>
</ul></div>
<a name="spirit.lex.lexer_introduction.why_use_a_separate_lexer_"></a><h4>
-<a name="id461218"></a>
+<a name="id461463"></a>
 <a href="lex.html#spirit.lex.lexer_introduction.why_use_a_separate_lexer_">Why
 Use a Separate Lexer?</a>
 </h4>
@@ -204,7 +204,7 @@
 grammar recognizers.
 
<a name="spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_"></a><h4>
-<a name="id461573"></a>
+<a name="id461807"></a>
 <a href="lex.html#spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_">Advantages
 of using Spirit.Lex</a>
 </h4>
@@ -253,7 +253,7 @@
 application.
 
<a name="spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_"></a><h4>
-<a name="id461744"></a>
+<a name="id461977"></a>
 <a href="lex.html#spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_">The
 Library Structure of Spirit.Lex</a>
 </h4>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -100,7 +100,7 @@
 of the Spirit.Lex library.
 
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token"></a><h6>
-<a name="id472498"></a>
+<a name="id474330"></a>
 <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token">The
 Anatomy of a Token</a>
 </h6>
@@ -237,7 +237,7 @@
 when it is requested for the first time.
 
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition"></a><h6>
-<a name="id473319"></a>
+<a name="id475137"></a>
 <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition">The
 Physiognomy of a Token Definition</a>
 </h6>
@@ -310,7 +310,7 @@
</td></tr>
</table></div>
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_"></a><h6>
-<a name="id473729"></a>
+<a name="id475547"></a>
 <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_">Examples
 of using lexertl_token<></a>
 </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -30,17 +30,17 @@
<div></div>
</div>
<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions"></a><h5>
-<a name="id478050"></a>
+<a name="id482844"></a>
 <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions">Controlling
 the Lexer State from Lexer Semantic Actions</a>
 </h5>
<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions"></a><h5>
-<a name="id478077"></a>
+<a name="id482871"></a>
 <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions">Controlling
 the Lexer State from Parser Semantic Actions</a>
 </h5>
<a name="spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser"></a><h5>
-<a name="id478105"></a>
+<a name="id482898"></a>
 <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser">Using
 a Lexer State for the Skip Parser</a>
 </h5>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -183,7 +183,7 @@

 
<a name="spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer"></a><h5>
-<a name="id476189"></a>
+<a name="id480984"></a>
 <a href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer">Generating
 the Static Analyzer</a>
 </h5>
@@ -232,7 +232,7 @@
 the next topic (the full generated code can be viewed here).
 
<a name="spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer"></a><h5>
-<a name="id476655"></a>
+<a name="id481449"></a>
 <a href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer">Modifying
 the Dynamic Analyzer</a>
 </h5>

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -33,15 +33,212 @@
</h4></div></div>
<div></div>
</div>
-<a name="spirit.lex.abstracts.lexer_tokenizing._tokenize_function_the_tokenize___function"></a><h5>
-<a name="id474539"></a>
- <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing._tokenize_function_the_tokenize___function">:tokenize_function
- The tokenize() function</a>
+<a name="spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function"></a><h5>
+<a name="id476355"></a>
+ <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function">The
+ tokenize function</a>
</h5>
-<a name="spirit.lex.abstracts.lexer_tokenizing._generate_static_function_the_generate_static___function"></a><h5>
-<a name="id474566"></a>
- <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing._generate_static_function_the_generate_static___function">:generate_static_function
- The generate_static() function</a>
+
+ The <tt class="computeroutput">tokenize()</tt>
+ function is a helper function simplifying the usage of a lexer in a standalone
+ fashion. Consider you have a standalone lexer where all the required functionality
+ is implemented inside of lexer semantic actions. A good example for this
+ is the word_count_lexer
+ described in more detail in the section <a href="../tutorials/lexer_quickstart2.html" title=" Quickstart
+ 2 - A better word counter using Spirit.Lex">Lex
+ Quickstart 2 - A better word counter using Spirit.Lex</a>.
+ As a reminder, here is the token definition class:
+ 
+
+ 
+
+
+
+<pre class="programlisting">template <typename Lexer>
+struct word_count_tokens : lexer<Lexer>
+{
+ word_count_tokens()
+ : c(0), w(0), l(0)
+ , word("[^ \t\n]+") // define tokens
+ , eol("\n")
+ , any(".")
+ {
+ using boost::spirit::lex::_start;
+ using boost::spirit::lex::_end;
+ using boost::phoenix::ref;
+
+ // associate tokens with the lexer
+ this->self
+ = word [++ref(w), ref(c) += distance(_start, _end)]
+ | eol [++ref(c), ++ref(l)]
+ | any [++ref(c)]
+ ;
+ }
+
+ std::size_t c, w, l;
+ token_def<> word, eol, any;
+};
+</pre>
+
+ 
+
+ 
+
+ The construct used to tokenize the given input, while discarding all generated
+ tokens is a common application of the lexer. For this reason Spirit.Lex
+ exposes an API function <tt class="computeroutput">tokenize()</tt> minimizing the code required:
+ 
+<pre class="programlisting">// Read input from the given file
+std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
+
+word_count_tokens<lexer_type> word_count_lexer;
+std::string::iterator first = str.begin();
+
+// Tokenize all the input, while discarding all generated tokens
+bool r = tokenize(first, str.end(), word_count_lexer);
+</pre>
+
+ This code is completely equivalent to the more verbose version as shown
+ in the section <a href="../tutorials/lexer_quickstart2.html" title=" Quickstart
+ 2 - A better word counter using Spirit.Lex">Lex
+ Quickstart 2 - A better word counter using Spirit.Lex</a>.
+ The function <tt class="computeroutput">tokenize()</tt>
+ will return either if the end of the input has been reached (in this case
+ the return value will be <tt class="computeroutput">true</tt>),
+ or if the lexer couldn't match any of the token definitions in the input
+ (in this case the return value will be <tt class="computeroutput">false</tt>
+ and the iterator <tt class="computeroutput">first</tt>
+ will point to the first not matched character in the input sequence).
+ 
+
+ The prototype of this function is:
+ 
+<pre class="programlisting">template <typename Iterator, typename Lexer>
+bool tokenize(Iterator& first, Iterator last, Lexer const& lex
+ , typename Lexer::char_type const* initial_state = 0);
+</pre>
+<div class="variablelist">
+where:
+<dl>
+<dt>Iterator& first</dt>
+<dd>
+ The begin of the input sequence to tokenize. The value of this iterator
+ will be updated by the lexer, pointing to the first not matched character
+ of the input after the function returns.
+ </dd>
+<dt>Iterator last</dt>
+<dd>
+ The end of the input sequence to tokenize.
+ </dd>
+<dt>Lexer const& lex</dt>
+<dd>
+ The lexer instance to use for tokenization.
+ </dd>
+<dt>Lexer::char_type const* initial_state</dt>
+<dd>
+ This optional parameter can be used to specify the initial lexer state
+ fo rthe tokenization.
+ </dd>
+</dl>
+</div>
+
+ A second overload of the <tt class="computeroutput">tokenize()</tt> function allows to specify any arbitrary
+ function or function object to be called for each of the generated tokens.
+ For some applications this is very useful, as it might avoid having lexer
+ semantic actions. For an example of how to use this function, please have
+ a look at word_count_functor.cpp:
+ 
+
+ 
+
+ The main function simply loads the given file into memory (as a <tt class="computeroutput">std::string</tt>), instantiates an instance of
+ the token definition template using the correct iterator type (<tt class="computeroutput">word_count_tokens<char const*></tt>), and finally calls <tt class="computeroutput">lex::tokenize</tt>, passing an instance of the
+ counter function object. The return value of <tt class="computeroutput">lex::tokenize()</tt> will be <tt class="computeroutput">true</tt>
+ if the whole input sequence has been successfully tokenized, and <tt class="computeroutput">false</tt> otherwise.
+ 
+
+ 
+
+
+
+<pre class="programlisting">int main(int argc, char* argv[])
+{
+ // these variables are used to count characters, words and lines
+ std::size_t c = 0, w = 0, l = 0;
+
+ // read input from the given file
+ std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
+
+ // create the token definition instance needed to invoke the lexical analyzer
+ word_count_tokens<lexertl::lexer<> > word_count_functor;
+
+ // tokenize the given string, the bound functor gets invoked for each of
+ // the matched tokens
+ char const* first = str.c_str();
+ char const* last = &first[str.size()];
+ bool r = tokenize(first, last, word_count_functor,
+ boost::bind(counter(), _1, boost::ref(c), boost::ref(w), boost::ref(l)));
+
+ // print results
+ if (r) {
+ std::cout << "lines: " << l << ", words: " << w
+ << ", characters: " << c << "\n";
+ }
+ else {
+ std::string rest(first, last);
+ std::cout << "Lexical analysis failed\n" << "stopped at: \""
+ << rest << "\"\n";
+ }
+ return 0;
+}
+</pre>
+
+ 
+
+ 
+
+ Here is the prototype of this <tt class="computeroutput">tokenize()</tt> function overload:
+ 
+<pre class="programlisting">template <typename Iterator, typename Lexer, typename F>
+bool tokenize(Iterator& first, Iterator last, Lexer const& lex, F f
+ , typename Lexer::char_type const* initial_state = 0);
+</pre>
+<div class="variablelist">
+where:
+<dl>
+<dt>Iterator& first</dt>
+<dd>
+ The begin of the input sequence to tokenize. The value of this iterator
+ will be updated by the lexer, pointing to the first not matched character
+ of the input after the function returns.
+ </dd>
+<dt>Iterator last</dt>
+<dd>
+ The end of the input sequence to tokenize.
+ </dd>
+<dt>Lexer const& lex</dt>
+<dd>
+ The lexer instance to use for tokenization.
+ </dd>
+<dt>F f</dt>
+<dd>
+ A function or function object to be called for each matched token.
+ This function is expected to have the prototype: <tt class="computeroutput">bool
+ f(Lexer::token_type);</tt>
+ and should return <tt class="computeroutput">false</tt>
+ if the supplied token instance is invald (the <tt class="computeroutput">tokenize()</tt> function will return immediatly).
+ </dd>
+<dt>Lexer::char_type const* initial_state</dt>
+<dd>
+ This optional parameter can be used to specify the initial lexer state
+ fo rthe tokenization.
+ </dd>
+</dl>
+</div>
+<a name="spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function"></a><h5>
+<a name="id479360"></a>
+ <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function">The
+ generate_static function</a>
</h5>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -57,7 +57,7 @@
<div></div>
</div>
<div class="table">
-<a name="id478197"></a>Table 6. Regular expressions support
+<a name="id482991"></a>Table 6. Regular expressions support
<table class="table" summary="Regular expressions support">
<colgroup>
<col>
@@ -388,7 +388,7 @@
 </td></tr>
</table></div>
<a name="spirit.lex.reference.concepts.lexer.regular_expression_precedence"></a><h6>
-<a name="id480288"></a>
+<a name="id485081"></a>
 <a href="reference.html#spirit.lex.reference.concepts.lexer.regular_expression_precedence">Regular
 Expression Precedence</a>
 </h6>
@@ -407,7 +407,7 @@
 </li>
</ul></div>
<a name="spirit.lex.reference.concepts.lexer.macros"></a><h6>
-<a name="id480444"></a>
+<a name="id485237"></a>
 <a href="reference.html#spirit.lex.reference.concepts.lexer.macros">Macros</a>
 </h6>

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -30,22 +30,22 @@
<div></div>
</div>
<a name="spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"></a><h5>
-<a name="id480650"></a>
+<a name="id485444"></a>
 <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model">The
 lexertl_lexer Class Implementing the Dynamic Model</a>
 </h5>
<a name="spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model"></a><h5>
-<a name="id480677"></a>
+<a name="id485471"></a>
 <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model">The
 lexertl_actor_lexer Class Implementing the Dynamic Model</a>
 </h5>
<a name="spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"></a><h5>
-<a name="id480704"></a>
+<a name="id485497"></a>
 <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model">The
 lexertl_static_lexer Class Implementing the Static Model</a>
 </h5>
<a name="spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model"></a><h5>
-<a name="id480733"></a>
+<a name="id485527"></a>
 <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model">The
 lexertl_static_actor_lexer Class Implementing the Static Model</a>
 </h5>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -47,7 +47,7 @@
 (for the full example code see here: word_count_functor.cpp).
 
<a name="spirit.lex.tutorials.lexer_quickstart1.prerequisites"></a><h5>
-<a name="id462184"></a>
+<a name="id462418"></a>
 <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.prerequisites">Prerequisites</a>
 </h5>

@@ -86,7 +86,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart1.defining_tokens"></a><h5>
-<a name="id462531"></a>
+<a name="id462765"></a>
 <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.defining_tokens">Defining
 Tokens</a>
 </h5>
@@ -141,7 +141,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work"></a><h5>
-<a name="id462980"></a>
+<a name="id463213"></a>
 <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work">Doing
 the Useful Work</a>
 </h5>
@@ -206,7 +206,7 @@
 as well.
 
<a name="spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together"></a><h5>
-<a name="id463677"></a>
+<a name="id463911"></a>
 <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together">Pulling
 Everything Together</a>
 </h5>
@@ -215,10 +215,8 @@

 The main function simply loads the given file into memory (as a <tt class="computeroutput">std::string</tt>), instantiates an instance of
 the token definition template using the correct iterator type (<tt class="computeroutput">word_count_tokens<char const*></tt>), and finally calls <tt class="computeroutput">lex::tokenize</tt>, passing an instance of the
- counter functor defined above. The return value of <tt class="computeroutput">lex::tokenize</tt>
- will be <tt class="computeroutput">true</tt> if the whole
- input sequence has been successfully tokenized, and <tt class="computeroutput">false</tt>
- otherwise.
+ counter function object. The return value of <tt class="computeroutput">lex::tokenize()</tt> will be <tt class="computeroutput">true</tt>
+ if the whole input sequence has been successfully tokenized, and <tt class="computeroutput">false</tt> otherwise.
 

 
@@ -261,7 +259,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_"></a><h5>
-<a name="id464804"></a>
+<a name="id465041"></a>
 <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_">Comparing
 Spirit.Lex with Flex</a>
 </h5>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -49,7 +49,7 @@
 options along the lines (for the full example code see here: word_count_lexer.cpp).
 
<a name="spirit.lex.tutorials.lexer_quickstart2.prerequisites"></a><h5>
-<a name="id465859"></a>
+<a name="id466097"></a>
 <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.prerequisites">Prerequisites</a>
 </h5>

@@ -123,7 +123,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id466749"></a>
+<a name="id466986"></a>
 <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_">Semantic
 Actions in Spirit.Lex</a>
 </h5>
@@ -149,12 +149,13 @@
 , eol("\n")
 , any(".")
 {
+ using boost::spirit::lex::_start;
+ using boost::spirit::lex::_end;
 using boost::phoenix::ref;
- using boost::phoenix::distance;

 // associate tokens with the lexer
 this->self
- = word [++ref(w), ref(c) += distance(_1)]
+ = word [++ref(w), ref(c) += distance(_start, _end)]
 | eol [++ref(c), ++ref(l)]
 | any [++ref(c)]
 ;
@@ -178,31 +179,42 @@
 but it is possible to insert any C++ function or function object as long
 as it exposes the interface:
 
-<pre class="programlisting">void f (Range r, Idtype id, bool& matched, Context& ctx);
+<pre class="programlisting">void f (Iterator& start, Iterator& end, pass_flag& matched, Idtype& id, Context& ctx);
</pre>
<div class="variablelist">
where:
<dl>
-<dt><tt class="computeroutput">Range
- r</tt></dt>
+<dt><tt class="computeroutput">Iterator& start</tt></dt>
<dd>
- This is a <tt class="computeroutput">boost::iterator_range</tt> holding two iterators
- pointing to the matched range in the underlying input sequence. The
- type of the held iterators is the same as specified while defining
- the type of the <tt class="computeroutput">lexertl_lexer<...></tt> (its first template parameter).
+ This is a the iterator pointing to the begin of the matched range in
+ the underlying input sequence. The type of the iterator is the same
+ as specified while defining the type of the <tt class="computeroutput">lexertl_lexer<...></tt> (its first template parameter).
+ The semantic action is allowed to change the value of this iterator
+ influencing, the matched input sequence.
 </dd>
-<dt><tt class="computeroutput">Idtype
- id</tt></dt>
+<dt><tt class="computeroutput">Iterator& end</tt></dt>
<dd>
- This is the token id of the type <tt class="computeroutput">std::size_t</tt>
- for the matched token.
+ This is a the iterator pointing to the end of the matched range in
+ the underlying input sequence. The type of the iterator is the same
+ as specified while defining the type of the <tt class="computeroutput">lexertl_lexer<...></tt> (its first template parameter).
+ The semantic action is allowed to change the value of this iterator
+ influencing, the matched input sequence.
 </dd>
-<dt><tt class="computeroutput">bool& matched</tt></dt>
+<dt><tt class="computeroutput">pass_flag& matched</tt></dt>
<dd>
- This boolean value is pre/initialized to <tt class="computeroutput">true</tt>.
- If the functor sets it to <tt class="computeroutput">false</tt>
- the lexer stops calling any semantic actions attached to this token
- and behaves as if the token has not been matched in the first place.
+ This value is pre/initialized to <tt class="computeroutput">pass_normal</tt>.
+ If the semantic action sets it to <tt class="computeroutput">pass_fail</tt>
+ the behaves as if the token has not been matched in the first place.
+ If the semantic action sets this to <tt class="computeroutput">pass_ignore</tt>
+ the lexer ignores the current token and tries to match a next token
+ from the input.
+ </dd>
+<dt><tt class="computeroutput">Idtype& id</tt></dt>
+<dd>
+ This is the token id of the type Idtype (most of the time this will
+ be a <tt class="computeroutput">std::size_t</tt>) for the matched token. The
+ semantic action is allowed to change the value of this token id, influencing
+ the if of the created token.
 </dd>
<dt><tt class="computeroutput">Context& ctx</tt></dt>
<dd>
@@ -217,9 +229,10 @@
 When using a C++ function as the semantic action the following prototypes
 are allowed as well:
 
-<pre class="programlisting">void f (Range r, Idtype id, bool& matched);
-void f (Range r, Idtype id);
-void f (Range r);
+<pre class="programlisting">void f (Iterator& start, Iterator& end, pass_flag& matched, Idtype& id);
+void f (Iterator& start, Iterator& end, pass_flag& matched);
+void f (Iterator& start, Iterator& end);
+void f ();
</pre>

 Even if it is possible to write your own function object implementations
@@ -235,7 +248,7 @@
 to the internal lexer context.
 
<a name="spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer"></a><h5>
-<a name="id468107"></a>
+<a name="id468624"></a>
 <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer">Associating
 Token Definitions with the Lexer</a>
 </h5>
@@ -271,6 +284,110 @@
 library internally assigns unique numbers to the token definitions, starting
 with the constant defined by <tt class="computeroutput">boost::spirit::lex::min_token_id</tt>.
 
+<a name="spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together"></a><h5>
+<a name="id469051"></a>
+ <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together">Pulling
+ everything together</a>
+ </h5>
+
+ In order to execute the code defined above we still need to instantiate
+ an instance of the lexer type, feed it from some input sequence and create
+ a pair of iterators allowing to iterate over the token sequence as created
+ by the lexer. This code shows how to achieve these steps:
+ 
+
+ 
+
+
+
+<pre class="programlisting">int main(int argc, char* argv[])
+{
+
+<a name="spirit4co" href="lexer_quickstart2.html#spirit4"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> typedef lexertl::token<char const*, omitted, boost::mpl::false_> token_type;
+
+<a name="spirit5co" href="lexer_quickstart2.html#spirit5"><img src="../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> typedef lexertl::actor_lexer<token_type> lexer_type;
+
+<a name="spirit6co" href="lexer_quickstart2.html#spirit6"><img src="../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> word_count_tokens<lexer_type> word_count_lexer;
+
+<a name="spirit7co" href="lexer_quickstart2.html#spirit7"><img src="../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a> std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
+ char const* first = str.c_str();
+ char const* last = &first[str.size()];
+
+<a name="spirit8co" href="lexer_quickstart2.html#spirit8"><img src="../../../../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a> lexer_type::iterator_type iter = word_count_lexer.begin(first, last);
+ lexer_type::iterator_type end = word_count_lexer.end();
+
+<a name="spirit9co" href="lexer_quickstart2.html#spirit9"><img src="../../../../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a> while (iter != end && token_is_valid(*iter))
+ ++iter;
+
+ if (iter == end) {
+ std::cout << "lines: " << word_count_lexer.l
+ << ", words: " << word_count_lexer.w
+ << ", characters: " << word_count_lexer.c
+ << "\n";
+ }
+ else {
+ std::string rest(first, last);
+ std::cout << "Lexical analysis failed\n" << "stopped at: \""
+ << rest << "\"\n";
+ }
+ return 0;
+}
+</pre>
+
+ 
+
+ 
+
+ 
+<div class="calloutlist"><table border="0" summary="Callout list">
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit4"></a> </td>
+<td valign="top" align="left"> Specifying <tt class="computeroutput">omitted</tt> as
+ the token attribute type generates a token class not holding any token
+ attribute at all (not even the iterator range of the matched input sequence),
+ therefore optimizing the token, the lexer, and possibly the parser implementation
+ as much as possible. Specifying <tt class="computeroutput">mpl::false_</tt>
+ as the 3rd template parameter generates a token type and an iterator,
+ both holding no lexer state, allowing for even more aggressive optimizations.
+ As a result the token instances contain the token ids as the only data
+ member. </td>
+</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit5"></a> </td>
+<td valign="top" align="left"> This defines the lexer type to use </td>
+</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit6"></a> </td>
+<td valign="top" align="left"> Create the lexer object instance
+ needed to invoke the lexical analysis </td>
+</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit7"></a> </td>
+<td valign="top" align="left"> Read input from the given file,
+ tokenize all the input, while discarding all generated tokens </td>
+</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit8"></a> </td>
+<td valign="top" align="left"> Create
+ a pair of iterators returning the sequence of generated tokens </td>
+</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit9"></a> </td>
+<td valign="top" align="left"> Here we
+ simply iterate over all tokens, making sure to break the loop if an invalid
+ token gets returned from the lexer </td>
+</tr>
+</table></div>
+
+ 
+
+ 
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -74,7 +74,7 @@
 code see here: word_count.cpp).
 
<a name="spirit.lex.tutorials.lexer_quickstart3.prerequisites"></a><h5>
-<a name="id468685"></a>
+<a name="id470466"></a>
 <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.prerequisites">Prerequisites</a>
 </h5>

@@ -124,7 +124,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart3.defining_tokens"></a><h5>
-<a name="id469290"></a>
+<a name="id471071"></a>
 <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.defining_tokens">Defining
 Tokens</a>
 </h5>
@@ -179,7 +179,7 @@

 
<a name="spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers"></a><h5>
-<a name="id469766"></a>
+<a name="id471545"></a>
 <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers">Using
 Token Definition Instances as Parsers</a>
 </h5>
@@ -335,7 +335,7 @@
 </td></tr>
</table></div>
<a name="spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together"></a><h5>
-<a name="id471101"></a>
+<a name="id472880"></a>
 <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together">Pulling
 Everything Together</a>
 </h5>
@@ -355,13 +355,13 @@

<pre class="programlisting">int main(int argc, char* argv[])
{
-<a name="spirit4co" href="lexer_quickstart3.html#spirit4"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> typedef lexertl::token<
+<a name="spirit10co" href="lexer_quickstart3.html#spirit10"><img src="../../../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a> typedef lexertl::token<
 char const*, boost::mpl::vector<std::string>
 > token_type;

-<a name="spirit5co" href="lexer_quickstart3.html#spirit5"><img src="../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> typedef lexertl::lexer<token_type> lexer_type;
+<a name="spirit11co" href="lexer_quickstart3.html#spirit11"><img src="../../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> typedef lexertl::lexer<token_type> lexer_type;

-<a name="spirit6co" href="lexer_quickstart3.html#spirit6"><img src="../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> typedef word_count_tokens<lexer_type>::iterator_type iterator_type;
+<a name="spirit12co" href="lexer_quickstart3.html#spirit12"><img src="../../../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> typedef word_count_tokens<lexer_type>::iterator_type iterator_type;

 // now we use the types defined above to create the lexer and grammar
 // object instances needed to invoke the parsing process
@@ -372,12 +372,8 @@
 std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
 char const* first = str.c_str();
 char const* last = &first[str.size()];
-
- // Parsing is done based on the the token stream, not the character
- // stream read from the input. The function `tokenize_and_parse()` wraps
- // the passed iterator range `[first, last)` by the lexical analyzer and
- // uses its exposed iterators to parse the toke stream.
- bool r = tokenize_and_parse(first, last, word_count, g);
+
+<a name="spirit13co" href="lexer_quickstart3.html#spirit13"><img src="../../../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a> bool r = tokenize_and_parse(first, last, word_count, g);

 if (r) {
 std::cout << "lines: " << g.l << ", words: " << g.w
@@ -400,22 +396,31 @@
<div class="calloutlist"><table border="0" summary="Callout list">
<tr>
<td width="5%" valign="top" align="left">
-<a name="spirit4"></a> </td>
-<td valign="top" align="left"> define the token type to be used: <tt class="computeroutput">std::string</tt>
+<a name="spirit10"></a> </td>
+<td valign="top" align="left"> Define the token type to be used: <tt class="computeroutput">std::string</tt>
 is available as the type of the token attribute </td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a name="spirit5"></a> </td>
-<td valign="top" align="left"> define the lexer type
+<a name="spirit11"></a> </td>
+<td valign="top" align="left"> Define the lexer type
 to use implementing the state machine </td>
</tr>
<tr>
<td width="5%" valign="top" align="left">
-<a name="spirit6"></a> </td>
-<td valign="top" align="left"> define the iterator type exposed
+<a name="spirit12"></a> </td>
+<td valign="top" align="left"> Define the iterator type exposed
 by the lexer type </td>
</tr>
+<tr>
+<td width="5%" valign="top" align="left">
+<a name="spirit13"></a> </td>
+<td valign="top" align="left"> Parsing is done based on the the token stream, not
+ the character stream read from the input. The function <tt class="computeroutput">tokenize_and_parse()</tt>
+ wraps the passed iterator range <tt class="computeroutput">[first, last)</tt>
+ by the lexical analyzer and uses its exposed iterators to parse the toke
+ stream. </td>
+</tr>
</table></div>

Modified: trunk/libs/spirit/doc/html/spirit/qi.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -1,7 +1,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Qi</title>
+<title> Qi</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
<link rel="home" href="../index.html" title="Spirit 2.1">
@@ -26,7 +26,7 @@
<div class="section" lang="en">
<div class="titlepage">
<div><div><h2 class="title" style="clear: both">
-<a name="spirit.qi"></a>Qi
+<a name="spirit.qi"></a> Qi
</h2></div></div>
<div></div>
</div>
@@ -103,7 +103,7 @@
<div></div>
</div>
<a name="spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_"></a><h5>
-<a name="id415218"></a>
+<a name="id415447"></a>
 <a href="qi.html#spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_">Why
 would you want to use Spirit.Qi?</a>
 </h5>
@@ -154,7 +154,7 @@
 on how to build parsers from the simplest parser, building up as we go.
 
<a name="spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number"></a><h5>
-<a name="id415299"></a>
+<a name="id415527"></a>
 <a href="qi.html#spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number">Trivial
 Example #1 Parsing a number</a>
 </h5>
@@ -169,7 +169,7 @@
 parsers and consistent naming conventions help you keep from going insane!
 
<a name="spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers"></a><h5>
-<a name="id415345"></a>
+<a name="id415573"></a>
 <a href="qi.html#spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers">Trivial
 Example #2 Parsing two numbers</a>
 </h5>
@@ -202,7 +202,7 @@
 </td></tr>
</table></div>
<a name="spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers"></a><h5>
-<a name="id415433"></a>
+<a name="id415661"></a>
 <a href="qi.html#spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers">Trivial
 Example #3 Parsing one or more numbers</a>
 </h5>
@@ -226,7 +226,7 @@
 in most places.
 
<a name="spirit.qi.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers"></a><h5>
-<a name="id415510"></a>
+<a name="id415738"></a>
 <a href="qi.html#spirit.qi.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers">Trivial
 Example #4 Parsing a comma-delimited list of numbers</a>
 </h5>
@@ -249,7 +249,7 @@
 star encloses the complete expression above.
 
<a name="spirit.qi.tutorials.warming_up.let_s_parse_"></a><h5>
-<a name="id415686"></a>
+<a name="id415914"></a>
 <a href="qi.html#spirit.qi.tutorials.warming_up.let_s_parse_">Let's Parse!</a>
 </h5>

@@ -619,7 +619,7 @@
 The examples above can be found here: ../../example/qi/actions.cpp
 
<a name="spirit.qi.tutorials.semantic_actions.phoenix"></a><h5>
-<a name="id418146"></a>
+<a name="id418385"></a>
 <a href="qi.html#spirit.qi.tutorials.semantic_actions.phoenix">Phoenix</a>
 </h5>

@@ -1188,7 +1188,7 @@
 </li>
</ul></div>
<a name="spirit.qi.tutorials.roman_numerals.symbol_table"></a><h5>
-<a name="id423187"></a>
+<a name="id423432"></a>
 <a href="qi.html#spirit.qi.tutorials.roman_numerals.symbol_table">Symbol
 Table</a>
 </h5>
@@ -1320,7 +1320,7 @@
 They are all parsers.
 
<a name="spirit.qi.tutorials.roman_numerals.rules"></a><h5>
-<a name="id424500"></a>
+<a name="id424745"></a>
 <a href="qi.html#spirit.qi.tutorials.roman_numerals.rules">Rules</a>
 </h5>

@@ -1400,7 +1400,7 @@
<pre class="programlisting">r = double_ >> *(',' >> double_);
</pre>
<a name="spirit.qi.tutorials.roman_numerals.grammars"></a><h5>
-<a name="id425083"></a>
+<a name="id425327"></a>
 <a href="qi.html#spirit.qi.tutorials.roman_numerals.grammars">Grammars</a>
 </h5>

@@ -1505,7 +1505,7 @@
 </li>
</ul></div>
<a name="spirit.qi.tutorials.roman_numerals.let_s_parse_"></a><h5>
-<a name="id426100"></a>
+<a name="id426344"></a>
 <a href="qi.html#spirit.qi.tutorials.roman_numerals.let_s_parse_">Let's Parse!</a>
 </h5>

@@ -1709,7 +1709,7 @@
 has a <tt class="computeroutput">std::string</tt> attribute.
 
<a name="spirit.qi.tutorials.employee___parsing_into_structs.lexeme"></a><h5>
-<a name="id428379"></a>
+<a name="id428623"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.lexeme">Lexeme</a>
 </h5>
<pre class="programlisting">lexeme['"' >> +(char_ - '"') >> '"'];
@@ -1726,7 +1726,7 @@
 a double quote.
 
<a name="spirit.qi.tutorials.employee___parsing_into_structs.difference"></a><h5>
-<a name="id428535"></a>
+<a name="id428779"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.difference">Difference</a>
 </h5>

@@ -1745,7 +1745,7 @@
 is just <tt class="computeroutput">char</tt>.
 
<a name="spirit.qi.tutorials.employee___parsing_into_structs.plus"></a><h5>
-<a name="id428693"></a>
+<a name="id428937"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.plus">Plus</a>
 </h5>
<pre class="programlisting">+a
@@ -1764,7 +1764,7 @@
<pre class="programlisting">std::vector<char>
</pre>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute"></a><h5>
-<a name="id428880"></a>
+<a name="id429123"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute">Sequence
 Attribute</a>
 </h5>
@@ -1805,7 +1805,7 @@
 </td></tr>
</table></div>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing"></a><h5>
-<a name="id429202"></a>
+<a name="id429446"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing">Attribute
 Collapsing</a>
 </h5>
@@ -1837,7 +1837,7 @@
<pre class="programlisting">std::vector<char>
</pre>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.auto_rules"></a><h5>
-<a name="id429551"></a>
+<a name="id429795"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.auto_rules">Auto
 Rules</a>
 </h5>
@@ -1875,7 +1875,7 @@
 directly into the rule's attribute, in-situ.
 
<a name="spirit.qi.tutorials.employee___parsing_into_structs.finally"></a><h5>
-<a name="id429995"></a>
+<a name="id430240"></a>
 <a href="qi.html#spirit.qi.tutorials.employee___parsing_into_structs.finally">Finally</a>
 </h5>

@@ -1998,7 +1998,7 @@
 for testing purposes. "4.toyxml" has an error in it.
 
<a name="spirit.qi.tutorials.mini_xml___asts_.first_cut"></a><h5>
-<a name="id430902"></a>
+<a name="id431146"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.first_cut">First Cut</a>
 </h5>

@@ -2074,7 +2074,7 @@
 by the placeholder <tt class="computeroutput">_val</tt>).
 
<a name="spirit.qi.tutorials.mini_xml___asts_.alternates"></a><h5>
-<a name="id432502"></a>
+<a name="id432747"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.alternates">Alternates</a>
 </h5>
<pre class="programlisting">rule<Iterator, mini_xml_node(), space_type> node;
@@ -2104,7 +2104,7 @@
;
</pre>
<a name="spirit.qi.tutorials.mini_xml___asts_.not_predicate"></a><h5>
-<a name="id432964"></a>
+<a name="id433208"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.not_predicate">Not
 Predicate</a>
 </h5>
@@ -2131,7 +2131,7 @@
 at this point.
 
<a name="spirit.qi.tutorials.mini_xml___asts_.inherited_attribute"></a><h5>
-<a name="id433204"></a>
+<a name="id433449"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.inherited_attribute">Inherited
 Attribute</a>
 </h5>
@@ -2157,7 +2157,7 @@
 <tt class="computeroutput">_r3</tt>, etc. if you have more).
 
<a name="spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit"></a><h5>
-<a name="id433484"></a>
+<a name="id433728"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit">A Lazy
 Lit</a>
 </h5>
@@ -2191,7 +2191,7 @@
 accessors, provided by Phoenix.
 
<a name="spirit.qi.tutorials.mini_xml___asts_.how_it_all_works"></a><h5>
-<a name="id433963"></a>
+<a name="id434208"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.how_it_all_works">How
 it all works</a>
 </h5>
@@ -2238,7 +2238,7 @@
 as <tt class="computeroutput">_r1</tt>.
 
<a name="spirit.qi.tutorials.mini_xml___asts_.the_structures"></a><h5>
-<a name="id434407"></a>
+<a name="id434651"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.the_structures">The
 Structures</a>
 </h5>
@@ -2271,7 +2271,7 @@

 
<a name="spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants"></a><h5>
-<a name="id434675"></a>
+<a name="id434919"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants">Of
 Alternates and Variants</a>
 </h5>
@@ -2298,7 +2298,7 @@
 of <tt class="computeroutput">a</tt> and <tt class="computeroutput">B</tt> is the attribute of <tt class="computeroutput">b</tt>.
 
<a name="spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again"></a><h5>
-<a name="id434941"></a>
+<a name="id435186"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again">Adapting
 structs again</a>
 </h5>
@@ -2324,7 +2324,7 @@

 
<a name="spirit.qi.tutorials.mini_xml___asts_.one_more_take"></a><h5>
-<a name="id435139"></a>
+<a name="id435384"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.one_more_take">One
 More Take</a>
 </h5>
@@ -2393,7 +2393,7 @@
 in the <tt class="computeroutput">xml</tt> rule:
 
<a name="spirit.qi.tutorials.mini_xml___asts_.local_variables"></a><h5>
-<a name="id436383"></a>
+<a name="id436628"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___asts_.local_variables">Local
 Variables</a>
 </h5>
@@ -2459,7 +2459,7 @@
 What's new?
 
<a name="spirit.qi.tutorials.mini_xml___error_handling.readable_names"></a><h5>
-<a name="id436836"></a>
+<a name="id437081"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___error_handling.readable_names">Readable
 Names</a>
 </h5>
@@ -2478,7 +2478,7 @@
end_tag.name("end_tag");
</pre>
<a name="spirit.qi.tutorials.mini_xml___error_handling.on_error"></a><h5>
-<a name="id437087"></a>
+<a name="id437332"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___error_handling.on_error">On
 Error</a>
 </h5>
@@ -2616,7 +2616,7 @@
</tbody>
</table></div>
<a name="spirit.qi.tutorials.mini_xml___error_handling.expectation_points"></a><h5>
-<a name="id437758"></a>
+<a name="id438002"></a>
 <a href="qi.html#spirit.qi.tutorials.mini_xml___error_handling.expectation_points">Expectation
 Points</a>
 </h5>

Modified: trunk/libs/spirit/doc/html/spirit/qi/quick_reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/quick_reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/quick_reference.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -5,8 +5,8 @@
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
<meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
<link rel="home" href="../../index.html" title="Spirit 2.1">
-<link rel="up" href="../qi.html" title="Qi">
-<link rel="previous" href="../qi.html" title="Qi">
+<link rel="up" href="../qi.html" title=" Qi">
+<link rel="previous" href="../qi.html" title=" Qi">
<link rel="next" href="quick_reference/predefined_primitive_parsers.html" title="Predefined
Primitive Parsers">
</head>

Modified: trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/quick_reference/compound_attribute_rules.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -47,7 +47,7 @@
b</tt> will be <tt class="computeroutput">tuple<A, B></tt>.

<div class="table">
-<a name="id444103"></a>Table 4. compound parser attribute types
+<a name="id444347"></a>Table 4. compound parser attribute types
<table class="table" summary="compound parser attribute types">
<colgroup>
<col>

Modified: trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/quick_reference/phoenix.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -8,7 +8,7 @@
<link rel="up" href="../quick_reference.html" title="Quick Reference">
<link rel="previous" href="semantic_actions.html" title="Semantic
Actions">
-<link rel="next" href="../../karma.html" title="Karma">
+<link rel="next" href="../../karma.html" title=" Karma">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>

Modified: trunk/libs/spirit/doc/html/spirit/what_s_new.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/what_s_new.html (original)
+++ trunk/libs/spirit/doc/html/spirit/what_s_new.html 2009-06-15 23:59:00 EDT (Mon, 15 Jun 2009)
@@ -30,7 +30,7 @@
<div></div>
</div>
<a name="spirit.what_s_new.spirit_classic"></a><h3>
-<a name="id353522"></a>
+<a name="id353537"></a>
 <a href="what_s_new.html#spirit.what_s_new.spirit_classic">Spirit Classic</a>
 </h3>

@@ -69,11 +69,11 @@
 for existing applications.
 
<a name="spirit.what_s_new.spirit_v2_1"></a><h3>
-<a name="id353581"></a>
+<a name="id353664"></a>
 <a href="what_s_new.html#spirit.what_s_new.spirit_v2_1">Spirit V2.1</a>
 </h3>
<a name="spirit.what_s_new.what_s_changed_in__emphasis_spirit_qi__emphasis__and__emphasis_spirit_karma__emphasis__from_v2_0_to_2_x"></a><h3>
-<a name="id353605"></a>
+<a name="id353688"></a>
 <a href="what_s_new.html#spirit.what_s_new.what_s_changed_in__emphasis_spirit_qi__emphasis__and__emphasis_spirit_karma__emphasis__from_v2_0_to_2_x">What's
 changed in Spirit.Qi and Spirit.Karma
 from V2.0 to 2.x</a>
@@ -160,7 +160,7 @@
 </li>
</ul></div>
<a name="spirit.what_s_new.what_s_changed_in__emphasis_spirit_lex__emphasis__from_v2_0_to_2_x"></a><h3>
-<a name="id410199"></a>
+<a name="id410213"></a>
 <a href="what_s_new.html#spirit.what_s_new.what_s_changed_in__emphasis_spirit_lex__emphasis__from_v2_0_to_2_x">What's
 changed in Spirit.Lex from V2.0 to 2.x</a>
 </h3>

Next message: christian.schladetsch_at_[hidden]: "[Boost-commit] svn:boost r53965 - sandbox/monotonic/boost/monotonic"
Previous message: christian.schladetsch_at_[hidden]: "[Boost-commit] svn:boost r53963 - sandbox/monotonic/boost/monotonic"

Date view	Thread view	Subject view	Author view

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