|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r54718 - in trunk/libs/spirit/doc: . html html/spirit html/spirit/abstracts html/spirit/karma/quick_reference html/spirit/karma/tutorials html/spirit/lex html/spirit/lex/abstracts html/spirit/lex/abstracts/lexer_primitives html/spirit/lex/reference html/spirit/lex/reference/concepts html/spirit/lex/tutorials html/spirit/qi html/spirit/qi/quick_reference html/spirit/qi/reference html/spirit/qi/reference/string html/spirit/qi/tutorials karma qi
From: hartmut.kaiser_at_[hidden]
Date: 2009-07-06 14:57:02
Author: hkaiser
Date: 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
New Revision: 54718
URL: http://svn.boost.org/trac/boost/changeset/54718
Log:
Spirit: doc update
Added:
trunk/libs/spirit/doc/karma/concepts.qbk (contents, props changed)
Text files modified:
trunk/libs/spirit/doc/html/index.html | 9 ++++++---
trunk/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html | 8 ++++----
trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html | 10 +++++-----
trunk/libs/spirit/doc/html/spirit/acknowledgments.html | 2 +-
trunk/libs/spirit/doc/html/spirit/faq.html | 8 ++++----
trunk/libs/spirit/doc/html/spirit/introduction.html | 12 ++++++------
trunk/libs/spirit/doc/html/spirit/karma.html | 3 +++
trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html | 2 +-
trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html | 12 ++++++------
trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html | 2 +-
trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html | 2 +-
trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html | 10 +++++-----
trunk/libs/spirit/doc/html/spirit/lex.html | 6 +++---
trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html | 6 +++---
trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html | 14 +++++++-------
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 | 4 ++--
trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html | 6 +++---
trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.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 | 10 +++++-----
trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html | 16 ++++++++--------
trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html | 28 ++++++++++++++--------------
trunk/libs/spirit/doc/html/spirit/preface.html | 20 ++++++++++----------
trunk/libs/spirit/doc/html/spirit/qi.html | 2 +-
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 | 6 +++---
trunk/libs/spirit/doc/html/spirit/qi/reference.html | 8 ++++----
trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html | 10 +++++-----
trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html | 20 ++++++++++----------
trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html | 22 +++++++++++-----------
trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html | 14 +++++++-------
trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html | 22 +++++++++++-----------
trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html | 6 +++---
trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html | 2 +-
trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html | 8 ++++----
trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html | 2 +-
trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html | 10 +++++-----
trunk/libs/spirit/doc/html/spirit/what_s_new.html | 8 ++++----
trunk/libs/spirit/doc/karma.qbk | 9 +++------
trunk/libs/spirit/doc/qi/concepts.qbk | 18 +++++++++---------
trunk/libs/spirit/doc/spirit2.qbk | 8 +++++---
43 files changed, 198 insertions(+), 193 deletions(-)
Modified: trunk/libs/spirit/doc/html/index.html
==============================================================================
--- trunk/libs/spirit/doc/html/index.html (original)
+++ trunk/libs/spirit/doc/html/index.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -34,7 +34,7 @@
<div><p class="copyright">Copyright © 2001-2009 Joel
de Guzman, Hartmut Kaiser</p></div>
<div><div class="legalnotice" title="Legal Notice">
-<a name="id1052321"></a><p>
+<a name="id1027199"></a><p>
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
</p>
@@ -94,7 +94,7 @@
</dl></dd>
<dt><span class="section">Reference</span></dt>
<dd><dl>
-<dt><span class="section">Concepts</span></dt>
+<dt><span class="section">Parser Concepts</span></dt>
<dt><span class="section">Basics</span></dt>
<dt><span class="section">String</span></dt>
</dl></dd>
@@ -121,6 +121,9 @@
Actions</a></span></dt>
<dt><span class="section">Phoenix</span></dt>
</dl></dd>
+<dt><span class="section">Reference</span></dt>
+<dd><dl><dt><span class="section"><a href="spirit/karma/reference/generator_concepts.html">Generator
+ Concepts</a></span></dt></dl></dd>
</dl></dd>
<dt><span class="section"> Spirit.Lex</span></dt>
<dd><dl>
@@ -173,7 +176,7 @@
</p>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: July 06, 2009 at 13:14:00 GMT</small></p></td>
+<td align="left"><p><small>Last revised: July 06, 2009 at 18:53:30 GMT</small></p></td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -40,7 +40,7 @@
[Abstract Syntax Tree) for each PEG grammar.
</p>
<a name="spirit.abstracts.parsing_expression_grammar.sequences"></a><h5>
-<a name="id1061209"></a>
+<a name="id1036087"></a>
<a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.sequences">Sequences</a>
</h5>
<p>
@@ -81,7 +81,7 @@
</p></td></tr>
</table></div>
<a name="spirit.abstracts.parsing_expression_grammar.alternatives"></a><h5>
-<a name="id1061327"></a>
+<a name="id1036205"></a>
<a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.alternatives">Alternatives</a>
</h5>
<p>
@@ -124,7 +124,7 @@
about this $$$).
</p>
<a name="spirit.abstracts.parsing_expression_grammar.loops"></a><h5>
-<a name="id1061466"></a>
+<a name="id1036344"></a>
<a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.loops">Loops</a>
</h5>
<p>
@@ -187,7 +187,7 @@
We will see more of these other mechanisms shortly.
</p>
<a name="spirit.abstracts.parsing_expression_grammar.difference"></a><h5>
-<a name="id1061607"></a>
+<a name="id1036484"></a>
<a class="link" href="parsing_expression_grammar.html#spirit.abstracts.parsing_expression_grammar.difference">Difference</a>
</h5>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html (original)
+++ trunk/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -31,14 +31,14 @@
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
- <sup>[<a name="id1060798" href="#ftn.id1060798" class="footnote">2</a>]</sup>
+ <sup>[<a name="id1035676" href="#ftn.id1035676" class="footnote">2</a>]</sup>
in the "Pascal User Manual". Syntax Diagrams are easily understandable
with programmers due to its similarity to flow charts. The isomorphism of
the diagrams and functions make it ideal for representing [Recursive Descent
parsers which are essentially mutually recursive functions.
</p>
<a name="spirit.abstracts.syntax_diagram.elements"></a><h5>
-<a name="id1060810"></a>
+<a name="id1035688"></a>
<a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.elements">Elements</a>
</h5>
<p>
@@ -82,7 +82,7 @@
</p>
</blockquote></div>
<a name="spirit.abstracts.syntax_diagram.constructs"></a><h5>
-<a name="id1060909"></a>
+<a name="id1035787"></a>
<a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.constructs">Constructs</a>
</h5>
<p>
@@ -153,7 +153,7 @@
This behavior is quite obvious with syntax diagrams as they resemble flow-charts.
</p>
<a name="spirit.abstracts.syntax_diagram.predicates"></a><h5>
-<a name="id1061070"></a>
+<a name="id1035948"></a>
<a class="link" href="syntax_diagram.html#spirit.abstracts.syntax_diagram.predicates">Predicates</a>
</h5>
<p>
@@ -208,7 +208,7 @@
</p>
<div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id1060798" href="#id1060798" class="para">2</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1035676" href="#id1035676" class="para">2</a>] </sup>
Niklaus Wirth: The Programming Language Pascal. (July 1973)
</p></div>
</div>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -47,7 +47,7 @@
<span class="bold"><strong>FIXME</strong></span>: Add more people
</p>
<a name="spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation"></a><h4>
-<a name="id1147831"></a>
+<a name="id1126802"></a>
<a class="link" href="acknowledgments.html#spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation">Acknowledgements
from the Spirit V1 <span class="emphasis"><em>classic</em></span> Documentation</a>
</h4>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.faq"></a><a class="link" href="faq.html" title="Spirit FAQ"> Spirit FAQ</a>
</h2></div></div></div>
<a name="spirit.faq.i_m_getting_multiple_symbol_definition_errors_while_using_visual_c____anything_i_could_do_about_that_"></a><h4>
-<a name="id1146561"></a>
+<a name="id1125545"></a>
<a class="link" href="faq.html#spirit.faq.i_m_getting_multiple_symbol_definition_errors_while_using_visual_c____anything_i_could_do_about_that_">I'm
getting multiple symbol definition errors while using Visual C++. Anything
I could do about that?</a>
@@ -64,7 +64,7 @@
static_assert.
</p>
<a name="spirit.faq.i_m_very_confused_about_the_header_hell_in_my_boost_spirit_directory__what_s_all_this_about_"></a><h4>
-<a name="id1146731"></a>
+<a name="id1125716"></a>
<a class="link" 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>
@@ -161,9 +161,9 @@
directly, always include files from the boost/spirit/include directory.
</p>
<p>
- The last bit missing is Phoenix2
+ The last bit missing is Boost.Phoenix
(which currently still lives under the Spirit umbrella, but already has been
- accepted as a Boost library, so it will move away). Phoenix2
+ accepted as a Boost library, so it will move away). Boost.Phoenix
is a library allowing to write functional style C++, which is interesting on
itself, but as it initially has been developed for Spirit, it is nicely integrated
and very useful when it comes to writing semantic actions. I think using the
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -30,7 +30,7 @@
Boost Spirit is an object-oriented, recursive-descent parser and output generation
library for C++. It allows you to write grammars and format descriptions using
a format similar to Extended Backus Naur Form (EBNF)
- <sup>[<a name="id1057822" href="#ftn.id1057822" class="footnote">1</a>]</sup>
+ <sup>[<a name="id1032700" href="#ftn.id1032700" class="footnote">1</a>]</sup>
directly in C++. These inline grammar specifications can mix freely with other
C++ code and, thanks to the generative power of C++ templates, are immediately
executable. In retrospect, conventional compiler-compilers or parser-generators
@@ -131,7 +131,7 @@
<p><br class="figure-break">
</p>
<a name="spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_"></a><h4>
-<a name="id1058035"></a>
+<a name="id1032913"></a>
<a class="link" href="introduction.html#spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_">A
Quick Overview of Parsing with <span class="emphasis"><em>Spirit.Qi</em></span></a>
</h4>
@@ -221,7 +221,7 @@
<code class="computeroutput"><span class="special">;</span></code>.
</p>
<a name="spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_"></a><h4>
-<a name="id1058988"></a>
+<a name="id1033866"></a>
<a class="link" href="introduction.html#spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_">A
Quick Overview of Output Generation with <span class="emphasis"><em>Spirit.Karma</em></span></a>
</h4>
@@ -254,7 +254,7 @@
of the same <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special"><</span><span class="keyword">int</span><span class="special">></span></code>:
</p>
<div class="table">
-<a name="id1059329"></a><p class="title"><b>Table 2. Different output formats for `std::vector<int>`</b></p>
+<a name="id1034207"></a><p class="title"><b>Table 2. Different output formats for `std::vector<int>`</b></p>
<div class="table-contents"><table class="table" summary="Different output formats for `std::vector<int>`">
<colgroup>
<col>
@@ -369,7 +369,7 @@
next table gives some related examples.
</p>
<div class="table">
-<a name="id1059976"></a><p class="title"><b>Table 3. Different data types usable with the output format
+<a name="id1034854"></a><p class="title"><b>Table 3. Different data types usable with the output format
`*(int_ << eol)`</b></p>
<div class="table-contents"><table class="table" summary="Different data types usable with the output format
`*(int_ << eol)`">
@@ -439,7 +439,7 @@
</div>
<br class="table-break"><div class="footnotes">
<br><hr width="100" align="left">
-<div class="footnote"><p><sup>[<a name="ftn.id1057822" href="#id1057822" class="para">1</a>] </sup>
+<div class="footnote"><p><sup>[<a name="ftn.id1032700" href="#id1032700" class="para">1</a>] </sup>
<a href="http://www.cl.cam.ac.uk/%7Emgk25/iso-14977.pdf" target="_top">ISO-EBNF</a>
</p></div>
</div>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -47,6 +47,9 @@
Actions</a></span></dt>
<dt><span class="section">Phoenix</span></dt>
</dl></dd>
+<dt><span class="section">Reference</span></dt>
+<dd><dl><dt><span class="section"><a href="karma/reference/generator_concepts.html">Generator
+ Concepts</a></span></dt></dl></dd>
</dl></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/compound_attribute_rules.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -41,7 +41,7 @@
<span class="identifier">b</span></code> will be <code class="computeroutput"><span class="identifier">tuple</span><span class="special"><</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">></span></code>.
</p>
<div class="table">
-<a name="id1115097"></a><p class="title"><b>Table 5. Spirit.Karma compound generator attribute types</b></p>
+<a name="id1089888"></a><p class="title"><b>Table 5. Spirit.Karma compound generator attribute types</b></p>
<div class="table-contents"><table class="table" summary="Spirit.Karma compound generator attribute types">
<colgroup>
<col>
Modified: trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/quick_reference/phoenix.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -7,7 +7,7 @@
<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../quick_reference.html" title="Quick Reference">
<link rel="prev" href="semantic_actions.html" title="Semantic Actions">
-<link rel="next" href="../../lex.html" title="Spirit.Lex">
+<link rel="next" href="../reference.html" title="Reference">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,20 +20,20 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="semantic_actions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quick_reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../lex.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="semantic_actions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quick_reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" title="Phoenix">
<div class="titlepage"><div><div><h4 class="title">
<a name="spirit.karma.quick_reference.phoenix"></a><a class="link" href="phoenix.html" title="Phoenix">Phoenix</a>
</h4></div></div></div>
<p>
- Phoenix2 makes it
- easier to attach semantic actions. You just inline your lambda expressions:
+ Boost.Phoenix makes
+ it easier to attach semantic actions. You just inline your lambda expressions:
</p>
<pre class="programlisting"><span class="identifier">g</span><span class="special">[</span><span class="identifier">phoenix</span><span class="special">-</span><span class="identifier">lambda</span><span class="special">-</span><span class="identifier">expression</span><span class="special">]</span>
</pre>
<p>
- <span class="emphasis"><em>Spirit.Karma</em></span> provides some Phoenix2
+ <span class="emphasis"><em>Spirit.Karma</em></span> provides some Boost.Phoenix
placeholders to access important information from the <code class="computeroutput"><span class="identifier">Attr</span></code>
and <code class="computeroutput"><span class="identifier">Context</span></code> that are otherwise
fiddly to extract.
@@ -80,7 +80,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="semantic_actions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quick_reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../../lex.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="semantic_actions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../quick_reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="../reference.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/quick_start.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.karma.tutorials.quick_start"></a><a class="link" href="quick_start.html" title="Quick Start">Quick Start</a>
</h4></div></div></div>
<a name="spirit.karma.tutorials.quick_start.spirit_karma___what_s_that_"></a><h6>
-<a name="id1105394"></a>
+<a name="id1080300"></a>
<a class="link" href="quick_start.html#spirit.karma.tutorials.quick_start.spirit_karma___what_s_that_">Spirit.Karma
- what's that?</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/semantic_actions.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -247,7 +247,7 @@
The examples above can be found here: actions.cpp
</p>
<a name="spirit.karma.tutorials.semantic_actions.phoenix"></a><h6>
-<a name="id1107766"></a>
+<a name="id1082482"></a>
<a class="link" href="semantic_actions.html#spirit.karma.tutorials.semantic_actions.phoenix">Phoenix</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html (original)
+++ trunk/libs/spirit/doc/html/spirit/karma/tutorials/warming_up.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -31,7 +31,7 @@
We will start from trivial examples, ramping up as we go.
</p>
<a name="spirit.karma.tutorials.warming_up.trivial_example__1_generating_a_number"></a><h6>
-<a name="id1105509"></a>
+<a name="id1080416"></a>
<a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__1_generating_a_number">Trivial
Example #1 Generating a number</a>
</h6>
@@ -51,7 +51,7 @@
to a floating point generator or parser: <code class="computeroutput"><span class="identifier">double_</span></code>.
</p>
<a name="spirit.karma.tutorials.warming_up.trivial_example__2_generating_two_numbers"></a><h6>
-<a name="id1105552"></a>
+<a name="id1080459"></a>
<a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__2_generating_two_numbers">Trivial
Example #2 Generating two numbers</a>
</h6>
@@ -89,7 +89,7 @@
</p></td></tr>
</table></div>
<a name="spirit.karma.tutorials.warming_up.trivial_example__3_generating_one_or_more_numbers"></a><h6>
-<a name="id1105638"></a>
+<a name="id1080544"></a>
<a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__3_generating_one_or_more_numbers">Trivial
Example #3 Generating one or more numbers</a>
</h6>
@@ -114,7 +114,7 @@
numbers, if needed.
</p>
<a name="spirit.karma.tutorials.warming_up.trivial_example__4_generating_a_comma_delimited_list_of_numbers"></a><h6>
-<a name="id1105686"></a>
+<a name="id1080592"></a>
<a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.trivial_example__4_generating_a_comma_delimited_list_of_numbers">Trivial
Example #4 Generating a comma-delimited list of numbers</a>
</h6>
@@ -137,7 +137,7 @@
in the generated output zero or more times.
</p>
<a name="spirit.karma.tutorials.warming_up.let_s_generate_"></a><h6>
-<a name="id1105820"></a>
+<a name="id1080846"></a>
<a class="link" href="warming_up.html#spirit.karma.tutorials.warming_up.let_s_generate_">Let's
Generate!</a>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
<link rel="home" href="../index.html" title="Spirit 2.1">
<link rel="up" href="../index.html" title="Spirit 2.1">
-<link rel="prev" href="karma/quick_reference/phoenix.html" title="Phoenix">
+<link rel="prev" href="karma/reference/generator_concepts/narygenerator.html" title="NaryGenerator">
<link rel="next" href="lex/lexer_introduction.html" title="Introduction to Spirit.Lex">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="karma/quick_reference/phoenix.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="lex/lexer_introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="karma/reference/generator_concepts/narygenerator.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="lex/lexer_introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" title="Spirit.Lex">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
@@ -76,7 +76,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="karma/quick_reference/phoenix.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="lex/lexer_introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="karma/reference/generator_concepts/narygenerator.html"><img src="../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="lex/lexer_introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_primitives/lexer_token_values.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -51,7 +51,7 @@
of the <span class="emphasis"><em>Spirit.Lex</em></span> library.
</p>
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token"></a><h6>
-<a name="id1132747"></a>
+<a name="id1111654"></a>
<a class="link" href="lexer_token_values.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token">The
Anatomy of a Token</a>
</h6>
@@ -187,7 +187,7 @@
when it is requested for the first time.
</p>
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition"></a><h6>
-<a name="id1133272"></a>
+<a name="id1112180"></a>
<a class="link" href="lexer_token_values.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition">The
Physiognomy of a Token Definition</a>
</h6>
@@ -260,7 +260,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="id1133528"></a>
+<a name="id1113281"></a>
<a class="link" href="lexer_token_values.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 <a class="link" href="../../reference/token_class.html" title="Token Class"><code class="computeroutput"><span class="identifier">lexertl_token</span><span class="special"><></span></code></a></a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -105,7 +105,7 @@
<span class="keyword">void</span> <span class="identifier">f</span> <span class="special">();</span>
</pre>
<a name="spirit.lex.abstracts.lexer_semantic_actions.the_context_of_a_lexer_semantic_action"></a><h6>
-<a name="id1139177"></a>
+<a name="id1118151"></a>
<a class="link" href="lexer_semantic_actions.html#spirit.lex.abstracts.lexer_semantic_actions.the_context_of_a_lexer_semantic_action">The
context of a lexer semantic action</a>
</h6>
@@ -120,7 +120,7 @@
of the available functionality.
</p>
<div class="table">
-<a name="id1139197"></a><p class="title"><b>Table 6. Functions exposed by any context passed to a lexer
+<a name="id1118171"></a><p class="title"><b>Table 6. Functions exposed by any context passed to a lexer
semantic action</b></p>
<div class="table-contents"><table class="table" summary="Functions exposed by any context passed to a lexer
semantic action">
@@ -241,19 +241,19 @@
</table></div>
</div>
<br class="table-break"><a name="spirit.lex.abstracts.lexer_semantic_actions.lexer_semantic_actions_using_phoenix"></a><h6>
-<a name="id1139716"></a>
+<a name="id1118690"></a>
<a class="link" href="lexer_semantic_actions.html#spirit.lex.abstracts.lexer_semantic_actions.lexer_semantic_actions_using_phoenix">Lexer
Semantic Actions Using Phoenix</a>
</h6>
<p>
Even if it is possible to write your own function object implementations
(i.e. using Boost.Lambda or Boost.Bind), the preferred way of defining
- lexer semantic actions is to use Phoenix2.
+ lexer semantic actions is to use Boost.Phoenix.
In this case you can access the parameters described above by using the
predefined Spirit placeholders:
</p>
<div class="table">
-<a name="id1139738"></a><p class="title"><b>Table 7. Predefined Phoenix placeholders for lexer semantic
+<a name="id1118713"></a><p class="title"><b>Table 7. Predefined Phoenix placeholders for lexer semantic
actions</b></p>
<div class="table-contents"><table class="table" summary="Predefined Phoenix placeholders for lexer semantic
actions">
@@ -378,13 +378,13 @@
</div>
<br class="table-break"><p>
The context object passed as the last parameter to any lexer semantic action
- is not directly accessible while using Phoenix2
+ is not directly accessible while using Boost.Phoenix
expressions. We rather provide predefine Phoenix functions allowing to
invoke the different support functions as mentioned above. The following
table lists the available support functions and describes their functionality:
</p>
<div class="table">
-<a name="id1140017"></a><p class="title"><b>Table 8. Support functions usable from Phoenix expressions
+<a name="id1118991"></a><p class="title"><b>Table 8. Support functions usable from Phoenix expressions
inside lexer semantic actions</b></p>
<div class="table-contents"><table class="table" summary="Support functions usable from Phoenix expressions
inside lexer semantic actions">
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,17 +27,17 @@
<a name="spirit.lex.abstracts.lexer_states"></a><a class="link" href="lexer_states.html" title="Lexer States"> Lexer States</a>
</h4></div></div></div>
<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions"></a><h6>
-<a name="id1144473"></a>
+<a name="id1122466"></a>
<a class="link" 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>
</h6>
<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions"></a><h6>
-<a name="id1144486"></a>
+<a name="id1122479"></a>
<a class="link" 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>
</h6>
<a name="spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser"></a><h6>
-<a name="id1144499"></a>
+<a name="id1122492"></a>
<a class="link" 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>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -176,7 +176,7 @@
<p>
</p>
<a name="spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer"></a><h6>
-<a name="id1143146"></a>
+<a name="id1121019"></a>
<a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer">Generating
the Static Analyzer</a>
</h6>
@@ -225,7 +225,7 @@
the next topic (the full generated code can be viewed here).
</p>
<a name="spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer"></a><h6>
-<a name="id1143473"></a>
+<a name="id1121347"></a>
<a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer">Modifying
the Dynamic Analyzer</a>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -28,7 +28,7 @@
Input Data</a>
</h4></div></div></div>
<a name="spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function"></a><h6>
-<a name="id1134055"></a>
+<a name="id1113807"></a>
<a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_tokenize_function">The
tokenize function</a>
</h6>
@@ -228,7 +228,7 @@
</dl>
</div>
<a name="spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function"></a><h6>
-<a name="id1138524"></a>
+<a name="id1117529"></a>
<a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_generate_static_function">The
generate_static function</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/lexer_introduction.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -56,7 +56,7 @@
</li>
</ul></div>
<a name="spirit.lex.lexer_introduction.why_use_a_separate_lexer_"></a><h5>
-<a name="id1120499"></a>
+<a name="id1099240"></a>
<a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.why_use_a_separate_lexer_">Why
Use a Separate Lexer?</a>
</h5>
@@ -155,7 +155,7 @@
grammar recognizers.
</p>
<a name="spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id1120708"></a>
+<a name="id1099449"></a>
<a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_">Advantages
of using <span class="emphasis"><em>Spirit.Lex</em></span></a>
</h5>
@@ -203,7 +203,7 @@
application.
</p>
<a name="spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id1120811"></a>
+<a name="id1099552"></a>
<a class="link" href="lexer_introduction.html#spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_">The
Library Structure of <span class="emphasis"><em>Spirit.Lex</em></span></a>
</h5>
Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/concepts/lexer.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.lex.reference.concepts.lexer"></a><a class="link" href="lexer.html" title="Lexer">Lexer</a>
</h5></div></div></div>
<div class="table">
-<a name="id1144551"></a><p class="title"><b>Table 9. Regular expressions support</b></p>
+<a name="id1122544"></a><p class="title"><b>Table 9. Regular expressions support</b></p>
<div class="table-contents"><table class="table" summary="Regular expressions support">
<colgroup>
<col>
@@ -502,7 +502,7 @@
</p></td></tr>
</table></div>
<a name="spirit.lex.reference.concepts.lexer.regular_expression_precedence"></a><h6>
-<a name="id1146237"></a>
+<a name="id1124122"></a>
<a class="link" href="lexer.html#spirit.lex.reference.concepts.lexer.regular_expression_precedence">Regular
Expression Precedence</a>
</h6>
@@ -521,7 +521,7 @@
</li>
</ul></div>
<a name="spirit.lex.reference.concepts.lexer.macros"></a><h6>
-<a name="id1146340"></a>
+<a name="id1125325"></a>
<a class="link" href="lexer.html#spirit.lex.reference.concepts.lexer.macros">Macros</a>
</h6>
<p>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,22 +27,22 @@
<a name="spirit.lex.reference.lexer_class"></a><a class="link" href="lexer_class.html" title="Lexer Class">Lexer Class</a>
</h4></div></div></div>
<a name="spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"></a><h6>
-<a name="id1146462"></a>
+<a name="id1125447"></a>
<a class="link" 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>
</h6>
<a name="spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model"></a><h6>
-<a name="id1146476"></a>
+<a name="id1125460"></a>
<a class="link" 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>
</h6>
<a name="spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"></a><h6>
-<a name="id1146489"></a>
+<a name="id1125473"></a>
<a class="link" 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>
</h6>
<a name="spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model"></a><h6>
-<a name="id1146502"></a>
+<a name="id1125487"></a>
<a class="link" 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>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -39,7 +39,7 @@
(for the full example code see here: word_count_functor.cpp).
</p>
<a name="spirit.lex.tutorials.lexer_quickstart1.prerequisites"></a><h6>
-<a name="id1121080"></a>
+<a name="id1100681"></a>
<a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.prerequisites">Prerequisites</a>
</h6>
<p>
@@ -78,7 +78,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart1.defining_tokens"></a><h6>
-<a name="id1121325"></a>
+<a name="id1100926"></a>
<a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.defining_tokens">Defining
Tokens</a>
</h6>
@@ -133,7 +133,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work"></a><h6>
-<a name="id1121633"></a>
+<a name="id1101234"></a>
<a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work">Doing
the Useful Work</a>
</h6>
@@ -198,7 +198,7 @@
as well.
</p>
<a name="spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together"></a><h6>
-<a name="id1123717"></a>
+<a name="id1101733"></a>
<a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together">Pulling
Everything Together</a>
</h6>
@@ -251,7 +251,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_"></a><h6>
-<a name="id1124544"></a>
+<a name="id1102560"></a>
<a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_">Comparing
<span class="emphasis"><em>Spirit.Lex</em></span> with Flex</a>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -40,18 +40,18 @@
options along the lines (for the full example code see here: word_count_lexer.cpp).
</p>
<a name="spirit.lex.tutorials.lexer_quickstart2.prerequisites"></a><h6>
-<a name="id1125319"></a>
+<a name="id1105126"></a>
<a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.prerequisites">Prerequisites</a>
</h6>
<p>
In addition to the only required <code class="computeroutput"><span class="preprocessor">#include</span></code>
specific to <span class="emphasis"><em>Spirit.Lex</em></span> this example needs to include
- a couple of header files from the Phoenix2
+ a couple of header files from the Boost.Phoenix
library. This example shows how to attach functors to token definitions,
which could be done using any type of C++ technique resulting in a callable
- object. Using Phoenix2
+ object. Using Boost.Phoenix
for this task simplifies things and avoids adding dependencies to other
- libraries (Phoenix2
+ libraries (Boost.Phoenix
is already in use for Spirit
anyway).
</p>
@@ -114,7 +114,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_"></a><h6>
-<a name="id1127071"></a>
+<a name="id1105775"></a>
<a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_">Semantic
Actions in <span class="emphasis"><em>Spirit.Lex</em></span></a>
</h6>
@@ -166,14 +166,14 @@
similar to Flex, where
the action code associated with a token definition gets executed after
the recognition of a matching input sequence. The code above uses function
- objects constructed using Phoenix2,
+ objects constructed using Boost.Phoenix,
but it is possible to insert any C++ function or function object as long
as it exposes the proper interface. For more details on please refer to
the section <a class="link" href="../abstracts/lexer_semantic_actions.html" title="Lexer Semantic Actions">Lexer
Semantic Actions</a>.
</p>
<a name="spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer"></a><h6>
-<a name="id1127689"></a>
+<a name="id1106393"></a>
<a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer">Associating
Token Definitions with the Lexer</a>
</h6>
@@ -209,7 +209,7 @@
with the constant defined by <code class="computeroutput"><span class="identifier">boost</span><span class="special">::</span><span class="identifier">spirit</span><span class="special">::</span><span class="identifier">lex</span><span class="special">::</span><span class="identifier">min_token_id</span></code>.
</p>
<a name="spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together"></a><h6>
-<a name="id1127977"></a>
+<a name="id1106681"></a>
<a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.pulling_everything_together">Pulling
everything together</a>
</h6>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -65,7 +65,7 @@
code see here: word_count.cpp).
</p>
<a name="spirit.lex.tutorials.lexer_quickstart3.prerequisites"></a><h6>
-<a name="id1129790"></a>
+<a name="id1107821"></a>
<a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.prerequisites">Prerequisites</a>
</h6>
<p>
@@ -73,12 +73,12 @@
library components: <span class="emphasis"><em>Spirit.Lex</em></span> and <span class="emphasis"><em>Spirit.Qi</em></span>,
consequently we have to <code class="computeroutput"><span class="preprocessor">#include</span></code>
the corresponding header files. Again, we need to include a couple of header
- files from the Phoenix2
+ files from the Boost.Phoenix
library. This example shows how to attach functors to parser components,
which could be done using any type of C++ technique resulting in a callable
- object. Using Phoenix2
+ object. Using Boost.Phoenix
for this task simplifies things and avoids adding dependencies to other
- libraries (Phoenix2
+ libraries (Boost.Phoenix
is already in use for Spirit
anyway).
</p>
@@ -115,7 +115,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart3.defining_tokens"></a><h6>
-<a name="id1130221"></a>
+<a name="id1108252"></a>
<a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.defining_tokens">Defining
Tokens</a>
</h6>
@@ -168,7 +168,7 @@
<p>
</p>
<a name="spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers"></a><h6>
-<a name="id1130558"></a>
+<a name="id1108589"></a>
<a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers">Using
Token Definition Instances as Parsers</a>
</h6>
@@ -329,17 +329,17 @@
<tr><td align="left" valign="top"><p>
All placeholders (<code class="computeroutput"><span class="identifier">_1</span></code>,
<code class="computeroutput"><span class="identifier">_2</span></code>, etc.) used in <span class="emphasis"><em>parser</em></span>
- semantic actions in conjunction with functors created based on Phoenix2 need to be imported
- from the <code class="computeroutput"><span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">spirit</span><span class="special">::</span><span class="identifier">arg_names</span></code>
- (and <span class="bold"><strong>not</strong></span> <code class="computeroutput"><span class="keyword">namespace</span>
- <span class="identifier">boost</span><span class="special">::</span><span class="identifier">phoenix</span><span class="special">::</span><span class="identifier">arg_names</span></code>, which is different from
- using placeholders in <span class="emphasis"><em>Spirit.Lex</em></span>). Using the wrong
- placeholders leads to subtle compilation errors which are difficult to
- backtrack to their cause.
+ semantic actions in conjunction with functors created based on Boost.Phoenix need to
+ be imported from the <code class="computeroutput"><span class="keyword">namespace</span>
+ <span class="identifier">boost</span><span class="special">::</span><span class="identifier">spirit</span><span class="special">::</span><span class="identifier">arg_names</span></code> (and <span class="bold"><strong>not</strong></span>
+ <code class="computeroutput"><span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">phoenix</span><span class="special">::</span><span class="identifier">arg_names</span></code>,
+ which is different from using placeholders in <span class="emphasis"><em>Spirit.Lex</em></span>).
+ Using the wrong placeholders leads to subtle compilation errors which
+ are difficult to backtrack to their cause.
</p></td></tr>
</table></div>
<a name="spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together"></a><h6>
-<a name="id1131504"></a>
+<a name="id1110669"></a>
<a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together">Pulling
Everything Together</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/preface.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/preface.html (original)
+++ trunk/libs/spirit/doc/html/spirit/preface.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -41,11 +41,11 @@
</p>
</blockquote></div>
<a name="spirit.preface.history"></a><h4>
-<a name="id1052375"></a>
+<a name="id1027253"></a>
<a class="link" href="preface.html#spirit.preface.history">History</a>
</h4>
<a name="spirit.preface._emphasis_80s__emphasis_"></a><h4>
-<a name="id1052388"></a>
+<a name="id1027266"></a>
<a class="link" href="preface.html#spirit.preface._emphasis_80s__emphasis_"><span class="emphasis"><em>80s</em></span></a>
</h4>
<p>
@@ -59,7 +59,7 @@
parser. This worked very well.
</p>
<a name="spirit.preface._emphasis_90s__emphasis_"></a><h4>
-<a name="id1052406"></a>
+<a name="id1027284"></a>
<a class="link" href="preface.html#spirit.preface._emphasis_90s__emphasis_"><span class="emphasis"><em>90s</em></span></a>
</h4>
<p>
@@ -97,7 +97,7 @@
here: pre-Spirit.
</p>
<a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h4>
-<a name="id1052448"></a>
+<a name="id1027326"></a>
<a class="link" href="preface.html#spirit.preface._emphasis_2001_to_2006__emphasis_"><span class="emphasis"><em>2001
to 2006</em></span></a>
</h4>
@@ -127,7 +127,7 @@
for design and implementation quality, robustness, and reusability.
</p>
<a name="spirit.preface._emphasis_2007__emphasis_"></a><h4>
-<a name="id1052483"></a>
+<a name="id1027361"></a>
<a class="link" href="preface.html#spirit.preface._emphasis_2007__emphasis_"><span class="emphasis"><em>2007</em></span></a>
</h4>
<p>
@@ -152,7 +152,7 @@
types to values. Fusion is a direct descendant of both MPL and Boost.Tuples.
Fusion is now a full-fledged Boost
library. Phoenix also
- had to be beefed up to support Spirit V2. The result is Phoenix2.
+ had to be beefed up to support Spirit V2. The result is Boost.Phoenix.
Last but not least, Spirit V2 uses an <a href="http://ubiety.uwaterloo.ca/~tveldhui/papers/Expression-Templates/exprtmpl.html" target="_top">Expression
Templates</a> library called Boost.Proto.
</p>
@@ -164,7 +164,7 @@
gives you the right ingredients to create a sledgehammer easily.
</p>
<a name="spirit.preface.new_ideas__spirit_v2"></a><h4>
-<a name="id1052559"></a>
+<a name="id1027437"></a>
<a class="link" href="preface.html#spirit.preface.new_ideas__spirit_v2">New Ideas: Spirit V2</a>
</h4>
<p>
@@ -202,7 +202,7 @@
same underlying component library as for the parser and generator libraries.
</p>
<a name="spirit.preface.how_to_use_this_manual"></a><h4>
-<a name="id1052609"></a>
+<a name="id1027487"></a>
<a class="link" href="preface.html#spirit.preface.how_to_use_this_manual">How to use this manual</a>
</h4>
<p>
@@ -233,7 +233,7 @@
icons precede some text to indicate:
</p>
<div class="table">
-<a name="id1052662"></a><p class="title"><b>Table 1. Icons</b></p>
+<a name="id1027540"></a><p class="title"><b>Table 1. Icons</b></p>
<div class="table-contents"><table class="table" summary="Icons">
<colgroup>
<col>
@@ -354,7 +354,7 @@
Tools</a>.
</p>
<a name="spirit.preface.support"></a><h4>
-<a name="id1052903"></a>
+<a name="id1027781"></a>
<a class="link" href="preface.html#spirit.preface.support">Support</a>
</h4>
<p>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -63,7 +63,7 @@
</dl></dd>
<dt><span class="section">Reference</span></dt>
<dd><dl>
-<dt><span class="section">Concepts</span></dt>
+<dt><span class="section">Parser Concepts</span></dt>
<dt><span class="section">Basics</span></dt>
<dt><span class="section">String</span></dt>
</dl></dd>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -41,7 +41,7 @@
<span class="identifier">b</span></code> will be <code class="computeroutput"><span class="identifier">tuple</span><span class="special"><</span><span class="identifier">A</span><span class="special">,</span> <span class="identifier">B</span><span class="special">></span></code>.
</p>
<div class="table">
-<a name="id1090506"></a><p class="title"><b>Table 4. compound parser attribute types</b></p>
+<a name="id1065382"></a><p class="title"><b>Table 4. compound parser attribute types</b></p>
<div class="table-contents"><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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,13 +27,13 @@
<a name="spirit.qi.quick_reference.phoenix"></a><a class="link" href="phoenix.html" title="Phoenix">Phoenix</a>
</h4></div></div></div>
<p>
- Phoenix2 makes it
- easier to attach semantic actions. You just inline your lambda expressions:
+ Boost.Phoenix makes
+ it easier to attach semantic actions. You just inline your lambda expressions:
</p>
<pre class="programlisting"><span class="identifier">p</span><span class="special">[</span><span class="identifier">phoenix</span><span class="special">-</span><span class="identifier">lambda</span><span class="special">-</span><span class="identifier">expression</span><span class="special">]</span>
</pre>
<p>
- Spirit.Qi provides some Phoenix2
+ Spirit.Qi provides some Boost.Phoenix
placeholders to important information from the <code class="computeroutput"><span class="identifier">Attr</span></code>
and <code class="computeroutput"><span class="identifier">Context</span></code> that are otherwise
fiddly to extract.
Modified: trunk/libs/spirit/doc/html/spirit/qi/reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -7,7 +7,7 @@
<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../qi.html" title="Qi">
<link rel="prev" href="quick_reference/phoenix.html" title="Phoenix">
-<link rel="next" href="reference/concepts.html" title="Concepts">
+<link rel="next" href="reference/parser_concepts.html" title="Parser Concepts">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,14 +20,14 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="quick_reference/phoenix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="quick_reference/phoenix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/parser_concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" title="Reference">
<div class="titlepage"><div><div><h3 class="title">
<a name="spirit.qi.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
</h3></div></div></div>
<div class="toc"><dl>
-<dt><span class="section">Concepts</span></dt>
+<dt><span class="section">Parser Concepts</span></dt>
<dt><span class="section">Basics</span></dt>
<dt><span class="section">String</span></dt>
</dl></div>
@@ -43,7 +43,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="quick_reference/phoenix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="quick_reference/phoenix.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi.html"><img src="../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="reference/parser_concepts.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/basics.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../reference.html" title="Reference">
-<link rel="prev" href="concepts/naryparser.html" title="NaryParser">
+<link rel="prev" href="parser_concepts/naryparser.html" title="NaryParser">
<link rel="next" href="string.html" title="String">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,14 +20,14 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts/naryparser.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="string.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="parser_concepts/naryparser.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="string.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
<div class="section" title="Basics">
<div class="titlepage"><div><div><h4 class="title">
<a name="spirit.qi.reference.basics"></a><a class="link" href="basics.html" title="Basics">Basics</a>
</h4></div></div></div>
<a name="spirit.qi.reference.basics.lazy_argument"></a><h6>
-<a name="id1100886"></a>
+<a name="id1075861"></a>
<a class="link" href="basics.html#spirit.qi.reference.basics.lazy_argument">Lazy Argument</a>
</h6>
<p>
@@ -51,7 +51,7 @@
second argument. This is done for uniformity with Semantic Actions).
</p>
<a name="spirit.qi.reference.basics.character_encoding_namespace"></a><h6>
-<a name="id1101023"></a>
+<a name="id1075998"></a>
<a class="link" href="basics.html#spirit.qi.reference.basics.character_encoding_namespace">Character
Encoding Namespace</a>
</h6>
@@ -88,7 +88,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="concepts/naryparser.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="string.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
+<a accesskey="p" href="parser_concepts/naryparser.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../../../../../../doc/html/images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../../../../../doc/html/images/home.png" alt="Home"></a><a accesskey="n" href="string.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
</body>
</html>
Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/string/lit_string.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.qi.reference.string.lit_string"></a><a class="link" href="lit_string.html" title="lit/string">lit/string</a>
</h5></div></div></div>
<a name="spirit.qi.reference.string.lit_string.description"></a><h6>
-<a name="id1101183"></a>
+<a name="id1076157"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.description">Description</a>
</h6>
<p>
@@ -36,14 +36,14 @@
parser is not applied in between characters of the string.
</p>
<a name="spirit.qi.reference.string.lit_string.header"></a><h6>
-<a name="id1101207"></a>
+<a name="id1076181"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">home</span><span class="special">/</span><span class="identifier">qi</span><span class="special">/</span><span class="identifier">string</span><span class="special">/</span><span class="identifier">lit</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span> <span class="comment">// main include
</span><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">qi_lit</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span> <span class="comment">// or, forwarding header
</span></pre>
<a name="spirit.qi.reference.string.lit_string.module_headers"></a><h6>
-<a name="id1101336"></a>
+<a name="id1076311"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.module_headers">Module
Headers</a>
</h6>
@@ -56,7 +56,7 @@
Also, see <a class="link" href="../../../structure/include.html" title="Include">Include Structure</a>.
</p>
<a name="spirit.qi.reference.string.lit_string.model_of"></a><h6>
-<a name="id1101566"></a>
+<a name="id1076540"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.model_of">Model
of</a>
</h6>
@@ -64,7 +64,7 @@
<p>
</p>
<p>
- <a class="link" href="../concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>
+ <a class="link" href="../parser_concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>
</p>
<p>
</p>
@@ -91,13 +91,13 @@
</dl>
</div>
<a name="spirit.qi.reference.string.lit_string.expression_semantics"></a><h6>
-<a name="id1101701"></a>
+<a name="id1076676"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.expression_semantics">Expression
Semantics</a>
</h6>
<p>
Semantics of an expression is defined only where it differs from, or
- is not defined in <a class="link" href="../concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>.
+ is not defined in <a class="link" href="../parser_concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>.
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -201,7 +201,7 @@
</tbody>
</table></div>
<a name="spirit.qi.reference.string.lit_string.attributes"></a><h6>
-<a name="id1102052"></a>
+<a name="id1077026"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.attributes">Attributes</a>
</h6>
<div class="informaltable"><table class="table">
@@ -305,7 +305,7 @@
</tbody>
</table></div>
<a name="spirit.qi.reference.string.lit_string.complexity"></a><h6>
-<a name="id1102478"></a>
+<a name="id1077452"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.complexity">Complexity</a>
</h6>
<div class="blockquote"><blockquote class="blockquote">
@@ -322,7 +322,7 @@
of characters in the string to be parsed.
</p>
<a name="spirit.qi.reference.string.lit_string.example"></a><h6>
-<a name="id1102512"></a>
+<a name="id1077487"></a>
<a class="link" href="lit_string.html#spirit.qi.reference.string.lit_string.example">Example</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/reference/string/symbols.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.qi.reference.string.symbols"></a><a class="link" href="symbols.html" title="symbols">symbols</a>
</h5></div></div></div>
<a name="spirit.qi.reference.string.symbols.description"></a><h6>
-<a name="id1104224"></a>
+<a name="id1079130"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.description">Description</a>
</h6>
<p>
@@ -47,14 +47,14 @@
its behavior.
</p>
<a name="spirit.qi.reference.string.symbols.header"></a><h6>
-<a name="id1104259"></a>
+<a name="id1079165"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.header">Header</a>
</h6>
<pre class="programlisting"><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">home</span><span class="special">/</span><span class="identifier">qi</span><span class="special">/</span><span class="identifier">string</span><span class="special">/</span><span class="identifier">symbols</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span> <span class="comment">// main include
</span><span class="preprocessor">#include</span> <span class="special"><</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">spirit</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">qi_symbols</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">></span> <span class="comment">// or, forwarding header
</span></pre>
<a name="spirit.qi.reference.string.symbols.module_headers"></a><h6>
-<a name="id1104388"></a>
+<a name="id1079295"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.module_headers">Module
Headers</a>
</h6>
@@ -67,14 +67,14 @@
Also, see <a class="link" href="../../../structure/include.html" title="Include">Include Structure</a>.
</p>
<a name="spirit.qi.reference.string.symbols.synopsis"></a><h6>
-<a name="id1104618"></a>
+<a name="id1079524"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.synopsis">Synopsis</a>
</h6>
<pre class="programlisting"><span class="keyword">template</span> <span class="special"><</span><span class="keyword">typename</span> <span class="identifier">Char</span><span class="special">,</span> <span class="keyword">typename</span> <span class="identifier">T</span><span class="special">></span>
<span class="keyword">struct</span> <span class="identifier">symbols</span><span class="special">;</span>
</pre>
<a name="spirit.qi.reference.string.symbols.template_parameters"></a><h6>
-<a name="id1104682"></a>
+<a name="id1079589"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.template_parameters">Template
parameters</a>
</h6>
@@ -139,14 +139,14 @@
</tbody>
</table></div>
<a name="spirit.qi.reference.string.symbols.model_of"></a><h6>
-<a name="id1104810"></a>
+<a name="id1079716"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.model_of">Model of</a>
</h6>
<div class="blockquote"><blockquote class="blockquote">
<p>
</p>
<p>
- <a class="link" href="../concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>
+ <a class="link" href="../parser_concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>
</p>
<p>
</p>
@@ -187,13 +187,13 @@
</dl>
</div>
<a name="spirit.qi.reference.string.symbols.expression_semantics"></a><h6>
-<a name="id1105022"></a>
+<a name="id1079928"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.expression_semantics">Expression
Semantics</a>
</h6>
<p>
Semantics of an expression is defined only where it differs from, or
- is not defined in <a class="link" href="../concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>.
+ is not defined in <a class="link" href="../parser_concepts/primitiveparser.html" title="PrimitiveParser"><code class="computeroutput"><span class="identifier">PrimitiveParser</span></code></a>.
</p>
<div class="informaltable"><table class="table">
<colgroup>
@@ -279,14 +279,14 @@
</tbody>
</table></div>
<a name="spirit.qi.reference.string.symbols.attributes"></a><h6>
-<a name="id1105291"></a>
+<a name="id1080197"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.attributes">Attributes</a>
</h6>
<p>
The attribute of <code class="computeroutput"><span class="identifier">stymbol</span><span class="special"><</span><span class="identifier">Char</span><span class="special">,</span> <span class="identifier">T</span><span class="special">></span></code> is always <code class="computeroutput"><span class="identifier">T</span></code>.
</p>
<a name="spirit.qi.reference.string.symbols.example"></a><h6>
-<a name="id1105341"></a>
+<a name="id1080248"></a>
<a class="link" href="symbols.html#spirit.qi.reference.string.symbols.example">Example</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/employee___parsing_into_structs.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -179,7 +179,7 @@
has a <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">string</span></code> attribute.
</p>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.lexeme"></a><h6>
-<a name="id1075331"></a>
+<a name="id1050206"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.lexeme">Lexeme</a>
</h6>
<pre class="programlisting"><span class="identifier">lexeme</span><span class="special">[</span><span class="char">'"'</span> <span class="special">>></span> <span class="special">+(</span><span class="identifier">char_</span> <span class="special">-</span> <span class="char">'"'</span><span class="special">)</span> <span class="special">>></span> <span class="char">'"'</span><span class="special">];</span>
@@ -196,7 +196,7 @@
a double quote.
</p>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.difference"></a><h6>
-<a name="id1075444"></a>
+<a name="id1050319"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.difference">Difference</a>
</h6>
<p>
@@ -215,7 +215,7 @@
is just <code class="computeroutput"><span class="keyword">char</span></code>.
</p>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.plus"></a><h6>
-<a name="id1075552"></a>
+<a name="id1050427"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.plus">Plus</a>
</h6>
<pre class="programlisting"><span class="special">+</span><span class="identifier">a</span>
@@ -234,7 +234,7 @@
<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special"><</span><span class="keyword">char</span><span class="special">></span>
</pre>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute"></a><h6>
-<a name="id1075678"></a>
+<a name="id1050553"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.sequence_attribute">Sequence
Attribute</a>
</h6>
@@ -275,7 +275,7 @@
</p></td></tr>
</table></div>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing"></a><h6>
-<a name="id1075900"></a>
+<a name="id1050775"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.attribute_collapsing">Attribute
Collapsing</a>
</h6>
@@ -307,7 +307,7 @@
<pre class="programlisting"><span class="identifier">std</span><span class="special">::</span><span class="identifier">vector</span><span class="special"><</span><span class="keyword">char</span><span class="special">></span>
</pre>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.auto_rules"></a><h6>
-<a name="id1076139"></a>
+<a name="id1051014"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.auto_rules">Auto
Rules</a>
</h6>
@@ -345,7 +345,7 @@
directly into the rule's attribute, in-situ.
</p>
<a name="spirit.qi.tutorials.employee___parsing_into_structs.finally"></a><h6>
-<a name="id1076458"></a>
+<a name="id1051333"></a>
<a class="link" href="employee___parsing_into_structs.html#spirit.qi.tutorials.employee___parsing_into_structs.finally">Finally</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___asts_.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -69,7 +69,7 @@
for testing purposes. "4.toyxml" has an error in it.
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.first_cut"></a><h6>
-<a name="id1078540"></a>
+<a name="id1053415"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.first_cut">First Cut</a>
</h6>
<p>
@@ -145,7 +145,7 @@
by the placeholder <code class="computeroutput"><span class="identifier">_val</span></code>).
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.alternates"></a><h6>
-<a name="id1079721"></a>
+<a name="id1054596"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.alternates">Alternates</a>
</h6>
<pre class="programlisting"><span class="identifier">rule</span><span class="special"><</span><span class="identifier">Iterator</span><span class="special">,</span> <span class="identifier">mini_xml_node</span><span class="special">(),</span> <span class="identifier">space_type</span><span class="special">></span> <span class="identifier">node</span><span class="special">;</span>
@@ -175,7 +175,7 @@
<span class="special">;</span>
</pre>
<a name="spirit.qi.tutorials.mini_xml___asts_.not_predicate"></a><h6>
-<a name="id1080049"></a>
+<a name="id1054924"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.not_predicate">Not
Predicate</a>
</h6>
@@ -202,7 +202,7 @@
at this point.
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.inherited_attribute"></a><h6>
-<a name="id1080203"></a>
+<a name="id1055079"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.inherited_attribute">Inherited
Attribute</a>
</h6>
@@ -228,7 +228,7 @@
<code class="computeroutput"><span class="identifier">_r3</span></code>, etc. if you have more).
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit"></a><h6>
-<a name="id1080398"></a>
+<a name="id1055273"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.a_lazy_lit">A Lazy
Lit</a>
</h6>
@@ -262,7 +262,7 @@
accessors, provided by Phoenix.
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.how_it_all_works"></a><h6>
-<a name="id1080734"></a>
+<a name="id1055609"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.how_it_all_works">How
it all works</a>
</h6>
@@ -309,7 +309,7 @@
as <code class="computeroutput"><span class="identifier">_r1</span></code>.
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.the_structures"></a><h6>
-<a name="id1081030"></a>
+<a name="id1055905"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.the_structures">The
Structures</a>
</h6>
@@ -342,7 +342,7 @@
<p>
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants"></a><h6>
-<a name="id1081226"></a>
+<a name="id1056101"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.of_alternates_and_variants">Of
Alternates and Variants</a>
</h6>
@@ -369,7 +369,7 @@
of <code class="computeroutput"><span class="identifier">a</span></code> and <code class="computeroutput"><span class="identifier">B</span></code> is the attribute of <code class="computeroutput"><span class="identifier">b</span></code>.
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again"></a><h6>
-<a name="id1081406"></a>
+<a name="id1056281"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.adapting_structs_again">Adapting
structs again</a>
</h6>
@@ -395,7 +395,7 @@
<p>
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.one_more_take"></a><h6>
-<a name="id1081546"></a>
+<a name="id1056421"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.one_more_take">One
More Take</a>
</h6>
@@ -464,7 +464,7 @@
in the <code class="computeroutput"><span class="identifier">xml</span></code> rule:
</p>
<a name="spirit.qi.tutorials.mini_xml___asts_.local_variables"></a><h6>
-<a name="id1082462"></a>
+<a name="id1057337"></a>
<a class="link" href="mini_xml___asts_.html#spirit.qi.tutorials.mini_xml___asts_.local_variables">Local
Variables</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/mini_xml___error_handling.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -44,7 +44,7 @@
What's new?
</p>
<a name="spirit.qi.tutorials.mini_xml___error_handling.readable_names"></a><h6>
-<a name="id1083866"></a>
+<a name="id1058741"></a>
<a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.readable_names">Readable
Names</a>
</h6>
@@ -63,7 +63,7 @@
<span class="identifier">end_tag</span><span class="special">.</span><span class="identifier">name</span><span class="special">(</span><span class="string">"end_tag"</span><span class="special">);</span>
</pre>
<a name="spirit.qi.tutorials.mini_xml___error_handling.on_error"></a><h6>
-<a name="id1084046"></a>
+<a name="id1058921"></a>
<a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.on_error">On
Error</a>
</h6>
@@ -241,7 +241,7 @@
</tbody>
</table></div>
<a name="spirit.qi.tutorials.mini_xml___error_handling.expectation_points"></a><h6>
-<a name="id1084554"></a>
+<a name="id1059430"></a>
<a class="link" href="mini_xml___error_handling.html#spirit.qi.tutorials.mini_xml___error_handling.expectation_points">Expectation
Points</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/quick_start.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.qi.tutorials.quick_start"></a><a class="link" href="quick_start.html" title="Quick Start">Quick Start</a>
</h4></div></div></div>
<a name="spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_"></a><h6>
-<a name="id1061691"></a>
+<a name="id1036568"></a>
<a class="link" href="quick_start.html#spirit.qi.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_">Why
would you want to use Spirit.Qi?</a>
</h6>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/roman_numerals.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -41,7 +41,7 @@
</li>
</ul></div>
<a name="spirit.qi.tutorials.roman_numerals.symbol_table"></a><h6>
-<a name="id1069468"></a>
+<a name="id1044346"></a>
<a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.symbol_table">Symbol
Table</a>
</h6>
@@ -173,7 +173,7 @@
They are all parsers.
</p>
<a name="spirit.qi.tutorials.roman_numerals.rules"></a><h6>
-<a name="id1072473"></a>
+<a name="id1047344"></a>
<a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.rules">Rules</a>
</h6>
<p>
@@ -253,7 +253,7 @@
<pre class="programlisting"><span class="identifier">r</span> <span class="special">=</span> <span class="identifier">double_</span> <span class="special">>></span> <span class="special">*(</span><span class="char">','</span> <span class="special">>></span> <span class="identifier">double_</span><span class="special">);</span>
</pre>
<a name="spirit.qi.tutorials.roman_numerals.grammars"></a><h6>
-<a name="id1072866"></a>
+<a name="id1047736"></a>
<a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.grammars">Grammars</a>
</h6>
<p>
@@ -358,7 +358,7 @@
</li>
</ul></div>
<a name="spirit.qi.tutorials.roman_numerals.let_s_parse_"></a><h6>
-<a name="id1073593"></a>
+<a name="id1048464"></a>
<a class="link" href="roman_numerals.html#spirit.qi.tutorials.roman_numerals.let_s_parse_">Let's Parse!</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/semantic_actions.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -233,7 +233,7 @@
The examples above can be found here: ../../example/qi/actions.cpp
</p>
<a name="spirit.qi.tutorials.semantic_actions.phoenix"></a><h6>
-<a name="id1064070"></a>
+<a name="id1038948"></a>
<a class="link" href="semantic_actions.html#spirit.qi.tutorials.semantic_actions.phoenix">Phoenix</a>
</h6>
<p>
Modified: trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi/tutorials/warming_up.html 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -31,7 +31,7 @@
on how to build parsers from the simplest parser, building up as we go.
</p>
<a name="spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number"></a><h6>
-<a name="id1061736"></a>
+<a name="id1036614"></a>
<a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__1_parsing_a_number">Trivial
Example #1 Parsing a number</a>
</h6>
@@ -46,7 +46,7 @@
parsers and consistent naming conventions help you keep from going insane!
</p>
<a name="spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers"></a><h6>
-<a name="id1061765"></a>
+<a name="id1036643"></a>
<a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__2_parsing_two_numbers">Trivial
Example #2 Parsing two numbers</a>
</h6>
@@ -79,7 +79,7 @@
</p></td></tr>
</table></div>
<a name="spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers"></a><h6>
-<a name="id1061826"></a>
+<a name="id1036704"></a>
<a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers">Trivial
Example #3 Parsing one or more numbers</a>
</h6>
@@ -103,7 +103,7 @@
in most places.
</p>
<a name="spirit.qi.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers"></a><h6>
-<a name="id1061871"></a>
+<a name="id1036748"></a>
<a class="link" href="warming_up.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>
</h6>
@@ -126,7 +126,7 @@
star encloses the complete expression above.
</p>
<a name="spirit.qi.tutorials.warming_up.let_s_parse_"></a><h6>
-<a name="id1062191"></a>
+<a name="id1037069"></a>
<a class="link" href="warming_up.html#spirit.qi.tutorials.warming_up.let_s_parse_">Let's Parse!</a>
</h6>
<p>
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-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -27,7 +27,7 @@
<a name="spirit.what_s_new"></a><a class="link" href="what_s_new.html" title="What's New">What's New</a>
</h2></div></div></div>
<a name="spirit.what_s_new.spirit_classic"></a><h4>
-<a name="id1052956"></a>
+<a name="id1027834"></a>
<a class="link" href="what_s_new.html#spirit.what_s_new.spirit_classic">Spirit Classic</a>
</h4>
<p>
@@ -66,11 +66,11 @@
for existing applications.
</p>
<a name="spirit.what_s_new.spirit_v2_1"></a><h4>
-<a name="id1053147"></a>
+<a name="id1028025"></a>
<a class="link" href="what_s_new.html#spirit.what_s_new.spirit_v2_1">Spirit V2.1</a>
</h4>
<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><h4>
-<a name="id1053160"></a>
+<a name="id1028038"></a>
<a class="link" 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 <span class="emphasis"><em>Spirit.Qi</em></span> and <span class="emphasis"><em>Spirit.Karma</em></span>
from V2.0 to 2.x</a>
@@ -159,7 +159,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><h4>
-<a name="id1053712"></a>
+<a name="id1028590"></a>
<a class="link" 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 <span class="emphasis"><em>Spirit.Lex</em></span> from V2.0 to 2.x</a>
</h4>
Modified: trunk/libs/spirit/doc/karma.qbk
==============================================================================
--- trunk/libs/spirit/doc/karma.qbk (original)
+++ trunk/libs/spirit/doc/karma.qbk 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -18,11 +18,8 @@
[include karma/quick_reference.qbk]
[endsect]
-[/section Reference]
-[/section Concepts]
-[/include karma/parser.qbk]
-[/include karma/generator.qbk]
-[/endsect]
+[section Reference]
+[include karma/concepts.qbk]
[/include karma/char.qbk]
[/include karma/string.qbk]
[/include karma/numeric.qbk]
@@ -34,7 +31,7 @@
[/include karma/stream.qbk]
[/include karma/auxiliary.qbk]
[/include karma/debug.qbk]
-[/endsect]
+[endsect]
[endsect]
Added: trunk/libs/spirit/doc/karma/concepts.qbk
==============================================================================
--- (empty file)
+++ trunk/libs/spirit/doc/karma/concepts.qbk 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -0,0 +1,280 @@
+[/==============================================================================
+ Copyright (C) 2001-2009 Joel de Guzman
+ Copyright (C) 2001-2009 Hartmut Kaiser
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+===============================================================================/]
+
+[section Generator Concepts]
+
+__karma__ generators fall into a couple of generalized concepts. The
+/Generator/ is the most fundamental concept. All __karma__ generators are
+models of the /Generator/ concept. /PrimitiveGenerator/, /UnaryGenerator/,
+/BinaryGenerator/ and /NaryGenerator/ are all refinements of the /Generator/
+concept.
+
+The following sections provide details on these concepts.
+
+[/////////////////////////////////////////////////////////////////////////////]
+[section Generator]
+
+[heading Description]
+
+The /Generator/ is the most fundamental concept. A Generator has a member
+function, `generate`, that accepts an `OutputIterator` and
+returns bool as its result. The iterator receives the data being generated.
+The Generator's `generate` member function returns `true` if the generator
+succeeds. Each Generator can represent a specific pattern or algorithm, or it
+can be a more complex generator formed as a composition of other Generator's.
+
+[variablelist Notation
+ [[`g`] [A `Generator`.]]
+ [[`G`] [A `Generator` type.]]
+ [[`OutIter`] [An `OutputIterator` type.]]
+ [[`sink`] [An `OutputIterator` instance.]]
+ [[`Context`] [The generator's __context__ type.]]
+ [[`context`] [The generator's __context__, or __unused__.]]
+ [[`delimit`] [A delimiter Generator, or __unused__.]]
+ [[`attr`] [A __compatible_atribute__, or __unused__.]]
+]
+
+[heading Valid Expressions]
+
+In the expressions below, the behavior of the generator, `g`, as well as how
+`delimit` and `attr` are handled by `g`, are left unspecified in the base
+`Generator` concept. These are specified in subsequent, more refined concepts
+and by the actual models therof.
+
+For any Generator the following expressions must be valid:
+
+[table
+ [[Expression] [Semantics] [Return type]]
+ [[
+``g.generate(sink, context, delimit, attr)``]
+ [Generate the output sequence by inserting the
+ generated characters/tokens into `sink`. Use the
+ `delimit` generator for delimiting. Return
+ `true` if successful, otherwise
+ return `false`.] [`bool`]]
+ [[`g.what(context)`] [Get information about a Generator.] [__info__]]
+]
+
+[heading Type Expressions]
+
+[table
+ [[Expression] [Description]]
+ [[`G::template attribute<Context>::type`] [The Generator's attribute.]]
+ [[`traits::is_generator<G>::type`] [Metafunction that evaluates to `mpl::true_` if
+ a certain type, `G` is a Generator, `mpl::false_`
+ otherwise (See __mpl_boolean_constant__).]]
+]
+
+[heading Postcondition]
+
+Upon return from `g.generate` the following post conditions should hold:
+
+* On successful generation, `sink` received the generated characters/tokens
+ seqeunce.
+* No pre-delimits: `delimit` characters/tokens will not be emitted in front of
+ any other output.
+* The attribute `attr` has not been modified.
+
+[heading Models]
+
+All generators in __karma__ are models of the /Generator/ concept.
+
+[endsect] [/ Generator Concept]
+
+[/////////////////////////////////////////////////////////////////////////////]
+[section PrimitiveGenerator]
+
+[heading Description]
+
+/PrimitiveGenerator/ is the most basic building block that the client uses
+to build more complex generators.
+
+[heading Refinement of]
+
+[:__generator_concept__]
+
+[heading Post-delimit]
+
+Before exiting the `generate` member function, a PrimitiveGenerator is required
+to do a post-delimit. This will generate a single delimiting character/token
+sequence. Only PrimitiveGenerator's are required to perform this post-delimit.
+This is typically carried out through a call to `karma::delimit_out`:
+
+ karma::delimit_out(sink, delimit);
+
+[heading Type Expressions]
+
+[table
+ [[Expression] [Description]]
+ [[`traits::is_primitive_generator<G>::type`] [Metafunction that evaluates to `mpl::true_` if
+ a certain type, `G`, is a PrimitiveGenerator, `mpl::false_`
+ otherwise (See __mpl_boolean_constant__).]]
+]
+
+[heading Models]
+
+__fixme__ Add links to /PrimitiveGenerator/ models here.
+
+[endsect] [/ PrimitiveGenerator Concept]
+
+[/////////////////////////////////////////////////////////////////////////////]
+[section UnaryGenerator]
+
+[heading Description]
+
+/UnaryGenerator/ is a composite generator that has a single subject. The
+UnaryGenerator may change the behavior of its subject following the
+__delegate_pattern__.
+
+[heading Refinement of]
+
+[:__generator_concept__]
+
+[variablelist Notation
+ [[`g`] [A UnaryGenerator.]]
+ [[`G`] [A UnaryGenerator type.]]
+]
+
+[heading Valid Expressions]
+
+In addition to the requirements defined in __generator_concept__, for any
+UnaryGenerator the following must be met:
+
+[table
+ [[Expression] [Semantics] [Return type]]
+ [[`g.subject`] [Subject generator.] [__generator_concept__]]
+]
+
+[heading Type Expressions]
+
+[table
+ [[Expression] [Description]]
+ [[`G::subject_type`] [The subject generator type.]]
+ [[`traits::is_unary_generator<G>::type`] [Metafunction that evaluates to `mpl::true_` if
+ a certain type, `G` is a UnaryGenerator, `mpl::false_`
+ otherwise (See __mpl_boolean_constant__).]]
+]
+
+[heading Invariants]
+
+For any UnaryGenerator, `G`, the following invariants always hold:
+
+* `traits::is_generator<G::subject_type>::type` evaluates to `mpl::true_`
+
+[heading Models]
+
+__fixme__ Add links to models of UnaryGenerator concept
+
+[endsect] [/ UnaryGenerator Concept]
+
+[/////////////////////////////////////////////////////////////////////////////]
+[section BinaryGenerator]
+
+[heading Description]
+
+/BinaryGenerator/ is a composite parser that has a two subjects, `left` and
+`right`. The BinaryGenerator allows its subjects to be treated in the same
+way as a single instance of a __generator_concept__ following the
+__composite_pattern__.
+
+[heading Refinement of]
+
+[:__generator_concept__]
+
+[variablelist Notation
+ [[`g`] [A BinaryGenerator.]]
+ [[`G`] [A BinaryGenerator type.]]
+]
+
+[heading Valid Expressions]
+
+In addition to the requirements defined in __generator_concept__, for any
+BinaryGenerator the following must be met:
+
+[table
+ [[Expression] [Semantics] [Return type]]
+ [[`g.left`] [Left generator.] [__generator_concept__]]
+ [[`g.right`] [Right generator.] [__generator_concept__]]
+]
+
+[heading Type Expressions]
+
+[table
+ [[Expression] [Description]]
+ [[`G::left_type`] [The left parser type.]]
+ [[`G::right_type`] [The right parser type.]]
+ [[`traits::is_binary_generator<G>::type`] [Metafunction that evaluates to `mpl::true_` if
+ a certain type, `G` is a BinaryGenerator, `mpl::false_`
+ otherwise (See __mpl_boolean_constant__).]]
+]
+
+[heading Invariants]
+
+For any BinaryGenerator, `G`, the following invariants always hold:
+
+* `traits::is_generator<G::left_type>::type` evaluates to `mpl::true_`
+* `traits::is_generator<G::right_type>::type` evaluates to `mpl::true_`
+
+[heading Models]
+
+__fixme__ Add links to models of BinaryGenerator concept
+
+[endsect] [/ BinaryGenerator Concept]
+
+[/////////////////////////////////////////////////////////////////////////////]
+[section NaryGenerator]
+
+[heading Description]
+
+/NaryGenerator/ is a composite generator that has one or more subjects. The
+NaryGenerator allows its subjects to be treated in the same way as a single
+instance of a __generator_concept__ following the __composite_pattern__.
+
+[heading Refinement of]
+
+[:__generator_concept__]
+
+[variablelist Notation
+ [[`g`] [A NaryGenerator.]]
+ [[`G`] [A NaryGenerator type.]]
+]
+
+[heading Valid Expressions]
+
+In addition to the requirements defined in __generator_concept__, for any
+NaryGenerator the following must be met:
+
+[table
+ [[Expression] [Semantics] [Return type]]
+ [[`g.elements`] [The tuple of elements.] [A __fusion__ Sequence of __generator_concept__ types.]]
+]
+
+[heading Type Expressions]
+
+[table
+ [[Expression] [Description]]
+ [[`g.elements_type`] [Elements tuple type.]]
+ [[`traits::is_nary_generator<G>::type`] [Metafunction that evaluates to `mpl::true_` if
+ a certain type, `G` is a NaryGenerator, `mpl::false_`
+ otherwise (See __mpl_boolean_constant__).]]
+]
+
+[heading Invariants]
+
+For any NaryGenerator, `G`, the following invariants always holds:
+
+* For each element, `E`, in NaryGenerator, `G`, the following invariant always
+ hold: `traits::is_generator<E>::type` evaluates to `mpl::true_`
+
+[heading Models]
+
+__fixme__ Add links to models of NaryGenerator concept
+
+[endsect] [/ NaryGenerator Concept]
+
+[endsect]
Modified: trunk/libs/spirit/doc/qi/concepts.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi/concepts.qbk (original)
+++ trunk/libs/spirit/doc/qi/concepts.qbk 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -6,7 +6,7 @@
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
===============================================================================/]
-[section Concepts]
+[section Parser Concepts]
Spirit.Qi parsers fall into a couple of generalized concepts. The
/Parser/ is the most fundamental concept. All Spirit.Qi parsers are
@@ -122,7 +122,7 @@
[heading Models]
-Add links to /PrimitiveParser/ models here.
+__fixme__ Add links to /PrimitiveParser/ models here.
[endsect] [/ PrimitiveParser Concept]
@@ -172,7 +172,7 @@
[heading Models]
-Links to models of UnaryParser concept
+__fixme__ Add links to models of UnaryParser concept
[endsect] [/ UnaryParser Concept]
@@ -181,7 +181,7 @@
[heading Description]
-`BinaryParser` is a composite parser that has a two subjects, `left` and
+/BinaryParser/ is a composite parser that has a two subjects, `left` and
`right`. The BinaryParser allows its subjects to be treated in the same
way as a single instance of a __parser_concept__ following the
__composite_pattern__.
@@ -226,7 +226,7 @@
[heading Models]
-Links to models of BinaryParser concept
+__fixme__ Add links to models of BinaryParser concept
[endsect] [/ BinaryParser Concept]
@@ -235,7 +235,7 @@
[heading Description]
-`NaryParser` is a composite parser that has one or more subjects. The
+/NaryParser/ is a composite parser that has one or more subjects. The
NaryParser allows its subjects to be treated in the same way as a single
instance of a __parser_concept__ following the __composite_pattern__.
@@ -272,12 +272,12 @@
For any NaryParser, `P`, the following invariants always holds:
-* For each element, `E`, in NaryParser, `P`, the following invariant always hold:
-`` traits::is_parser<E>::type evaluates to `mpl::true_``
+* For each element, `E`, in NaryParser, `P`, the following invariant always
+ hold: `traits::is_parser<E>::type` evaluates to `mpl::true_`
[heading Models]
-Links to models of NaryParser concept
+__fixme__ Add links to models of NaryParser concept
[endsect] [/ NaryParser Concept]
Modified: trunk/libs/spirit/doc/spirit2.qbk
==============================================================================
--- trunk/libs/spirit/doc/spirit2.qbk (original)
+++ trunk/libs/spirit/doc/spirit2.qbk 2009-07-06 14:56:58 EDT (Mon, 06 Jul 2009)
@@ -26,7 +26,7 @@
[def __spirit__ [@http://spirit.sourceforge.net Spirit]]
[def __spirit_list__ [@http://www.nabble.com/The-Spirit-Parser-Library-f3430.html Spirit General List]]
[def __phoenix__ [@../../phoenix/doc/html/index.html Phoenix]]
-[def __boost_phoenix__ [@../../phoenix/doc/html/index.html Phoenix2]]
+[def __boost_phoenix__ [@../../phoenix/doc/html/index.html Boost.Phoenix]]
[def __fusion__ [@http://spirit.sourceforge.net/dl_more/fusion_v2/libs/fusion/doc/html/index.html Fusion]]
[def __mpl__ [@http://www.boost.org/libs/mpl/index.html Boost.Mpl]]
[def __boost__ [@http://www.boost.org/ Boost]]
@@ -121,11 +121,13 @@
[/ References to reference ]
-[def __parser_concept__ [link spirit.qi.reference.concepts.parser `Parser`]]
-[def __primitive_parser_concept__ [link spirit.qi.reference.concepts.primitiveparser `PrimitiveParser`]]
+[def __parser_concept__ [link spirit.qi.reference.parser_concepts.parser `Parser`]]
+[def __primitive_parser_concept__ [link spirit.qi.reference.parser_concepts.primitiveparser `PrimitiveParser`]]
[def __lazy_argument__ [link spirit.qi.reference.basics.lazy_argument Lazy Argument]]
[def __char_encoding_namespace__ [link spirit.qi.reference.basics.character_encoding_namespace Character Encoding Namespace]]
+[def __generator_concept__ [link spirit.karma.reference.generator_concepts.generator `Generator`]]
+
Character Encoding Namespace
[def __actions__ Semantic Actions] [/$$$ TODO: link me $$$]
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