Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r53099 - in trunk/libs/spirit/doc: . html html/spirit html/spirit/lex html/spirit/lex/abstracts html/spirit/lex/reference html/spirit/lex/tutorials html/spirit/notes html/spirit/qi_and_karma html/spirit/qi_and_karma/abstracts html/spirit/qi_and_karma/reference lex qi_and_karma reference/lex
From: hartmut.kaiser_at_[hidden]
Date: 2009-05-18 17:11:44

Author: hkaiser
Date: 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
New Revision: 53099
URL: http://svn.boost.org/trac/boost/changeset/53099

Log:
Spirit: fixed documentation generation errors
Removed:
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/error_handling.html
Text files modified:
   trunk/libs/spirit/doc/html/index.html | 119
   trunk/libs/spirit/doc/html/spirit/acknowledgments.html | 117
   trunk/libs/spirit/doc/html/spirit/faq.html | 15
   trunk/libs/spirit/doc/html/spirit/introduction.html | 260 +-
   trunk/libs/spirit/doc/html/spirit/lex.html | 91
   trunk/libs/spirit/doc/html/spirit/lex/abstracts.html | 189 +-
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html | 22
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html | 26
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_semantic_actions.html | 27
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_states.html | 45
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_static_model.html | 111
   trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_tokenizing.html | 46
   trunk/libs/spirit/doc/html/spirit/lex/quick_reference.html | 21
   trunk/libs/spirit/doc/html/spirit/lex/reference.html | 553 +++++++
   trunk/libs/spirit/doc/html/spirit/lex/reference/lexer_class.html | 49
   trunk/libs/spirit/doc/html/spirit/lex/reference/token_class.html | 15
   trunk/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html | 15
   trunk/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html | 15
   trunk/libs/spirit/doc/html/spirit/lex/tutorials.html | 59
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart1.html | 136
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart2.html | 145 -
   trunk/libs/spirit/doc/html/spirit/lex/tutorials/lexer_quickstart3.html | 205 +-
   trunk/libs/spirit/doc/html/spirit/notes.html | 23
   trunk/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html | 19
   trunk/libs/spirit/doc/html/spirit/notes/style_guide.html | 50
   trunk/libs/spirit/doc/html/spirit/notes/techniques.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma.html | 1265 ++++++++--------
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html | 21
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html | 16
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html | 16
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html | 16
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html | 132 -
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html | 22
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html | 58
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html | 59
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html | 16
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html | 19
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html | 2955 +++++++++++++++++++++++++++++++++++++++
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference.html | 60
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html | 15
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html | 13
   trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html | 13
   trunk/libs/spirit/doc/html/spirit/rationale.html | 15
   trunk/libs/spirit/doc/html/spirit/references.html | 15
   trunk/libs/spirit/doc/html/spirit/what_s_new.html | 173 ++
   trunk/libs/spirit/doc/lex/tokenizing.qbk | 6
   trunk/libs/spirit/doc/qi_and_karma/error_handling.qbk | 4
   trunk/libs/spirit/doc/qi_and_karma/quick_reference.qbk | 146
   trunk/libs/spirit/doc/reference/lex/lexer.qbk | 10
   trunk/libs/spirit/doc/spirit2.qbk | 2
   trunk/libs/spirit/doc/what_s_new.qbk | 8
   62 files changed, 5501 insertions(+), 2103 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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,10 +1,10 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Spirit 2.0</title>
+<title>Spirit 2.1</title>
<link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="index.html" title="Spirit 2.1">
<link rel="next" href="spirit/what_s_new.html" title="What's New">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -18,11 +18,11 @@
</tr></table>
<hr>
<div class="spirit-nav"><a accesskey="n" href="spirit/what_s_new.html"><img src="../../../../doc/html/images/next.png" alt="Next"></a></div>
-<div class="article" lang="en">
+<div class="article" title="Spirit 2.1">
<div class="titlepage">
<div>
<div><h2 class="title">
-<a name="spirit"></a>Spirit 2.0</h2></div>
+<a name="spirit"></a>Spirit 2.1</h2></div>
<div><div class="authorgroup">
<div class="author"><h3 class="author">
Joel de Guzman
@@ -31,10 +31,10 @@
Hartmut Kaiser
</h3></div>
</div></div>
-<div>Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser</div>
-<div><div class="legalnotice">
-<a name="id386666"></a>
+<div>Copyright © 2001-2009 Joel
+ de Guzman, Hartmut Kaiser</div>
+<div><div class="legalnotice" title="Legal Notice">
+<a name="id683678"></a>
 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)
 
@@ -166,31 +166,32 @@
<dt>References</dt>
</dl>
</div>
-<div class="section" lang="en">
+<div class="section" title="Preface">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.preface"></a>Preface</h2></div></div></div>
+<a name="spirit.preface"></a><a class="link" href="index.html#spirit.preface" title="Preface">Preface</a>
+</h2></div></div></div>
<div class="blockquote"><blockquote class="blockquote">

 

- “Examples of designs that meet most of the criteria for
+ “Examples of designs that meet most of the criteria for
 "goodness" (easy to understand, flexible, efficient) are a recursive-
 descent parser, which is traditional procedural code. Another example is
 the STL, which is a generic library of containers and algorithms depending
- crucially on both traditional procedural code and on parametric polymorphism.”
- --Bjarne Stroustrup
+ crucially on both traditional procedural code and on parametric polymorphism.”
+ --Bjarne Stroustrup
 

 
</blockquote></div>
-<a name="spirit.preface.history"></a><h3>
-<a name="id388764"></a>
- History
- </h3>
-<a name="spirit.preface._emphasis_80s__emphasis_"></a><h3>
-<a name="id386336"></a>
- 80s
- </h3>
+<a name="spirit.preface.history"></a><h4>
+<a name="id683729"></a>
+ <a class="link" href="index.html#spirit.preface.history">History</a>
+ </h4>
+<a name="spirit.preface._emphasis_80s__emphasis_"></a><h4>
+<a name="id683742"></a>
+ <a class="link" href="index.html#spirit.preface._emphasis_80s__emphasis_">80s</a>
+ </h4>

 In the Mid 80s, Joel wrote his first calculator in Pascal. It has been an unforgettable
 coding experience. He was amazed how a mutually recursive set of functions
@@ -201,10 +202,10 @@
 a grammar using Pascal- like syntax diagrams and then write a corresponding
 recursive-descent parser. This worked very well.
 
-<a name="spirit.preface._emphasis_90s__emphasis_"></a><h3>
-<a name="id386375"></a>
- 90s
- </h3>
+<a name="spirit.preface._emphasis_90s__emphasis_"></a><h4>
+<a name="id683760"></a>
+ <a class="link" href="index.html#spirit.preface._emphasis_90s__emphasis_">90s</a>
+ </h4>

 The arrival of the Internet and the World Wide Web magnified this thousand-fold.
 At one point Joel had to write an HTML parser for a Web browser project. He
@@ -245,11 +246,11 @@
 objects and linking semantic actions on the fly. A very early text can be found
 here: pre-Spirit.
 
-<a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h3>
-<a name="id388110"></a>
- <a href="index.html#spirit.preface._emphasis_2001_to_2006__emphasis_">2001
+<a name="spirit.preface._emphasis_2001_to_2006__emphasis_"></a><h4>
+<a name="id683802"></a>
+ <a class="link" href="index.html#spirit.preface._emphasis_2001_to_2006__emphasis_">2001
 to 2006</a>
- </h3>
+ </h4>

 Version 1.0 to 1.8 was a complete rewrite of the original Spirit parser using
 expression templates and static polymorphism, inspired by the works of Todd
@@ -275,13 +276,13 @@
 of domains. The Boost Libraries have become widely known as an industry standard
 for design and implementation quality, robustness, and reusability.
 
-<a name="spirit.preface._emphasis_2007__emphasis_"></a><h3>
-<a name="id387263"></a>
- 2007
- </h3>
+<a name="spirit.preface._emphasis_2007__emphasis_"></a><h4>
+<a name="id683837"></a>
+ <a class="link" href="index.html#spirit.preface._emphasis_2007__emphasis_">2007</a>
+ </h4>

 Over the years, especially after Spirit was accepted into Boost, Spirit has
- served its purpose quite admirably. The focus of what we'll now call Classic-Spirit (versions prior
+ served its purpose quite admirably. The focus of what we'll now call Classic-Spirit (versions prior
 to 2.0) was on transduction parsing where the input string is merely translated
 to an output string. A lot of parsers are of the transduction type. When the
 time came to add attributes to the parser library, it was done rather in an
@@ -303,12 +304,12 @@
 library). Phoenix also
 had to be beefed up to support Spirit V2. The result is Phoenix2.
 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-.
+ Templates</a> library called Boost.Proto.
 
-<a name="spirit.preface.new_ideas__spirit_v2"></a><h3>
-<a name="id387382"></a>
- New Ideas: Spirit V2
- </h3>
+<a name="spirit.preface.new_ideas__spirit_v2"></a><h4>
+<a name="id683909"></a>
+ <a class="link" href="index.html#spirit.preface.new_ideas__spirit_v2">New Ideas: Spirit V2</a>
+ </h4>

 Just before the development of Spirit V2 began, Hartmut came across the StringTemplate library which is
 a part of the ANTLR parser framework. It is a Java template engine (with ports
@@ -343,27 +344,27 @@
 parser grammars. Again, Spirit's modular structure allowed us to reuse the
 same underlying component library as for the parser and generator libraries.
 
-<a name="spirit.preface.how_to_use_this_manual"></a><h3>
-<a name="id387485"></a>
- How to use this manual
- </h3>
+<a name="spirit.preface.how_to_use_this_manual"></a><h4>
+<a name="id683959"></a>
+ <a class="link" href="index.html#spirit.preface.how_to_use_this_manual">How to use this manual</a>
+ </h4>

- Each major section (there are two: <a href="spirit/qi_and_karma.html" title="Qi and Karma">Qi and
- Karma</a>, and Lex) is roughly divided
+ Each major section (there are two: <a class="link" href="spirit/qi_and_karma.html" title="Qi and Karma">Qi and
+ Karma</a>, and <a class="link" href="spirit/lex.html" title="Spirit.Lex">Lex</a>) is roughly divided
 into 3 parts:
 
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 Tutorials: A step by step guide with heavily annotated code. These are meant
 to get the user acquainted with the library as quickly as possible. The objective
 is to build the confidence of the user in using the library using abundant
 examples and detailed instructions. Examples speak volumes.
 </li>
-<li>
+<li class="listitem">
 Abstracts: A high level summary of key topics. The objective is to give the
 user a high level view of the library, the key concepts, background and theories.
 </li>
-<li>
+<li class="listitem">
 Reference: Detailed formal technical reference. We start with a quick reference
 -- an easy to use table that maps into the reference proper. The reference
 proper starts with C++ Concepts
@@ -375,8 +376,8 @@
 icons precede some text to indicate:
 
<div class="table">
-<a name="id387571"></a>Table 1. Icons
-<table class="table" summary="Icons">
+<a name="id684007"></a>Table 1. Icons
+<div class="table-contents"><table class="table" summary="Icons">
<colgroup>
<col>
<col>
@@ -488,17 +489,17 @@
 </td>
</tr>
</tbody>
-</table>
+</table></div>
</div>
-
+ 
 This documentation is automatically generated by Boost QuickBook documentation
 tool. QuickBook can be found in the <a href="http://www.boost.org/tools/index.html" target="_top">Boost
 Tools</a>.
 
-<a name="spirit.preface.support"></a><h3>
-<a name="id386631"></a>
- Support
- </h3>
+<a name="spirit.preface.support"></a><h4>
+<a name="id684248"></a>
+ <a class="link" href="index.html#spirit.preface.support">Support</a>
+ </h4>

 Please direct all questions to Spirit's mailing list. You can subscribe to
 the <a href="http://www.nabble.com/The-Spirit-Parser-Library-f3430.html" target="_top">Spirit
@@ -512,7 +513,7 @@
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: December 23, 2008 at 09:37:55 GMT</td>
+<td align="left">Last revised: May 18, 2009 at 21:08:21 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Acknowledgments</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="rationale.html" title="Rationale">
<link rel="next" href="references.html" title="References">
</head>
@@ -22,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="rationale.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="references.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Acknowledgments">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.acknowledgments"></a>Acknowledgments</h2></div></div></div>
+<a name="spirit.acknowledgments"></a><a class="link" href="acknowledgments.html" title="Acknowledgments">Acknowledgments</a>
+</h2></div></div></div>

 This version of Spirit is a complete rewrite of the classic
 Spirit many people have been contributing to (see below). But there are a couple
@@ -32,52 +33,52 @@
 would like to express our special acknowledgement to:
 

- Eric Niebler for writing Boost.Proto, without
+ Eric Niebler for writing Boost.Proto, without
 which this rewrite wouldn't have been possible, and helping with examples,
 advices, and suggestions on how to use Boost.Proto in the best possible way.
 

- Ben Hanson for providing us with an early
+ Ben Hanson for providing us with an early
 version of his Lexertl library, which is proposed to be included into Boost
 (as Boost.Lexer), but at the time of this writing the Boost review for this
 library is still pending.
 

- FIXME: Add more people
+ FIXME: Add more people
 
-<a name="spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation"></a><h3>
-<a name="id506650"></a>
- <a href="acknowledgments.html#spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation">Acknowledgements
+<a name="spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation"></a><h4>
+<a name="id750416"></a>
+ <a class="link" href="acknowledgments.html#spirit.acknowledgments.acknowledgements_from_the_spirit_v1__emphasis_classic__emphasis__documentation">Acknowledgements
 from the Spirit V1 classic Documentation</a>
- </h3>
+ </h4>

 Special thanks for working on Spirit classic to:
 

- Dan Nuffer for his work on lexers, parse trees,
+ Dan Nuffer for his work on lexers, parse trees,
 ASTs, XML parsers, the multi-pass iterator as well as administering Spirit's
 site, editing, maintaining the CVS and doing the releases plus a zillion of
 other chores that were almost taken for granted.
 

- Hartmut Kaiser for his work on the C parser,
+ Hartmut Kaiser for his work on the C parser,
 the work on the C/C++ preprocessor, utility parsers, the original port to Intel
 5.0, various work on Phoenix, porting to v1.5, the meta-parsers, the grouping-parsers,
 extensive testing and painstaking attention to details.
 

- Martin Wille who improved grammar multi thread
+ Martin Wille who improved grammar multi thread
 safety, contributed the eol_p parser, the dynamic parsers, documentation and
 for taking an active role in almost every aspect from brainstorming and design
 to coding. And, as always, helps keep the regression tests for g++ on Linux
 as green as ever :-).
 

- Martijn W. Van Der Lee our Web site administrator
+ Martijn W. Van Der Lee our Web site administrator
 and for contributing the RFC821 parser.
 

- Giovanni Bajo for last minute tweaks of Spirit
+ Giovanni Bajo for last minute tweaks of Spirit
 1.8.0 for CodeWarrior 8.3. Actually, I'm ashamed Giovanni was not in this list
 already. He's done a lot since Spirit 1.5, the first Boost.Spirit release.
 He's instrumental in the porting of the Spirit iterators stuff to the new Boost
@@ -85,107 +86,107 @@
 tests here and there.
 

- Juan Carlos Arevalo-Baeza (JCAB)* for his
+ Juan Carlos Arevalo-Baeza (JCAB)* for his
 work on the C++ parser, the position iterator, ports to v1.5 and keeping the
 mailing list discussions alive and kicking.
 

- Vaclav Vesely, lots of stuff, the no_actions
+ Vaclav Vesely, lots of stuff, the no_actions
 directive, various patches fixes, the distinct parsers, the lazy parser, some
 phoenix tweaks and add-ons (e.g. new_). Also, *Stefan Slapeta] and wife for
 editing Vaclav's distinct parser doc.
 

- Raghavendra Satish for doing the original
+ Raghavendra Satish for doing the original
 v1.3 port to VC++ and his work on Phoenix.
 

- Noah Stein for following up and helping Ragav
+ Noah Stein for following up and helping Ragav
 on the VC++ ports.
 

- Hakki Dogusan, for his original v1.0 Pascal
+ Hakki Dogusan, for his original v1.0 Pascal
 parser.
 

- John (EBo) David for his work on the VM and
+ John (EBo) David for his work on the VM and
 watching over my shoulder as I code giving the impression of distance eXtreme
 programming.
 

- Chris Uzdavinis for feeding in comments and
+ Chris Uzdavinis for feeding in comments and
 valuable suggestions as well as editing the documentation.
 

- Carsten Stoll, for his work on dynamic parsers.
+ Carsten Stoll, for his work on dynamic parsers.
 

- Andy Elvey and his conifer parser.
+ Andy Elvey and his conifer parser.
 

- Bruce Florman, who did the original v1.0 port
+ Bruce Florman, who did the original v1.0 port
 to VC++.
 

- Jeff Westfahl for porting the loop parsers
+ Jeff Westfahl for porting the loop parsers
 to v1.5 and contributing the file iterator.
 

- Peter Simons for the RFC date parser example
+ Peter Simons for the RFC date parser example
 and tutorial plus helping out with some nitty gritty details.
 

- Markus Schöpflin for suggesting the end_p parser
+ Markus Schöpflin for suggesting the end_p parser
 and lots of other nifty things and his active presence in the mailing list.
 

- Doug Gregor for mentoring and his ability
+ Doug Gregor for mentoring and his ability
 to see things that others don't.
 

- David Abrahams for giving Joel a job that
+ David Abrahams for giving Joel a job that
 allows him to still work on Spirit, plus countless advice and help on C++ and
 specifically template metaprogramming.
 

- Aleksey Gurtovoy for his MPL library from
+ Aleksey Gurtovoy for his MPL library from
 which we stole many metaprogramming tricks especially for less conforming compilers
 such as Borland and VC6/7.
 

- Gustavo Guerra for his last minute review
+ Gustavo Guerra for his last minute review
 of Spirit and constant feedback, plus patches here and there (e.g. proposing
 the new dot behavior of the real numerics parsers).
 

- Nicola Musatti, Paul
- Snively, Alisdair Meredith and
- Hugo Duncan for testing and sending in various
+ Nicola Musatti, Paul
+ Snively, Alisdair Meredith and
+ Hugo Duncan for testing and sending in various
 patches.
 

- Steve Rowe for his splendid work on the TSTs
+ Steve Rowe for his splendid work on the TSTs
 that will soon be taken into Spirit.
 

- Jonathan de Halleux for his work on actors.
+ Jonathan de Halleux for his work on actors.
 

- Angus Leeming for last minute editing work
+ Angus Leeming for last minute editing work
 on the 1.8.0 release documentation, his work on Phoenix and his active presence
 in the Spirit mailing list.
 

- Joao Abecasis for his active presence in the
+ Joao Abecasis for his active presence in the
 Spirit mailing list, providing user support, participating in the discussions
 and so on.
 

- Guillaume Melquiond for a last minute patch
+ Guillaume Melquiond for a last minute patch
 to multi_pass for 1.8.1.
 

- Peder Holt for his porting work on Phoenix,
+ Peder Holt for his porting work on Phoenix,
 Fusion and Spirit to VC6.
 

@@ -202,19 +203,19 @@
 in the review:
 

- John Maddock, our review manager, Aleksey Gurtovoy, Andre Hentz,
- Beman Dawes, Carl Daniel,
- Christopher Currie, Dan
- Gohman, Dan Nuffer, Daryle
- Walker, David Abrahams, David B. Held, Dirk Gerrits,
- Douglas Gregor, Hartmut
- Kaiser, Iain K.Hanson, Juan Carlos Arevalo-Baeza, Larry
- Evans, Martin Wille, Mattias Flodin, Noah Stein,
- Nuno Lucas, Peter Dimov,
- Peter Simons, Petr Kocmid,
- Ross Smith, Scott Kirkwood,
- Steve Cleary, Thorsten
- Ottosen, Tom Wenisch, Vladimir Prus
+ John Maddock, our review manager, Aleksey Gurtovoy, Andre Hentz,
+ Beman Dawes, Carl Daniel,
+ Christopher Currie, Dan
+ Gohman, Dan Nuffer, Daryle
+ Walker, David Abrahams, David B. Held, Dirk Gerrits,
+ Douglas Gregor, Hartmut
+ Kaiser, Iain K.Hanson, Juan Carlos Arevalo-Baeza, Larry
+ Evans, Martin Wille, Mattias Flodin, Noah Stein,
+ Nuno Lucas, Peter Dimov,
+ Peter Simons, Petr Kocmid,
+ Ross Smith, Scott Kirkwood,
+ Steve Cleary, Thorsten
+ Ottosen, Tom Wenisch, Vladimir Prus
 

 Finally thanks to SourceForge for hosting the Spirit project and Boost: a C++
@@ -224,8 +225,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>FAQ</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="lex/reference/tokenset_class.html" title="TokenSet Class">
<link rel="next" href="notes.html" title="Notes">
</head>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="lex/reference/tokenset_class.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="notes.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.faq"></a>FAQ</h2></div></div></div></div>
+<div class="section" title="FAQ"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="spirit.faq"></a><a class="link" href="faq.html" title="FAQ">FAQ</a>
+</h2></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Introduction</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="what_s_new.html" title="What's New">
<link rel="next" href="qi_and_karma.html" title="Qi and Karma">
</head>
@@ -22,100 +22,93 @@
<div class="spirit-nav">
<a accesskey="p" href="what_s_new.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="qi_and_karma.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Introduction">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.introduction"></a>Introduction</h2></div></div></div>
+<a name="spirit.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
+</h2></div></div></div>

- 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 EBNF (Extended Backus Naur Form, see [4]) 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 have to
- perform an additional translation step from the source EBNF code to C or C++
- code.
- 
-
- The syntax and semantics of the libraries' API directly form domain-specific
- embedded languages (DSEL). In fact, Spirit exposes 3 different DSELs to the
- user:
- 
-<div class="itemizedlist"><ul type="disc">
-<li>
- one for creating parser grammars,
- </li>
-<li>
- one for the specification of the required tokens to be used for parsing,
- </li>
-<li>
- and one for the description of the required output formats.
- </li>
+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 EBNF (Extended Backus Naur Form, see [4]) 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 have to
+perform an additional translation step from the source EBNF code to C or C++
+code.
+
+The syntax and semantics of the libraries' API directly form domain-specific
+embedded languages (DSEL). In fact, Spirit exposes 3 different DSELs to the
+user:
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+one for creating parser grammars,
+</li>
+<li class="listitem">
+one for the specification of the required tokens to be used for parsing,
+</li>
+<li class="listitem">
+and one for the description of the required output formats.
+</li>
</ul></div>

- Since the target input grammars and output formats are written entirely in
- C++ we do not need any separate tools to compile, preprocess or integrate those
- into the build process. Spirit
- allows seamless integration of the parsing and output generation process with
- other C++ code. Often this allows for simpler and more efficient code.
- 
-
- Both the created parsers and generators are fully attributed which allows you
- to easily build and handle hierarchical data structures in memory. These data
- structures resemble the structure of the input data and can directly be used
- to generate arbitrarily-formatted output.
- 
-
- The figure below depicts the
- overall structure of the Boost Spirit library. The library consists of 4 major
- parts:
- 
-<div class="itemizedlist"><ul type="disc">
-<li>
-Spirit.Classic: This is the almost-unchanged code base
- taken from the former Boost Spirit V1.8 distribution. It has been moved into
- the namespace boost::spirit::classic. A special compatibility layer has been
- added to ensure complete compatibility with existing code using Spirit V1.8.
- </li>
-<li>
-Spirit.Qi: This is the parser library allowing you to
- build recursive descent parsers. The exposed domain-specific language can
- be used to describe the grammars to implement, and the rules for storing
- the parsed information.
- </li>
-<li>
-Spirit.Lex: This is the library usable to create tokenizers
- (lexers). The domain-specific language exposed by Spirit.Lex
+Since the target input grammars and output formats are written entirely in C++
+we do not need any separate tools to compile, preprocess or integrate those
+into the build process. Spirit allows seamless integration of the parsing
+and output generation process with other C++ code. Often this allows for
+simpler and more efficient code.
+
+Both the created parsers and generators are fully attributed which allows you to
+easily build and handle hierarchical data structures in memory. These data
+structures resemble the structure of the input data and can directly be used to
+generate arbitrarily-formatted output.
+
+The <a class="link" href="introduction.html#spirit.spiritstructure" title="Figure 1. The overall structure of the Boost Spirit library">figure</a> below depicts the overall structure
+of the Boost Spirit library. The library consists of 4 major parts:
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+Spirit.Classic: This is the almost-unchanged code base taken from the
+ former Boost Spirit V1.8 distribution. It has been moved into the namespace
+ boost::spirit::classic. A special compatibility layer has been added to
+ ensure complete compatibility with existing code using Spirit V1.8.
+</li>
+<li class="listitem">
+Spirit.Qi: This is the parser library allowing you to build recursive
+ descent parsers. The exposed domain-specific language can be used to describe
+ the grammars to implement, and the rules for storing the parsed information.
+</li>
+<li class="listitem">
+Spirit.Lex: This is the library usable to create tokenizers (lexers). The
+ domain-specific language exposed by Spirit.Lex
+</li>
+<li class="listitem">
+Spirit.Karma: This is the generator library allowing you to create code for
+ recursive descent, data type-driven output formatting. The exposed
+ domain-specific language is almost equivalent to the parser description language
+ used in Spirit.Qi, except that it is used to describe the required output
+ format to generate from a given data structure.
</li>
-<li>
-Spirit.Karma: This is the generator library allowing
- you to create code for recursive descent, data type-driven output formatting.
- The exposed domain-specific language is almost equivalent to the parser description
- language used in Spirit.Qi, except that it is used to
- describe the required output format to generate from a given data structure.
- </li>
</ul></div>

- 
+ 
<div class="figure">
-<a name="spirit.spiritstructure"></a>Figure 1. The overall structure of the Boost Spirit library
-<img src=".././images/spiritstructure.png" alt="The
- overall structure of the Boost Spirit library">
+<a name="spirit.spiritstructure"></a>Figure 1. The overall structure
+ of the Boost Spirit library
+<div class="figure-contents"><img src=".././images/spiritstructure.png" alt="The overall structure of the Boost Spirit library"></div>
</div>
-
+ 
 

 The separate sublibraries Spirit.Qi, Spirit.Karma
 and Spirit.Lex are well integrated with any of the other
 parts. Because of their similar structure and identical underlying technology
- these are usable either separately or together at the same time. For instance
+ they are usable either separately or together at the same time. For instance
 is it possible to directly feed the hierarchical data structures generated
 by Spirit.Qi into output generators created using Spirit.Karma;
 or to use the token sequence generated by Spirit.Lex as
 the input for a parser generated by Spirit.Qi.
 

- The <a href="introduction.html#spirit.spiritkarmaflow" title="Figure 2. The place of Spirit.Qi and Spirit.Karma
- in a data transformation flow of a typical application">figure</a> below shows the typical
+ The <a class="link" href="introduction.html#spirit.spiritkarmaflow" title="Figure 2. The place of Spirit.Qi and Spirit.Karma in a data transformation flow of a typical application">figure</a> below shows the typical
 data flow of some input being converted to some internal representation. After
 some (optional) transformation these data are converted back into some different,
 external representation. The picture highlights Spirit's place in this data
@@ -126,17 +119,15 @@
<div class="figure">
<a name="spirit.spiritkarmaflow"></a>Figure 2. The place of Spirit.Qi and Spirit.Karma
 in a data transformation flow of a typical application
-<img src=".././images/spiritkarmaflow.png" alt="The
- place of Spirit.Qi and Spirit.Karma
- in a data transformation flow of a typical application">
+<div class="figure-contents"><img src=".././images/spiritkarmaflow.png" alt="The place of Spirit.Qi and Spirit.Karma in a data transformation flow of a typical application"></div>
</div>
-
+ 
 
-<a name="spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_"></a><h3>
-<a name="id457695"></a>
- <a href="introduction.html#spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_">A
+<a name="spirit.introduction.a_quick_overview_of_parsing_with__emphasis_spirit_qi__emphasis_"></a><h4>
+<a name="id685074"></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 Spirit.Qi</a>
- </h3>
+ </h4>

 Spirit.Qi is Spirit's sublibrary dealing with generating
 parsers based on a given target grammar (essentially a format description of
@@ -161,14 +152,14 @@
</pre>

 Through the magic of expression templates, this is perfectly valid and executable
- C++ code. The production rule <tt class="computeroutput">expression</tt>
- is, in fact, an object that has a member function <tt class="computeroutput">parse</tt>
+ C++ code. The production rule <code class="computeroutput">expression</code>
+ is, in fact, an object that has a member function <code class="computeroutput">parse</code>
 that does the work given a source code written in the grammar that we have
 just declared. Yes, it's a calculator. We shall simplify for now by skipping
- the type declarations and the definition of the rule <tt class="computeroutput">integer</tt>
- invoked by <tt class="computeroutput">factor</tt>. Now, the
- production rule <tt class="computeroutput">expression</tt>
- in our grammar specification, traditionally called the <tt class="computeroutput">start</tt>
+ the type declarations and the definition of the rule <code class="computeroutput">integer</code>
+ invoked by <code class="computeroutput">factor</code>. Now, the
+ production rule <code class="computeroutput">expression</code>
+ in our grammar specification, traditionally called the <code class="computeroutput">start</code>
 symbol, can recognize inputs such as:
 
<pre class="programlisting">12345
@@ -195,19 +186,19 @@

 as seen in math syntax, for example, to mean multiplication or, in our case,
 as seen in EBNF syntax to mean sequencing (b should follow a). Spirit uses
- the shift <tt class="computeroutput">>></tt> operator instead
- for this purpose. We take the <tt class="computeroutput">>></tt>
+ the shift <code class="computeroutput">>></code> operator instead
+ for this purpose. We take the <code class="computeroutput">>></code>
 operator, with arrows pointing to the right, to mean "is followed by".
 Thus we write:
 
<pre class="programlisting">a >> b
</pre>

- The alternative operator <tt class="computeroutput">|</tt> and
- the parentheses <tt class="computeroutput">()</tt> remain as is.
- The assignment operator <tt class="computeroutput">=</tt> is used
- in place of EBNF's <tt class="computeroutput">::=</tt>. Last but
- not least, the Kleene star <tt class="computeroutput">*</tt> which
+ The alternative operator <code class="computeroutput">|</code> and
+ the parentheses <code class="computeroutput">()</code> remain as is.
+ The assignment operator <code class="computeroutput">=</code> is used
+ in place of EBNF's <code class="computeroutput">::=</code>. Last but
+ not least, the Kleene star <code class="computeroutput">*</code> which
 used to be a postfix operator in EBNF becomes a prefix. Instead of:
 
<pre class="programlisting">a* //... in EBNF syntax,
@@ -218,15 +209,15 @@
<pre class="programlisting">*a //... in Spirit.
</pre>

- since there are no postfix stars, <tt class="computeroutput">*</tt>,
+ since there are no postfix stars, <code class="computeroutput">*</code>,
 in C/C++. Finally, we terminate each rule with the ubiquitous semi-colon,
- <tt class="computeroutput">;</tt>.
+ <code class="computeroutput">;</code>.
 
-<a name="spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_"></a><h3>
-<a name="id458990"></a>
- <a href="introduction.html#spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_">A
+<a name="spirit.introduction.a_quick_overview_of_output_generation_with__emphasis_spirit_karma__emphasis_"></a><h4>
+<a name="id687529"></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 Spirit.Karma</a>
- </h3>
+ </h4>

 Spirit not only allows you to describe the structure of the input. Starting
 with Version 2.0 it enables the specification of the output format for your
@@ -234,7 +225,7 @@
 

 Let's assume we need to generate a textual representation from a simple data
- structure such as a <tt class="computeroutput">std::vector<int></tt>. Conventional
+ structure such as a <code class="computeroutput">std::vector<int></code>. Conventional
 code probably would look like:
 
<pre class="programlisting">std::vector<int> v (initialize_and_fill());
@@ -253,11 +244,11 @@
</pre>

 Here are some more examples of format descriptions for different output representations
- of the same <tt class="computeroutput">std::vector<int></tt>:
+ of the same <code class="computeroutput">std::vector<int></code>:
 
<div class="table">
-<a name="id459465"></a>Table 2. Different output formats for `std::vector<int>`
-<table class="table" summary="Different output formats for `std::vector<int>`">
+<a name="id687870"></a>Table 2. Different output formats for `std::vector<int>`
+<div class="table-contents"><table class="table" summary="Different output formats for `std::vector<int>`">
<colgroup>
<col>
<col>
@@ -284,14 +275,14 @@
<tr>
<td>
 
- <tt class="computeroutput">'[' <<
+ <code class="computeroutput">'[' <<
 *(int_
- << ',') << ']'</tt>
+ << ',') << ']'</code>
 
 </td>
<td>
 
- <tt class="computeroutput">[1,8,10,]</tt>
+ <code class="computeroutput">[1,8,10,]</code>
 
 </td>
<td>
@@ -303,15 +294,15 @@
<tr>
<td>
 
- <tt class="computeroutput">*('('
+ <code class="computeroutput">*('('
 << int_
 << ')'
- << ',')</tt>
+ << ',')</code>
 
 </td>
<td>
 
- <tt class="computeroutput">(1),(8),(10),]</tt>
+ <code class="computeroutput">(1),(8),(10),]</code>
 
 </td>
<td>
@@ -323,12 +314,12 @@
<tr>
<td>
 
- <tt class="computeroutput">*hex</tt>
+ <code class="computeroutput">*hex</code>
 
 </td>
<td>
 
- <tt class="computeroutput">18a</tt>
+ <code class="computeroutput">18a</code>
 
 </td>
<td>
@@ -340,13 +331,13 @@
<tr>
<td>
 
- <tt class="computeroutput">*(double_
- << ',')</tt>
+ <code class="computeroutput">*(double_
+ << ',')</code>
 
 </td>
<td>
 
- <tt class="computeroutput">1.0,8.0,10.0,</tt>
+ <code class="computeroutput">1.0,8.0,10.0,</code>
 
 </td>
<td>
@@ -356,12 +347,12 @@
 </td>
</tr>
</tbody>
-</table>
+</table></div>
</div>
-
+ 
 The syntax is similar to Qi with the exception that we
- use the <tt class="computeroutput"><<</tt> operator for
- output concatenation. This should be easy to understand as it follows the conventions
+ use the <code class="computeroutput"><<</code> operator for
+ output concatenation. This should be easy to remember as it follows the conventions
 used in the Standard's I/O streams.
 

@@ -371,10 +362,10 @@
 next table gives some related examples.
 
<div class="table">
-<a name="id459935"></a>Table 3. Different data types usable with the output format
- `(*int_ << eol)`
-<table class="table" summary="Different data types usable with the output format
- `(*int_ << eol)`">
+<a name="id688243"></a>Table 3. Different data types usable with the output format
+ `*(int_ << eol)`
+<div class="table-contents"><table class="table" summary="Different data types usable with the output format
+ `*(int_ << eol)`">
<colgroup>
<col>
<col>
@@ -391,7 +382,7 @@
<tr>
<td>
 
- <tt class="computeroutput">int i[4]</tt>
+ <code class="computeroutput">int i[4]</code>
 
 </td>
<td>
@@ -403,7 +394,7 @@
<tr>
<td>
 
- <tt class="computeroutput">std::vector<int></tt>
+ <code class="computeroutput">std::vector<int></code>
 
 </td>
<td>
@@ -415,7 +406,7 @@
<tr>
<td>
 
- <tt class="computeroutput">std::list<int></tt>
+ <code class="computeroutput">std::list<int></code>
 
 </td>
<td>
@@ -427,7 +418,7 @@
<tr>
<td>
 
- <tt class="computeroutput">boost::array<long, 20></tt>
+ <code class="computeroutput">boost::array<long, 20></code>
 
 </td>
<td>
@@ -437,13 +428,14 @@
 </td>
</tr>
</tbody>
-</table>
+</table></div>
</div>
+ 
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,14 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Spirit.Lex</title>
+<title>Spirit.Lex</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="qi_and_karma/reference/debug.html" title="Debug">
-<link rel="next" href="lex/tutorials.html" title=" Spirit.Lex
- Tutorials">
+<link rel="next" href="lex/tutorials.html" title="Spirit.Lex Tutorials">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="qi_and_karma/reference/debug.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/tutorials.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Spirit.Lex">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.lex"></a> Spirit.Lex</h2></div></div></div>
+<a name="spirit.lex"></a><a class="link" href="lex.html" title="Spirit.Lex"> Spirit.Lex</a>
+</h2></div></div></div>
<div class="toc"><dl>
<dt> Introduction to Spirit.Lex</dt>
<dt><a href="lex/tutorials.html"> Spirit.Lex
@@ -64,9 +64,10 @@
<dt>TokenSet Class</dt>
</dl></dd>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Introduction to Spirit.Lex">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.lex.lexer_introduction"></a> Introduction to Spirit.Lex</h3></div></div></div>
+<a name="spirit.lex.lexer_introduction"></a><a class="link" href="lex.html#spirit.lex.lexer_introduction" title="Introduction to Spirit.Lex"> Introduction to Spirit.Lex</a>
+</h3></div></div></div>

 Lexical scanning is the process of analyzing the stream of input characters
 and separating it into strings called tokens, separated by whitespace. Most
@@ -78,29 +79,29 @@
 set of patterns describing the different tokens you want to recognize in
 the input. To make this a bit more formal, here are some definitions:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 A token is a sequence of consecutive characters having a collective meaning.
 Tokens may have attributes specific to the token type, carrying additional
 information about the matched character sequence.
 </li>
-<li>
+<li class="listitem">
 A pattern is a rule expressed as a regular expression and describing how
- a particular token can be formed. For example, <tt class="literal">[A-Za-z][A-Za-z_0-9]*</tt>
+ a particular token can be formed. For example, <code class="literal">[A-Za-z][A-Za-z_0-9]*</code>
 is a pattern for a rule matching C++ identifiers.
 </li>
-<li>
+<li class="listitem">
 Characters between tokens are called whitespace; these include spaces,
 tabs, newlines, and formfeeds. Many people also count comments as whitespace,
 though since some tools such as lint look at comments, this conflation
 is not perfect.
 </li>
</ul></div>
-<a name="spirit.lex.lexer_introduction.why_use_a_separate_lexer_"></a><h4>
-<a name="id488039"></a>
- <a href="lex.html#spirit.lex.lexer_introduction.why_use_a_separate_lexer_">Why
+<a name="spirit.lex.lexer_introduction.why_use_a_separate_lexer_"></a><h5>
+<a name="id731904"></a>
+ <a class="link" href="lex.html#spirit.lex.lexer_introduction.why_use_a_separate_lexer_">Why
 Use a Separate Lexer?</a>
- </h4>
+ </h5>

 Typically, lexical scanning is done in a separate module from the parser,
 feeding the parser with a stream of input tokens only. Theoretically it is
@@ -116,17 +117,17 @@
 to be very useful in practical applications. In 1956, Noam Chomsky defined
 the "Chomsky Hierarchy" of grammars:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 Type 0: Unrestricted grammars (e.g., natural languages)
 </li>
-<li>
+<li class="listitem">
 Type 1: Context-Sensitive grammars
 </li>
-<li>
+<li class="listitem">
 Type 2: Context-Free grammars
 </li>
-<li>
+<li class="listitem">
 Type 3: Regular grammars
 </li>
</ul></div>
@@ -195,11 +196,11 @@
 it is even possible to use the provided functionality to build more complex
 grammar recognizers.
 
-<a name="spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_"></a><h4>
-<a name="id488369"></a>
- <a href="lex.html#spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_">Advantages
+<a name="spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_"></a><h5>
+<a name="id732113"></a>
+ <a class="link" href="lex.html#spirit.lex.lexer_introduction.advantages_of_using__emphasis_spirit_lex__emphasis_">Advantages
 of using Spirit.Lex</a>
- </h4>
+ </h5>

 The advantage of using Spirit.Lex to create the lexical
 analyzer over using more traditional tools such as Flex
@@ -212,18 +213,18 @@
 gives you the vast majority of features you could get from a similar Flex program without the need
 to leave C++ as a host language:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 The definition of tokens is done using regular expressions (patterns)
 </li>
-<li>
+<li class="listitem">
 The token definitions can refer to special substitution strings (pattern
 macros) simplifying pattern definitions
 </li>
-<li>
+<li class="listitem">
 The generated lexical scanner may have multiple start states
 </li>
-<li>
+<li class="listitem">
 It is possible to attach code to any of the token definitions; this code
 gets executed whenever the corresponding token pattern has been matched
 </li>
@@ -232,8 +233,7 @@
 Even if it is possible to use Spirit.Lex to generate
 C++ code representing the lexical analyzer (we will refer to that as the
 static model, described in more detail in the section
- <a href="lex/abstracts/lexer_static_model.html" title=" The Static
- Lexer Model">The Static
+ <a class="link" href="lex/abstracts/lexer_static_model.html" title="The Static Lexer Model">The Static
 Model</a>) - a model very similar to the way Flex
 operates - we will mainly focus on the opposite, the dynamic
 model. You can directly integrate the token definitions into your C++ program,
@@ -244,14 +244,13 @@
 But it is very flexible and allows you to speed up the development of your
 application.
 
-<a name="spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_"></a><h4>
-<a name="id488543"></a>
- <a href="lex.html#spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_">The
+<a name="spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_"></a><h5>
+<a name="id732216"></a>
+ <a class="link" href="lex.html#spirit.lex.lexer_introduction.the_library_structure_of__emphasis_spirit_lex__emphasis_">The
 Library Structure of Spirit.Lex</a>
- </h4>
+ </h5>

- The <a href="lex.html#spirit.lexerflow" title="Figure 3. The Library structure and Common Flow of Information while
- using Spirit.Lex in an application">figure</a> below shows a high level
+ The <a class="link" href="lex.html#spirit.lexerflow" title="Figure 3. The Library structure and Common Flow of Information while using Spirit.Lex in an application">figure</a> below shows a high level
 overview of how the Spirit.Lex library might be used
 in an application. Spirit.Lex allows to create lexical
 analyzers based on patterns. These patterns are regular expression based
@@ -269,18 +268,16 @@
<div class="figure">
<a name="spirit.lexerflow"></a>Figure 3. The Library structure and Common Flow of Information while
 using Spirit.Lex in an application
-<img src=".././images/lexerflow.png" alt="The
- Library structure and Common Flow of Information while using Spirit.Lex
- in an application">
+<div class="figure-contents"><img src=".././images/lexerflow.png" alt="The Library structure and Common Flow of Information while using Spirit.Lex in an application"></div>
</div>
-
+ 
 
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,15 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Abstracts</title>
+<title>Abstracts</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
-<link rel="up" href="../lex.html" title=" Spirit.Lex">
-<link rel="prev" href="tutorials/lexer_quickstart3.html" title=" Quickstart
- 3 - Counting Words Using a Parser">
-<link rel="next" href="abstracts/lexer_tokenizing.html" title=" Tokenizing
- Input Data">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
+<link rel="up" href="../lex.html" title="Spirit.Lex">
+<link rel="prev" href="tutorials/lexer_quickstart3.html" title="Quickstart 3 - Counting Words Using a Parser">
+<link rel="next" href="abstracts/lexer_tokenizing.html" title="Tokenizing Input Data">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -24,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="tutorials/lexer_quickstart3.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../lex.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="abstracts/lexer_tokenizing.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Abstracts">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.lex.abstracts"></a> Abstracts</h3></div></div></div>
+<a name="spirit.lex.abstracts"></a><a class="link" href="abstracts.html" title="Abstracts"> Abstracts</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Lexer Primitives</dt>
<dt><a href="abstracts/lexer_tokenizing.html"> Tokenizing
@@ -40,9 +39,10 @@
<dt> Lexer Attributes</dt>
<dt> Lexer States</dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Lexer Primitives">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_primitives"></a>Lexer Primitives</h4></div></div></div>
+<a name="spirit.lex.abstracts.lexer_primitives"></a><a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives" title="Lexer Primitives">Lexer Primitives</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt><a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_primitives">
 Lexer Primitives</a></dt>
@@ -51,15 +51,15 @@
<dt><a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_definition">
 Ways to define Tokens</a></dt>
</dl></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.abstracts.lexer_primitives.lexer_primitives"></a><a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_primitives" title="
- Lexer Primitives">
- Lexer Primitives</a></h5></div></div></div></div>
-<div class="section" lang="en">
+<div class="section" title="Lexer Primitives"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.abstracts.lexer_primitives.lexer_primitives"></a><a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_primitives" title="Lexer Primitives">
+ Lexer Primitives</a>
+</h5></div></div></div></div>
+<div class="section" title="About Tokens and Token Values">
<div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values"></a><a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values" title="
- About Tokens and Token Values">
- About Tokens and Token Values</a></h5></div></div></div>
+<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values"></a><a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values" title="About Tokens and Token Values">
+ About Tokens and Token Values</a>
+</h5></div></div></div>

 As already discussed, lexical scanning is the process of analyzing the
 stream of input characters and separating it into strings called tokens,
@@ -75,45 +75,45 @@
 class to the user. The only real limitation posed on this token class
 is consequently, that it has to carry at least the token id of the token
 it represents. For more information about the interface a user defined
- token type has to expose please look at the <a href="reference.html#spirit.lex.reference.concepts.token" title="Token">Token
+ token type has to expose please look at the <a class="link" href="reference.html#spirit.lex.reference.concepts.token" title="Token">Token
 Reference</a> reference. The library provides a default token type
 based on the Lexertl
- library which should be sufficient in most use cases: the lexertl_token<>
+ library which should be sufficient in most use cases: the <a class="link" href="reference/token_class.html" title="Token Class"><code class="computeroutput">lexertl_token<></code></a>
 type. This section focusses on the description of general features a
 token class may implement and how this integrates with the other parts
 of the Spirit.Lex library.
 
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token"></a><h6>
-<a name="id499645"></a>
- <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token">The
+<a name="id741365"></a>
+ <a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_anatomy_of_a_token">The
 Anatomy of a Token</a>
 </h6>

 It is very important to understand the difference between a token definition
- (represented by the token_def<>
- template) and a token itself (for instance represented by the lexertl_token<>
+ (represented by the <a class="link" href="reference/tokendef_class.html" title="TokenDef Class"><code class="computeroutput">token_def<></code></a>
+ template) and a token itself (for instance represented by the <a class="link" href="reference/token_class.html" title="Token Class"><code class="computeroutput">lexertl_token<></code></a>
 template).
 

 The token definition is used to describe the main features of a particular
 token type, especially:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 to simplify the definition of a token type using a regular expression
 pattern applied while matching this token type,
 </li>
-<li>
+<li class="listitem">
 to associate a token type with a particular lexer state,
 </li>
-<li>
+<li class="listitem">
 to optionally assign a token id to a token type,
 </li>
-<li>
+<li class="listitem">
 to optionally associate some code to execute whenever an instance of
 this token type has been matched,
 </li>
-<li>
+<li class="listitem">
 and to optionally specify the attribute type of the token value.
 </li>
</ul></div>
@@ -127,47 +127,46 @@
 data structure contains at least the token id of the matched token type,
 allowing to identify the matched character sequence. Optionally, the
 token instance may contain a token value and/or the lexer state this
- token instance was matched in. The following figure
+ token instance was matched in. The following <a class="link" href="abstracts.html#spirit.lex.tokenstructure" title="Figure 5. The structure of a token">figure</a>
 shows the schematic structure of a token.
 

 
<div class="figure">
<a name="spirit.lex.tokenstructure"></a>Figure 5. The structure of a token
-<img src="../.././images/tokenstructure.png" alt="The
- structure of a token">
+<div class="figure-contents"><img src="../.././images/tokenstructure.png" alt="The structure of a token"></div>
</div>
-
+ 
 

 The token value and the token state may be omitted for optimization reasons,
 avoiding the token to carry more data than actually required. This configuration
 can be achieved by supplying appropriate template parameters for the
- lexertl_token<> template while defining
+ <a class="link" href="reference/token_class.html" title="Token Class"><code class="computeroutput">lexertl_token<></code></a> template while defining
 the token type.
 

 The lexer iterator returns the same token type for each of the different
 matched token definitions. To accomodate for the possibly different token
 value types exposed by the various token types (token
- definitions), the general type of the token value is a boost.variant<>.
+ definitions), the general type of the token value is a boost.variant<>.
 As a minimum (for the default configuration) this token value variant
- will be configured to always hold a boost::iterator_range<>
+ will be configured to always hold a boost::iterator_range<>
 containing the pair of iterators pointing to the matched input sequence
 for this token instance.
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 If the lexical analyzer is used in conjunction with a Spirit.Qi
- parser, the stored boost::iterator_range<>
+ parser, the stored boost::iterator_range<>
 token value will be converted to the requested token type (parser attribute)
 exactly once. This happens at the time of the first access to the token
 value requiring the corresponding type conversion. The converted token
- value will be stored in the boost.variant<>
+ value will be stored in the boost.variant<>
 replacing the initially stored iterator range. This avoids to convert
 the input sequence to the token value more than once, thus optimizing
 the integration of the lexer with Spirit.Qi, even
@@ -175,7 +174,7 @@
 </td></tr>
</table></div>

- Here is the template prototype of the lexertl_token<>
+ Here is the template prototype of the <a class="link" href="reference/token_class.html" title="Token Class"><code class="computeroutput">lexertl_token<></code></a>
 template:
 
<pre class="programlisting">template <
@@ -185,28 +184,28 @@
>
struct lexertl_token;
</pre>
-<div class="variablelist">
+<div class="variablelist" title="where:">
where:
<dl>
<dt>Iterator</dt>
<dd>
 This is the type of the iterator used to access the underlying input
- stream. It defaults to a plain <tt class="computeroutput">char
- const*</tt>.
+ stream. It defaults to a plain <code class="computeroutput">char
+ const*</code>.
 </dd>
<dt>AttributeTypes</dt>
<dd>
 This is either a mpl sequence containing all attribute types used
- for the token definitions or the type <tt class="computeroutput">omitted</tt>.
+ for the token definitions or the type <code class="computeroutput">omitted</code>.
 If the mpl sequence is empty (which is the default), all token instances
- will store a <tt class="computeroutput">boost::iterator_range<Iterator></tt> pointing to the start and the
- end of the matched section in the input stream. If the type is <tt class="computeroutput">omitted</tt>, the generated tokens will
+ will store a <code class="computeroutput">boost::iterator_range<Iterator></code> pointing to the start and the
+ end of the matched section in the input stream. If the type is <code class="computeroutput">omitted</code>, the generated tokens will
 contain no token value (attribute) at all.
 </dd>
<dt>HasState</dt>
<dd>
- This is either <tt class="computeroutput">mpl::true_</tt>
- or <tt class="computeroutput">mpl::false_</tt>, allowing to control whether
+ This is either <code class="computeroutput">mpl::true_</code>
+ or <code class="computeroutput">mpl::false_</code>, allowing to control whether
 the generated token instances will contain the lexer state they were
 generated in. The default is mpl::true_, so all token instances will
 contain the lexer state.
@@ -215,18 +214,18 @@
</div>

 Normally, during its construction, a token instance always holds the
- boost::iterator_range<>
- as its token value (except, if it has been defined using the <tt class="computeroutput">omitted</tt> token value type). This iterator
+ boost::iterator_range<>
+ as its token value (except, if it has been defined using the <code class="computeroutput">omitted</code> token value type). This iterator
 range then is converted in place to the requested token value type (attribute)
 when it is requested for the first time.
 
<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition"></a><h6>
-<a name="id500459"></a>
- <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition">The
+<a name="id743739"></a>
+ <a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.the_physiognomy_of_a_token_definition">The
 Physiognomy of a Token Definition</a>
 </h6>

- The token definitions (represented by the token_def<>
+ The token definitions (represented by the <a class="link" href="reference/tokendef_class.html" title="TokenDef Class"><code class="computeroutput">token_def<></code></a>
 template) are normally used as part of the definition of the lexical
 analyzer. At the same time a token definition instance may be used as
 a parser component in Spirit.Qi.
@@ -240,7 +239,7 @@
>
class token_def;
</pre>
-<div class="variablelist">
+<div class="variablelist" title="where:">
where:
<dl>
<dt>Attribute</dt>
@@ -249,17 +248,17 @@
 instances representing this token type. This attribute type is exposed
 to the Spirit.Qi library, whenever this token
 definition is used as a parser component. The default attribute type
- is <tt class="computeroutput">unused_type</tt>, which
- means the token instance holds a boost::iterator_range<>
+ is <code class="computeroutput">unused_type</code>, which
+ means the token instance holds a boost::iterator_range<>
 pointing to the start and the end of the matched section in the input
- stream. If the attribute is <tt class="computeroutput">omitted</tt>
+ stream. If the attribute is <code class="computeroutput">omitted</code>
 the token instance will expose no token type at all. Any other type
 will be used directly as the token value type.
 </dd>
<dt>Char</dt>
<dd>
 This is the value type of the iterator for the underlying input sequence.
- It defaults to <tt class="computeroutput">char</tt>.
+ It defaults to <code class="computeroutput">char</code>.
 </dd>
</dl>
</div>
@@ -267,36 +266,36 @@
 The semantics of the template parameters for the token type and the token
 definition type are very similar and interdependent. As a rule of thumb
 you can think of the token definition type as the means of specifying
- everything related to a single specific token type (such as <tt class="computeroutput">identifier</tt> or <tt class="computeroutput">integer</tt>).
+ everything related to a single specific token type (such as <code class="computeroutput">identifier</code> or <code class="computeroutput">integer</code>).
 On the other hand the token type is used to define the general proerties
 of all token instances generated by the Spirit.Lex
 library.
 
-<div class="important"><table border="0" summary="Important">
+<div class="important" title="Important"><table border="0" summary="Important">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../images/important.png"></td>
<th align="left">Important</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">

 If you don't list any token value types in the token type definition
- declaration (resulting in the usage of the default boost::iterator_range<>
+ declaration (resulting in the usage of the default boost::iterator_range<>
 token type) everything will compile and work just fine, just a bit
 less efficient. This is because the token value will be converted from
 the matched input sequence every time it is requested.
 

 But as soon as you specify at least one token value type while defining
- the token type you'll have to list all value types used for token_def<>
+ the token type you'll have to list all value types used for <a class="link" href="reference/tokendef_class.html" title="TokenDef Class"><code class="computeroutput">token_def<></code></a>
 declarations in the token definition class, otherwise compilation errors
 will occur.
 
</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="id500867"></a>
- <a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_">Examples
- of using lexertl_token<></a>
+<a name="id743994"></a>
+ <a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values.examples_of_using__link_linkend__spirit_lex_reference_token_class___code__phrase_role__identifier__lexertl_token__phrase__phrase_role__special___lt__gt___phrase___code___link_">Examples
+ of using <a class="link" href="reference/token_class.html" title="Token Class"><code class="computeroutput">lexertl_token<></code></a></a>
 </h6>

 Let's start with some examples. We refer to one of the Spirit.Lex
@@ -305,13 +304,13 @@

 The first code snippet shows an excerpt of the token definition class,
 the definition of a couple of token types. Some of the token types do
- not expose a special token value (<tt class="computeroutput">if_</tt>,
- <tt class="computeroutput">else_</tt>, and <tt class="computeroutput">while_</tt>). Their token value will always
+ not expose a special token value (<code class="computeroutput">if_</code>,
+ <code class="computeroutput">else_</code>, and <code class="computeroutput">while_</code>). Their token value will always
 hold the iterator range of the matched input sequence only. The token
- definitions for the <tt class="computeroutput">identifier</tt>
- and the integer <tt class="computeroutput">constant</tt>
- are specialized to expose an explicit token type each: <tt class="computeroutput">std::string</tt> and <tt class="computeroutput">unsigned
- int</tt>.
+ definitions for the <code class="computeroutput">identifier</code>
+ and the integer <code class="computeroutput">constant</code>
+ are specialized to expose an explicit token type each: <code class="computeroutput">std::string</code> and <code class="computeroutput">unsigned
+ int</code>.
 

 
@@ -321,19 +320,19 @@
<pre class="programlisting">// these tokens expose the iterator_range of the matched input sequence
token_def<> if_, else_, while_;

-// The following two tokens have an associated value type, 'identifier'
+// The following two tokens have an associated attribute type, 'identifier'
// carries a string (the identifier name) and 'constant' carries the
// matched integer value.
//
-// Note: any token value type specified explicitly during a token_def<>
+// Note: any token attribute type explicitly specified in a token_def<>
// declaration needs to be listed during token type definition as
// well (see the typedef for the token_type below).
//
// The conversion of the matched input to an instance of this type occurs
-// once (on first access), which makes token values as efficient as
+// once (on first access), which makes token attributes as efficient as
// possible. Moreover, token instances are constructed once by the lexer
// library. From this point on tokens are passed by reference only,
-// avoiding tokens being copied around.
+// avoiding them being copied around.
token_def<std::string> identifier;
token_def<unsigned int> constant;
</pre>
@@ -344,7 +343,7 @@

 As the parsers generated by Spirit.Qi are fully
 attributed, any Spirit.Qi parser component needs
- to expose a certain type as its parser attribute. Naturally, the token_def<> exposes the token value
+ to expose a certain type as its parser attribute. Naturally, the <a class="link" href="reference/tokendef_class.html" title="TokenDef Class"><code class="computeroutput">token_def<></code></a> exposes the token value
 type as its parser attribute, enabling a smooth integration with Spirit.Qi.
 

@@ -363,15 +362,15 @@
// calculator_tokens<> above). Here we use the predefined lexertl token
// type, but any compatible token type may be used instead.
//
-// If you don't list any token value types in the following declaration
+// If you don't list any token attribute types in the following declaration
// (or just use the default token type: lexertl_token<base_iterator_type>)
// it will compile and work just fine, just a bit less efficient. This is
-// because the token value will be generated from the matched input
+// because the token attribute will be generated from the matched input
// sequence every time it is requested. But as soon as you specify at
-// least one token value type you'll have to list all value types used
-// for token_def<> declarations in the token definition class above,
+// least one token attribute type you'll have to list all attribute types
+// used for token_def<> declarations in the token definition class above,
// otherwise compilation errors will occur.
-typedef lexertl_token<
+typedef lexertl::token<
 base_iterator_type, boost::mpl::vector<unsigned int, std::string>
> token_type;
</pre>
@@ -380,21 +379,21 @@

 

- To avoid the token to have a token value at all, the special tag <tt class="computeroutput">omitted</tt> can be used: <tt class="computeroutput">token_def<omitted></tt>
- and <tt class="computeroutput">lexertl_token<base_iterator_type,
- omitted></tt>.
+ To avoid the token to have a token value at all, the special tag <code class="computeroutput">omitted</code> can be used: <code class="computeroutput">token_def<omitted></code>
+ and <code class="computeroutput">lexertl_token<base_iterator_type,
+ omitted></code>.
 
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_definition"></a><a href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_definition" title="
- Ways to define Tokens">
- Ways to define Tokens</a></h5></div></div></div></div>
+<div class="section" title="Ways to define Tokens"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.abstracts.lexer_primitives.lexer_token_definition"></a><a class="link" href="abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_definition" title="Ways to define Tokens">
+ Ways to define Tokens</a>
+</h5></div></div></div></div>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_attributes.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,14 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Lexer Attributes</title>
+<title>Lexer Attributes</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="lexer_parsing.html" title=" Parsing using
- a Lexer">
-<link rel="next" href="lexer_states.html" title=" Lexer States">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="lexer_parsing.html" title="Parsing using a Lexer">
+<link rel="next" href="lexer_states.html" title="Lexer States">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_parsing.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="lexer_states.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_attributes"></a> Lexer Attributes</h4></div></div></div></div>
+<div class="section" title="Lexer Attributes"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.abstracts.lexer_attributes"></a><a class="link" href="lexer_attributes.html" title="Lexer Attributes"> Lexer Attributes</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/abstracts/lexer_parsing.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,15 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Parsing using
- a Lexer</title>
+<title>Parsing using a Lexer</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="lexer_static_model.html" title=" The Static
- Lexer Model">
-<link rel="next" href="lexer_attributes.html" title=" Lexer Attributes">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="lexer_static_model.html" title="The Static Lexer Model">
+<link rel="next" href="lexer_attributes.html" title="Lexer Attributes">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -24,14 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_static_model.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="lexer_attributes.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_parsing"></a><a href="lexer_parsing.html" title=" Parsing using
- a Lexer"> Parsing using
- a Lexer</a></h4></div></div></div></div>
+<div class="section" title="Parsing using a Lexer"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.abstracts.lexer_parsing"></a><a class="link" href="lexer_parsing.html" title="Parsing using a Lexer"> Parsing using
+ a Lexer</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,16 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Lexer
- Semantic Actions</title>
+<title>Lexer Semantic Actions</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="lexer_tokenizing.html" title=" Tokenizing
- Input Data">
-<link rel="next" href="lexer_static_model.html" title=" The Static
- Lexer Model">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="lexer_tokenizing.html" title="Tokenizing Input Data">
+<link rel="next" href="lexer_static_model.html" title="The Static Lexer Model">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -25,14 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_tokenizing.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="lexer_static_model.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_semantic_actions"></a><a href="lexer_semantic_actions.html" title=" Lexer
- Semantic Actions"> Lexer
- Semantic Actions</a></h4></div></div></div></div>
+<div class="section" title="Lexer Semantic Actions"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.abstracts.lexer_semantic_actions"></a><a class="link" href="lexer_semantic_actions.html" title="Lexer Semantic Actions"> Lexer
+ Semantic Actions</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,13 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Lexer States</title>
+<title>Lexer States</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="lexer_attributes.html" title=" Lexer Attributes">
-<link rel="next" href="../quick_reference.html" title=" Quick Reference">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="lexer_attributes.html" title="Lexer Attributes">
+<link rel="next" href="../quick_reference.html" title="Quick Reference">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -22,29 +22,30 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_attributes.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="../quick_reference.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Lexer States">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_states"></a> Lexer States</h4></div></div></div>
-<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions"></a><h5>
-<a name="id505296"></a>
- <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_lexer_semantic_actions">Controlling
+<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="id747721"></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>
- </h5>
-<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions"></a><h5>
-<a name="id505327"></a>
- <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions">Controlling
+ </h6>
+<a name="spirit.lex.abstracts.lexer_states.controlling_the_lexer_state_from_parser_semantic_actions"></a><h6>
+<a name="id747735"></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>
- </h5>
-<a name="spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser"></a><h5>
-<a name="id505358"></a>
- <a href="lexer_states.html#spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser">Using
+ </h6>
+<a name="spirit.lex.abstracts.lexer_states.using_a_lexer_state_for_the_skip_parser"></a><h6>
+<a name="id747748"></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>
- </h5>
+ </h6>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,16 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> The Static
- Lexer Model</title>
+<title>The Static Lexer Model</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="lexer_semantic_actions.html" title=" Lexer
- Semantic Actions">
-<link rel="next" href="lexer_parsing.html" title=" Parsing using
- a Lexer">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="lexer_semantic_actions.html" title="Lexer Semantic Actions">
+<link rel="next" href="lexer_parsing.html" title="Parsing using a Lexer">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -25,11 +22,11 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_semantic_actions.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="lexer_parsing.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="The Static Lexer Model">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_static_model"></a><a href="lexer_static_model.html" title=" The Static
- Lexer Model"> The Static
- Lexer Model</a></h4></div></div></div>
+<a name="spirit.lex.abstracts.lexer_static_model"></a><a class="link" href="lexer_static_model.html" title="The Static Lexer Model"> The Static
+ Lexer Model</a>
+</h4></div></div></div>

 The documentation of Spirit.Lex so far mostly was
 about describing the features of the dynamic model,
@@ -53,12 +50,12 @@
 Assuming you already built a dynamic lexer for your problem, there are
 two more steps needed to create a static lexical analyzer using Spirit.Lex:
 
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 generating the C++ code for the static analyzer (including the tokenization
 function and corresponding tables), and
 </li>
-<li>
+<li class="listitem">
 modifying the dynamic lexical anlyzer to use the generated code.
 </li>
</ol></div>
@@ -107,16 +104,17 @@
// possible use cases: a dynamic lexical analyzer, a code generator, and a
// static lexical analyzer.
template <typename BaseLexer>
-struct word_count_tokens : boost::spirit::lex::lexer_def<BaseLexer>
+struct word_count_tokens : boost::spirit::lex::lexer<BaseLexer>
{
- template <typename Self>
- void def (Self& self)
+ word_count_tokens()
+ : word_count_tokens::base_type(
+ boost::spirit::lex::match_flags::match_not_dot_newline)
 {
 // define tokens and associate them with the lexer
 word = "[^ \t\n]+";
- self = word | '\n' | token_def<>(".", IDANY);
+ this->self = word | '\n' | boost::spirit::lex::token_def<>(".", IDANY);
 }
-
+
 boost::spirit::lex::token_def<std::string> word;
};
</pre>
@@ -127,8 +125,8 @@

 The only thing changing between the three different use cases is the template
 parameter used to instantiate a concrete token definition. Fot the dynamic
- model and the code generator you probably will use the lexertl_lexer<>
- template, where for the static model you will use the lexertl_static_lexer<>
+ model and the code generator you probably will use the <a class="link" href="../reference/lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"><code class="computeroutput">lexertl_lexer<></code></a>
+ template, where for the static model you will use the <a class="link" href="../reference/lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"><code class="computeroutput">lexertl_static_lexer<></code></a>
 type as the template parameter.
 

@@ -154,17 +152,17 @@
{
 template <typename TokenDef>
 word_count_grammar(TokenDef const& tok)
- : grammar<Iterator>(start), c(0), w(0), l(0)
+ : word_count_grammar::base_type(start)
+ , c(0), w(0), l(0)
 {
- using boost::spirit::arg_names::_1;
 using boost::phoenix::ref;
 using boost::phoenix::size;
-
+
 // associate the defined tokens with the lexer, at the same time
 // defining the actions to be executed
- start = *( tok.word [++ref(w), ref(c) += size(_1)]
- | char_('\n') [++ref(l), ++ref(c)]
- | token(IDANY) [++ref(c)]
+ start = *( tok.word [ ++ref(w), ref(c) += size(_1) ]
+ | lit('\n') [ ++ref(l), ++ref(c) ]
+ | token(IDANY) [ ++ref(c) ]
 )
 ;
 }
@@ -177,17 +175,17 @@
 

 
-<a name="spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer"></a><h5>
-<a name="id503276"></a>
- <a href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer">Generating
+<a name="spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer"></a><h6>
+<a name="id746391"></a>
+ <a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.generating_the_static_analyzer">Generating
 the Static Analyzer</a>
- </h5>
+ </h6>

 The first additional step to perform in order to create a static lexical
 analyzer is to create a small standalone program for creating the lexer
 tables and the corresponding tokenization function. For this purpose the
 Spirit.Lex library exposes a special API - the function
- generate_static().
+ <a class="link" href="../../../"><code class="computeroutput">generate_static()</code></a>.
 It implements the whole code generator, no further code is needed. All
 what it takes to invoke this function is to supply a token definition instance,
 an output stream to use to generate the code to, and an optional string
@@ -202,7 +200,7 @@
<pre class="programlisting">int main(int argc, char* argv[])
{
 // create the lexer object instance needed to invoke the generator
- word_count_tokens<lexertl_lexer<> > word_count; // the token definition
+ word_count_tokens<lexertl::lexer<> > word_count; // the token definition

 // open the output file, where the generated tokenizer function will be
 // written to
@@ -211,7 +209,7 @@
 // invoke the generator, passing the token definition, the output stream
 // and the name prefix of the tokenizing function to be generated
 char const* function_name = (argc < 3 ? "" : argv[2]);
- return generate_static(make_lexer(word_count), out, function_name) ? 0 : -1;
+ return lexertl::generate_static(word_count, out, function_name) ? 0 : -1;
}
</pre>

@@ -223,20 +221,20 @@
 a file for later inclusion into the static lexical analzyer as shown in
 the next topic (the full generated code can be viewed here).
 
-<a name="spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer"></a><h5>
-<a name="id503799"></a>
- <a href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer">Modifying
+<a name="spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer"></a><h6>
+<a name="id746766"></a>
+ <a class="link" href="lexer_static_model.html#spirit.lex.abstracts.lexer_static_model.modifying_the_dynamic_analyzer">Modifying
 the Dynamic Analyzer</a>
- </h5>
+ </h6>

 The second required step to convert an existing dynamic lexer into a static
 one is to change your main program at two places. First, you need to change
 the type of the used lexer (that is the template parameter used while instantiating
 your token definition class). While in the dynamic model we have been using
- the lexertl_lexer<>
- template, we now need to change that to the lexertl_static_lexer<>
+ the <a class="link" href="../reference/lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"><code class="computeroutput">lexertl_lexer<></code></a>
+ template, we now need to change that to the <a class="link" href="../reference/lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"><code class="computeroutput">lexertl_static_lexer<></code></a>
 type. The second change is tightly related to the first one and involves
- correcting the corresponding <tt class="computeroutput">#include</tt>
+ correcting the corresponding <code class="computeroutput">#include</code>
 statement to:
 

@@ -244,7 +242,7 @@



-<pre class="programlisting">#include <boost/spirit/include/lex_lexer_static_lexertl.hpp>
+<pre class="programlisting">#include <boost/spirit/include/lex_static_lexertl.hpp>
</pre>

 
@@ -268,7 +266,7 @@
{
 // Define the token type to be used: 'std::string' is available as the type
 // of the token value.
- typedef lexertl_token<
+ typedef lexertl::token<
 char const*, boost::mpl::vector<std::string>
 > token_type;

@@ -276,26 +274,25 @@
 // definition.
 //
 // This is the only place where the code is different from an equivalent
- // dynamic lexical analyzer. We use the `lexertl_static_lexer<>` instead of
- // the `lexertl_lexer<>` as the base class for our token defintion type.
- //
- typedef lexertl_static_lexer<token_type> lexer_type;
-
+ // dynamic lexical analyzer. We use the `lexertl::static_lexer<>` instead of
+ // the `lexertl::lexer<>` as the base class for our token defintion type.
+ typedef lexertl::static_lexer<token_type> lexer_type;
+
 // Define the iterator type exposed by the lexer.
- typedef lexer_iterator<word_count_tokens<lexer_type> >::type iterator_type;
+ typedef word_count_tokens<lexer_type>::iterator_type iterator_type;

 // Now we use the types defined above to create the lexer and grammar
 // object instances needed to invoke the parsing process.
- word_count_tokens<lexer_type> word_count; // Our token definition
- word_count_grammar<iterator_type> g (word_count); // Our grammar definition
+ word_count_tokens<lexer_type> word_count; // Our lexer
+ word_count_grammar<iterator_type> g (word_count); // Our parser

 // Read in the file into memory.
 std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
 char const* first = str.c_str();
 char const* last = &first[str.size()];
-
+
 // Parsing is done based on the the token stream, not the character stream.
- bool r = tokenize_and_parse(first, last, make_lexer(word_count), g);
+ bool r = tokenize_and_parse(first, last, word_count, g);

 if (r) { // success
 std::cout << "lines: " << g.l << ", words: " << g.w
@@ -316,8 +313,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,15 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Tokenizing
- Input Data</title>
+<title>Tokenizing Input Data</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title=" Abstracts">
-<link rel="prev" href="../abstracts.html" title=" Abstracts">
-<link rel="next" href="lexer_semantic_actions.html" title=" Lexer
- Semantic Actions">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../abstracts.html" title="Abstracts">
+<link rel="prev" href="../abstracts.html" title="Abstracts">
+<link rel="next" href="lexer_semantic_actions.html" title="Lexer Semantic Actions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -24,26 +22,26 @@
<div class="spirit-nav">
<a accesskey="p" href="../abstracts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="lexer_semantic_actions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Tokenizing Input Data">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.abstracts.lexer_tokenizing"></a><a href="lexer_tokenizing.html" title=" Tokenizing
- Input Data"> Tokenizing
- Input Data</a></h4></div></div></div>
-<a name="spirit.lex.abstracts.lexer_tokenizing.the_tokenize___function"></a><h5>
-<a name="id501672"></a>
- <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_tokenize___function">The
- tokenize() function</a>
- </h5>
-<a name="spirit.lex.abstracts.lexer_tokenizing.the_generate_static___function"></a><h5>
-<a name="id501700"></a>
- <a href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing.the_generate_static___function">The
- generate_static() function</a>
- </h5>
+<a name="spirit.lex.abstracts.lexer_tokenizing"></a><a class="link" href="lexer_tokenizing.html" title="Tokenizing Input Data"> Tokenizing
+ Input Data</a>
+</h4></div></div></div>
+<a name="spirit.lex.abstracts.lexer_tokenizing._tokenize_function_the_tokenize___function"></a><h6>
+<a name="id744519"></a>
+ <a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing._tokenize_function_the_tokenize___function">:tokenize_function
+ The tokenize() function</a>
+ </h6>
+<a name="spirit.lex.abstracts.lexer_tokenizing._generate_static_function_the_generate_static___function"></a><h6>
+<a name="id744532"></a>
+ <a class="link" href="lexer_tokenizing.html#spirit.lex.abstracts.lexer_tokenizing._generate_static_function_the_generate_static___function">:generate_static_function
+ The generate_static() function</a>
+ </h6>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/quick_reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/quick_reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/quick_reference.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,13 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Quick Reference</title>
+<title>Quick Reference</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
-<link rel="up" href="../lex.html" title=" Spirit.Lex">
-<link rel="prev" href="abstracts/lexer_states.html" title=" Lexer States">
-<link rel="next" href="reference.html" title=" Reference">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
+<link rel="up" href="../lex.html" title="Spirit.Lex">
+<link rel="prev" href="abstracts/lexer_states.html" title="Lexer States">
+<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>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="abstracts/lexer_states.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../lex.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" lang="en"><div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.lex.quick_reference"></a> Quick Reference</h3></div></div></div></div>
+<div class="section" title="Quick Reference"><div class="titlepage"><div><div><h3 class="title">
+<a name="spirit.lex.quick_reference"></a><a class="link" href="quick_reference.html" title="Quick Reference"> Quick Reference</a>
+</h3></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,12 +1,12 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Reference</title>
+<title>Reference</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
-<link rel="up" href="../lex.html" title=" Spirit.Lex">
-<link rel="prev" href="quick_reference.html" title=" Quick Reference">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
+<link rel="up" href="../lex.html" title="Spirit.Lex">
+<link rel="prev" href="quick_reference.html" title="Quick Reference">
<link rel="next" href="reference/lexer_class.html" title="Lexer Class">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="quick_reference.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../lex.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/lexer_class.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Reference">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.lex.reference"></a> Reference</h3></div></div></div>
+<a name="spirit.lex.reference"></a><a class="link" href="reference.html" title="Reference"> Reference</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt> Concepts</dt>
<dt>Lexer Class</dt>
@@ -32,29 +33,543 @@
<dt>TokenDef Class</dt>
<dt>TokenSet Class</dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Concepts">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.reference.concepts"></a> Concepts</h4></div></div></div>
+<a name="spirit.lex.reference.concepts"></a><a class="link" href="reference.html#spirit.lex.reference.concepts" title="Concepts"> Concepts</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>Lexer</dt>
<dt>Token</dt>
<dt>TokenDef</dt>
<dt>TokenSet</dt>
</dl></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.reference.concepts.lexer"></a>Lexer</h5></div></div></div></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.reference.concepts.token"></a>Token</h5></div></div></div></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.reference.concepts.tokendef"></a>TokenDef</h5></div></div></div></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.lex.reference.concepts.tokenset"></a>TokenSet</h5></div></div></div></div>
+<div class="section" title="Lexer">
+<div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.reference.concepts.lexer"></a><a class="link" href="reference.html#spirit.lex.reference.concepts.lexer" title="Lexer">Lexer</a>
+</h5></div></div></div>
+<div class="table">
+<a name="id747799"></a>Table 8. Regular expressions support
+<div class="table-contents"><table class="table" summary="Regular expressions support">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Expression
+ 
+ </th>
+<th>
+ 
+ Meaning
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ <code class="computeroutput">x</code>
+ 
+ </td>
+<td>
+ 
+ Match any character <code class="computeroutput">x</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">.</code>
+ 
+ </td>
+<td>
+ 
+ Match any except newline (or optionally any
+ character)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">[xyz]</code>
+ 
+ </td>
+<td>
+ 
+ A character class; in this case matches <code class="computeroutput">x</code>,
+ <code class="computeroutput">y</code> or <code class="computeroutput">z</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">[abj-oZ]</code>
+ 
+ </td>
+<td>
+ 
+ A character class with a range in it; matches <code class="computeroutput">a</code>,
+ <code class="computeroutput">b</code> any letter from
+ <code class="computeroutput">j</code> through <code class="computeroutput">o</code> or a <code class="computeroutput">Z</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">[^A-Z]</code>
+ 
+ </td>
+<td>
+ 
+ A negated character class i.e. any character but those in the class.
+ In this case, any character except an uppercase letter
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r*</code>
+ 
+ </td>
+<td>
+ 
+ Zero or more r's (greedy), where r is any regular expression
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r*?</code>
+ 
+ </td>
+<td>
+ 
+ Zero or more r's (abstemious), where r is any regular expression
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r+</code>
+ 
+ </td>
+<td>
+ 
+ One or more r's (greedy)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r+?</code>
+ 
+ </td>
+<td>
+ 
+ One or more r's (abstemious)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r?</code>
+ 
+ </td>
+<td>
+ 
+ Zero or one r's (greedy), i.e. optional
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r??</code>
+ 
+ </td>
+<td>
+ 
+ Zero or one r's (abstemious), i.e. optional
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r{2,5}</code>
+ 
+ </td>
+<td>
+ 
+ Anywhere between two and five r's (greedy)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r{2,5}?</code>
+ 
+ </td>
+<td>
+ 
+ Anywhere between two and five r's (abstemious)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r{2,}</code>
+ 
+ </td>
+<td>
+ 
+ Two or more r's (greedy)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r{2,}?</code>
+ 
+ </td>
+<td>
+ 
+ Two or more r's (abstemious)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r{4}</code>
+ 
+ </td>
+<td>
+ 
+ Exactly four r's
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">{NAME}</code>
+ 
+ </td>
+<td>
+ 
+ The macro <code class="computeroutput">NAME</code>
+ (see below)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">"[xyz]\"foo"</code>
+ 
+ </td>
+<td>
+ 
+ The literal string <code class="computeroutput">[xyz]\"foo</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\X</code>
+ 
+ </td>
+<td>
+ 
+ If X is <code class="computeroutput">a</code>, <code class="computeroutput">b</code>, <code class="computeroutput">e</code>,
+ <code class="computeroutput">n</code>, <code class="computeroutput">r</code>, <code class="computeroutput">f</code>,
+ <code class="computeroutput">t</code>, <code class="computeroutput">v</code> then the ANSI-C interpretation
+ of <code class="computeroutput">\x</code>.
+ Otherwise a literal <code class="computeroutput">X</code>
+ (used to escape operators such as <code class="computeroutput">*</code>)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\0</code>
+ 
+ </td>
+<td>
+ 
+ A NUL character (ASCII code 0)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\123</code>
+ 
+ </td>
+<td>
+ 
+ The character with octal value 123
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\x2a</code>
+ 
+ </td>
+<td>
+ 
+ The character with hexadecimal value 2a
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\cX</code>
+ 
+ </td>
+<td>
+ 
+ A named control character <code class="computeroutput">X</code>.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\d</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[0-9]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\D</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[^0-9]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\s</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[\x20\t\n\r\f\v]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\S</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[^\x20\t\n\r\f\v]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\w</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[a-zA-Z0-9_]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">\W</code>
+ 
+ </td>
+<td>
+ 
+ A shortcut for <code class="computeroutput">[^a-zA-Z0-9_]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">(r)</code>
+ 
+ </td>
+<td>
+ 
+ Match an <code class="computeroutput">r</code>; parenthesis
+ are used to override precedence (see below)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">(?r-s:pattern)</code>
+ 
+ </td>
+<td>
+ 
+ apply option 'r' and omit option 's' while interpreting pattern.
+ Options may be zero or more of the characters 'i' or 's'. 'i' means
+ case-insensitive. '-i' means case-sensitive. 's' alters the meaning
+ of the '.' syntax to match any single character whatsoever. '-s'
+ alters the meaning of '.' to match any character except '<code class="computeroutput">\n</code>'.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rs</code>
+ 
+ </td>
+<td>
+ 
+ The regular expression <code class="computeroutput">r</code>
+ followed by the regular expression <code class="computeroutput">s</code>
+ (a sequence)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r|s</code>
+ 
+ </td>
+<td>
+ 
+ Either an <code class="computeroutput">r</code> or
+ and <code class="computeroutput">s</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">^r</code>
+ 
+ </td>
+<td>
+ 
+ An <code class="computeroutput">r</code> but only at
+ the beginning of a line (i.e. when just starting to scan, or right
+ after a newline has been scanned)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r</code>$
+ 
+ </td>
+<td>
+ 
+ An <code class="computeroutput">r</code> but only at
+ the end of a line (i.e. just before a newline)
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+ <div class="note" title="Note"><table border="0" summary="Note">
+<tr>
+<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../images/note.png"></td>
+<th align="left">Note</th>
+</tr>
+<tr><td align="left" valign="top">
+ POSIX character classes are not currently supported, due to performance
+ issues when creating them in wide character mode.
+ </td></tr>
+</table></div>
+<a name="spirit.lex.reference.concepts.lexer.regular_expression_precedence"></a><h6>
+<a name="id749473"></a>
+ <a class="link" href="reference.html#spirit.lex.reference.concepts.lexer.regular_expression_precedence">Regular
+ Expression Precedence</a>
+ </h6>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+<code class="computeroutput">rs</code> has highest precedence
+ </li>
+<li class="listitem">
+<code class="computeroutput">r*</code>
+ has next highest (<code class="computeroutput">+</code>,
+ <code class="computeroutput">?</code>, <code class="computeroutput">{n,m}</code>
+ have the same precedence as <code class="computeroutput">*</code>)
+ </li>
+<li class="listitem">
+<code class="computeroutput">r|s</code> has the lowest precedence
+ </li>
+</ul></div>
+<a name="spirit.lex.reference.concepts.lexer.macros"></a><h6>
+<a name="id749576"></a>
+ <a class="link" href="reference.html#spirit.lex.reference.concepts.lexer.macros">Macros</a>
+ </h6>
+
+ Regular expressions can be given a name and referred to in rules using
+ the syntax <code class="computeroutput">{NAME}</code> where <code class="computeroutput">NAME</code>
+ is the name you have given to the macro. A macro name can be at most
+ 30 characters long and must start with a <code class="computeroutput">_</code>
+ or a letter. Subsequent characters can be <code class="computeroutput">_</code>,
+ <code class="computeroutput">-</code>, a letter or a decimal
+ digit. Use the <code class="computeroutput">rules::add_macro()</code> method to define a macro.
+ 
+</div>
+<div class="section" title="Token"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.reference.concepts.token"></a><a class="link" href="reference.html#spirit.lex.reference.concepts.token" title="Token">Token</a>
+</h5></div></div></div></div>
+<div class="section" title="TokenDef"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.reference.concepts.tokendef"></a><a class="link" href="reference.html#spirit.lex.reference.concepts.tokendef" title="TokenDef">TokenDef</a>
+</h5></div></div></div></div>
+<div class="section" title="TokenSet"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.lex.reference.concepts.tokenset"></a><a class="link" href="reference.html#spirit.lex.reference.concepts.tokenset" title="TokenSet">TokenSet</a>
+</h5></div></div></div></div>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,10 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Lexer Class</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../reference.html" title=" Reference">
-<link rel="prev" href="../reference.html" title=" Reference">
+<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="../reference.html" title="Reference">
<link rel="next" href="token_class.html" title="Token Class">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,34 +22,35 @@
<div class="spirit-nav">
<a accesskey="p" href="../reference.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="token_class.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Lexer Class">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.reference.lexer_class"></a>Lexer Class</h4></div></div></div>
-<a name="spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model"></a><h5>
-<a name="id505548"></a>
- <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_lexer_class_implementing_the_dynamic_model">The
+<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="id749699"></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>
- </h5>
-<a name="spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model"></a><h5>
-<a name="id505576"></a>
- <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model">The
+ </h6>
+<a name="spirit.lex.reference.lexer_class.the_lexertl_actor_lexer_class_implementing_the_dynamic_model"></a><h6>
+<a name="id749712"></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>
- </h5>
-<a name="spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"></a><h5>
-<a name="id505606"></a>
- <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model">The
+ </h6>
+<a name="spirit.lex.reference.lexer_class.the_lexertl_static_lexer_class_implementing_the_static_model"></a><h6>
+<a name="id749725"></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>
- </h5>
-<a name="spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model"></a><h5>
-<a name="id505637"></a>
- <a href="lexer_class.html#spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model">The
+ </h6>
+<a name="spirit.lex.reference.lexer_class.the_lexertl_static_actor_lexer_class_implementing_the_static_model"></a><h6>
+<a name="id749738"></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>
- </h5>
+ </h6>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/token_class.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/token_class.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/token_class.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Token Class</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../reference.html" title=" Reference">
+<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="lexer_class.html" title="Lexer Class">
<link rel="next" href="tokendef_class.html" title="TokenDef Class">
</head>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_class.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="tokendef_class.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.reference.token_class"></a>Token Class</h4></div></div></div></div>
+<div class="section" title="Token Class"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.reference.token_class"></a><a class="link" href="token_class.html" title="Token Class">Token Class</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/tokendef_class.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>TokenDef Class</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../reference.html" title=" Reference">
+<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="token_class.html" title="Token Class">
<link rel="next" href="tokenset_class.html" title="TokenSet Class">
</head>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="token_class.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="tokenset_class.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.reference.tokendef_class"></a>TokenDef Class</h4></div></div></div></div>
+<div class="section" title="TokenDef Class"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.reference.tokendef_class"></a><a class="link" href="tokendef_class.html" title="TokenDef Class">TokenDef Class</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/reference/tokenset_class.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>TokenSet Class</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../reference.html" title=" Reference">
+<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="tokendef_class.html" title="TokenDef Class">
<link rel="next" href="../../faq.html" title="FAQ">
</head>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="tokendef_class.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="../../faq.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.reference.tokenset_class"></a>TokenSet Class</h4></div></div></div></div>
+<div class="section" title="TokenSet Class"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.lex.reference.tokenset_class"></a><a class="link" href="tokenset_class.html" title="TokenSet Class">TokenSet Class</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/lex/tutorials.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/lex/tutorials.html (original)
+++ trunk/libs/spirit/doc/html/spirit/lex/tutorials.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,15 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Spirit.Lex
- Tutorials</title>
+<title>Spirit.Lex Tutorials</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
-<link rel="up" href="../lex.html" title=" Spirit.Lex">
-<link rel="prev" href="../lex.html" title=" Spirit.Lex">
-<link rel="next" href="tutorials/lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
+<link rel="up" href="../lex.html" title="Spirit.Lex">
+<link rel="prev" href="../lex.html" title="Spirit.Lex">
+<link rel="next" href="tutorials/lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -24,11 +22,11 @@
<div class="spirit-nav">
<a accesskey="p" href="../lex.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../lex.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="tutorials/lexer_quickstart1.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Spirit.Lex Tutorials">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.lex.tutorials"></a><a href="tutorials.html" title=" Spirit.Lex
- Tutorials"> Spirit.Lex
- Tutorials</a></h3></div></div></div>
+<a name="spirit.lex.tutorials"></a><a class="link" href="tutorials.html" title="Spirit.Lex Tutorials"> Spirit.Lex
+ Tutorials</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt><a href="tutorials.html#spirit.lex.tutorials.lexer_tutorials"> Spirit.Lex
 Tutorials Overview</a></dt>
@@ -39,11 +37,11 @@
<dt><a href="tutorials/lexer_quickstart3.html"> Quickstart
 3 - Counting Words Using a Parser</a></dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Spirit.Lex Tutorials Overview">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.tutorials.lexer_tutorials"></a><a href="tutorials.html#spirit.lex.tutorials.lexer_tutorials" title=" Spirit.Lex
- Tutorials Overview"> Spirit.Lex
- Tutorials Overview</a></h4></div></div></div>
+<a name="spirit.lex.tutorials.lexer_tutorials"></a><a class="link" href="tutorials.html#spirit.lex.tutorials.lexer_tutorials" title="Spirit.Lex Tutorials Overview"> Spirit.Lex
+ Tutorials Overview</a>
+</h4></div></div></div>

 The Spirit.Lex library implements several components
 on top of possibly different lexer generator libraries. It exposes a pair
@@ -62,12 +60,12 @@
 generator library, all what needs to be implemented is a set of wrapper
 objects exposing a well defined interface as described in this documentation.
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 For the sake of clarity all examples in this documentation assume Spirit.Lex
 to be used on top of Lexertl.
 </td></tr>
@@ -80,23 +78,23 @@
 Here is a (non-complete) list of features you can tweak to adjust the generated
 lexer instance to the actual needs:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 Select and customize the token type to be generated by the lexer instance.
 </li>
-<li>
+<li class="listitem">
 Select and customize the token value types the generated token instances
 will be able to hold.
 </li>
-<li>
+<li class="listitem">
 Select the iterator type of the underlying input stream, which will be
 used as the source for the character stream to tokenize.
 </li>
-<li>
+<li class="listitem">
 Customize the iterator type returned by the lexer to enable debug support,
 special handling of certain input sequences, etc.
 </li>
-<li>
+<li class="listitem">
 Select the dynamic or the static
 runtime model for the lexical analyzer.
 </li>
@@ -109,17 +107,14 @@

 The series of tutorial examples of this section will guide you through
 some common use cases helping to understand the big picture. The first
- two quick start examples (<a href="tutorials/lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">Lex
+ two quick start examples (<a class="link" href="tutorials/lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">Lex
 Quickstart 1 - A word counter using Spirit.Lex</a>
- and <a href="tutorials/lexer_quickstart2.html" title=" Quickstart
- 2 - A better word counter using Spirit.Lex">Lex Quickstart
+ and <a class="link" href="tutorials/lexer_quickstart2.html" title="Quickstart 2 - A better word counter using Spirit.Lex">Lex Quickstart
 2 - A better word counter using Spirit.Lex</a>)
 introduce the Spirit.Lex library while building two
 standalone applications, not being connected to or depending on any other
 part of Spirit. The
- section <a href="tutorials/lexer_quickstart3.html" title=" Quickstart
- 3 - Counting Words Using a Parser">Lex Quickstart
+ section <a class="link" href="tutorials/lexer_quickstart3.html" title="Quickstart 3 - Counting Words Using a Parser">Lex Quickstart
 3 - Counting Words Using a Parser</a> demonstrates how to use a lexer
 in conjunction with a parser (where certainly the parser is built using
 Spirit.Qi).
@@ -128,8 +123,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,17 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Quickstart
- 1 - A word counter using Spirit.Lex</title>
+<title>Quickstart 1 - A word counter using Spirit.Lex</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../tutorials.html" title=" Spirit.Lex
- Tutorials">
-<link rel="prev" href="../tutorials.html" title=" Spirit.Lex
- Tutorials">
-<link rel="next" href="lexer_quickstart2.html" title=" Quickstart
- 2 - A better word counter using Spirit.Lex">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../tutorials.html" title="Spirit.Lex Tutorials">
+<link rel="prev" href="../tutorials.html" title="Spirit.Lex Tutorials">
+<link rel="next" href="lexer_quickstart2.html" title="Quickstart 2 - A better word counter using Spirit.Lex">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -26,11 +22,11 @@
<div class="spirit-nav">
<a accesskey="p" href="../tutorials.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorials.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="lexer_quickstart2.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Quickstart 1 - A word counter using Spirit.Lex">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.tutorials.lexer_quickstart1"></a><a href="lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex"> Quickstart
- 1 - A word counter using Spirit.Lex</a></h4></div></div></div>
+<a name="spirit.lex.tutorials.lexer_quickstart1"></a><a class="link" href="lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex"> Quickstart
+ 1 - A word counter using Spirit.Lex</a>
+</h4></div></div></div>

 Spirit.Lex is very modular, which follows the general
 building principle of the Spirit
@@ -38,28 +34,28 @@
 with the other parts of Spirit
 but nevertheless can be used separately to build standalone lexical analyzers.
 The first quick start example describes a standalone application: counting
- characters, words and lines in a file, very similar to what the well known
- Unix command <tt class="computeroutput">wc</tt> is doing
+ characters, words, and lines in a file, very similar to what the well known
+ Unix command <code class="computeroutput">wc</code> is doing
 (for the full example code see here: word_count_functor.cpp).
 
-<a name="spirit.lex.tutorials.lexer_quickstart1.prerequisites"></a><h5>
-<a name="id488986"></a>
- Prerequisites
- </h5>
+<a name="spirit.lex.tutorials.lexer_quickstart1.prerequisites"></a><h6>
+<a name="id732485"></a>
+ <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.prerequisites">Prerequisites</a>
+ </h6>

- The only required <tt class="computeroutput">#include</tt>
+ The only required <code class="computeroutput">#include</code>
 specific to Spirit.Lex follows. It is a wrapper for
 all necessary definitions to use Spirit.Lex in a standalone
 fashion, and on top of the Lexertl
- library. Additionally we <tt class="computeroutput">#include</tt>
- two of the Boost headers to define <tt class="computeroutput">boost::bind()</tt> and <tt class="computeroutput">boost::ref()</tt>.
+ library. Additionally we <code class="computeroutput">#include</code>
+ two of the Boost headers to define <code class="computeroutput">boost::bind()</code> and <code class="computeroutput">boost::ref()</code>.
 

 



-<pre class="programlisting">#include <boost/spirit/include/lex_lexer_lexertl.hpp>
+<pre class="programlisting">#include <boost/spirit/include/lex_lexertl.hpp>
#include <boost/bind.hpp>
#include <boost/ref.hpp>
</pre>
@@ -75,18 +71,17 @@



-<pre class="programlisting">using namespace boost::spirit;
-using namespace boost::spirit::lex;
+<pre class="programlisting">using namespace boost::spirit::lex;
</pre>

 

 
-<a name="spirit.lex.tutorials.lexer_quickstart1.defining_tokens"></a><h5>
-<a name="id489371"></a>
- <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.defining_tokens">Defining
+<a name="spirit.lex.tutorials.lexer_quickstart1.defining_tokens"></a><h6>
+<a name="id732730"></a>
+ <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.defining_tokens">Defining
 Tokens</a>
- </h5>
+ </h6>

 The most important step while creating a lexer using Spirit.Lex
 is to define the tokens to be recognized in the input sequence. This is
@@ -99,16 +94,16 @@

 

- The template <tt class="computeroutput">word_count_tokens</tt>
- defines three different tokens: <tt class="computeroutput">ID_WORD</tt>,
- <tt class="computeroutput">ID_EOL</tt>, and <tt class="computeroutput">ID_CHAR</tt>, representing a word (anything
+ The template <code class="computeroutput">word_count_tokens</code>
+ defines three different tokens: <code class="computeroutput">ID_WORD</code>,
+ <code class="computeroutput">ID_EOL</code>, and <code class="computeroutput">ID_CHAR</code>, representing a word (anything
 except a whitespace or a newline), a newline character, and any other
- character (<tt class="computeroutput">ID_WORD</tt>,
- <tt class="computeroutput">ID_EOL</tt>, and <tt class="computeroutput">ID_CHAR</tt> are enum values representing
+ character (<code class="computeroutput">ID_WORD</code>,
+ <code class="computeroutput">ID_EOL</code>, and <code class="computeroutput">ID_CHAR</code> are enum values representing
 the token ids, but could be anything else convertible to an integer as
 well). The direct base class of any token definition class needs to be
- the template <tt class="computeroutput">lexer_def<></tt>, where the corresponding template
- parameter (here: <tt class="computeroutput">lexertl_lexer<BaseIterator></tt>) defines which underlying lexer engine
+ the template <code class="computeroutput">lexer_def<></code>, where the corresponding template
+ parameter (here: <code class="computeroutput">lexertl_lexer<BaseIterator></code>) defines which underlying lexer engine
 has to be used to provide the required state machine functionality. In
 this example we use the Lexertl based lexer engine as the underlying
 lexer type.
@@ -119,14 +114,13 @@


<pre class="programlisting">template <typename Lexer>
-struct word_count_tokens : lexer_def<Lexer>
+struct word_count_tokens : lexer<Lexer>
{
- template <typename Self>
- void def (Self& self)
+ word_count_tokens()
 {
 // define tokens (the regular expression to match and the corresponding
 // token id) and add them to the lexer
- self.add
+ this->self.add
 ("[^ \t\n]+", ID_WORD) // words (anything except ' ', '\t' or '\n')
 ("\n", ID_EOL) // newline characters
 (".", ID_CHAR) // anything else is a plain character
@@ -138,18 +132,18 @@
 

 
-<a name="spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work"></a><h5>
-<a name="id489877"></a>
- <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work">Doing
+<a name="spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work"></a><h6>
+<a name="id733038"></a>
+ <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.doing_the_useful_work">Doing
 the Useful Work</a>
- </h5>
+ </h6>

 We will use a setup, where we want the Spirit.Lex
 library to invoke a given function after any of of the generated tokens
 is recognized. For this reason we need to implement a functor taking at
 least the generated token as an argument and returning a boolean value
 allowing to stop the tokenization process. The default token type used
- in this example carries a token value of the type <tt class="computeroutput">iterator_range<BaseIterator></tt> pointing to the matched range in the
+ in this example carries a token value of the type <code class="computeroutput">iterator_range<BaseIterator></code> pointing to the matched range in the
 underlying input sequence.
 

@@ -175,8 +169,8 @@
 switch (t.id()) {
 case ID_WORD: // matched a word
 // since we're using a default token type in this example, every
- // token instance contains a `iterator_range<BaseIterator>` as its
- // token value pointing to the matched character sequence in the input
+ // token instance contains a `iterator_range<BaseIterator>` as its token
+ // attribute pointing to the matched character sequence in the input
 ++w; c += t.value().size();
 break;
 case ID_EOL: // matched a newline character
@@ -196,26 +190,26 @@
 

 All what's left is to write some boilerplate code helping to tie together
- the pieces described so far. To simplify this example we call the <tt class="computeroutput">lex::tokenize()</tt>
+ the pieces described so far. To simplify this example we call the <code class="computeroutput">lex::tokenize()</code>
 function implemented in Spirit.Lex (for a more detailed
- description of this function see here: FIXME),
+ description of this function see here: FIXME),
 even if we could have written a loop to iterate over the lexer iterators
- [<tt class="computeroutput">first</tt>, <tt class="computeroutput">last</tt>)
+ [<code class="computeroutput">first</code>, <code class="computeroutput">last</code>)
 as well.
 
-<a name="spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together"></a><h5>
-<a name="id490577"></a>
- <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together">Pulling
+<a name="spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together"></a><h6>
+<a name="id733802"></a>
+ <a class="link" href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.pulling_everything_together">Pulling
 Everything Together</a>
- </h5>
+ </h6>

 

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

@@ -232,13 +226,13 @@
 std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));

 // create the token definition instance needed to invoke the lexical analyzer
- word_count_tokens<lexertl_lexer<> > word_count_functor;
+ word_count_tokens<lexertl::lexer<> > word_count_functor;

 // tokenize the given string, the bound functor gets invoked for each of
 // the matched tokens
 char const* first = str.c_str();
 char const* last = &first[str.size()];
- bool r = lex::tokenize(first, last, make_lexer(word_count_functor),
+ bool r = tokenize(first, last, word_count_functor,
 boost::bind(counter(), _1, boost::ref(c), boost::ref(w), boost::ref(l)));

 // print results
@@ -258,23 +252,23 @@
 

 
-<a name="spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_"></a><h5>
-<a name="id491716"></a>
- <a href="lexer_quickstart1.html#spirit.lex.tutorials.lexer_quickstart1.comparing__emphasis_spirit_lex__emphasis__with__ulink_url__http___flex_sourceforge_net___flex__ulink_">Comparing
+<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="id734625"></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
 Spirit.Lex with Flex</a>
- </h5>
+ </h6>

- This example was deliberately chosen to be similar as much as possible
+ This example was deliberately chosen to be as much as possible similar
 to the equivalent Flex
 program (see below), which isn't too different from what has to be written
 when using Spirit.Lex.
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../../../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 Interestingly enough, performance comparisons of lexical analyzers written
 using Spirit.Lex with equivalent programs generated
 by Flex show that both
@@ -341,8 +335,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,17 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Quickstart
- 2 - A better word counter using Spirit.Lex</title>
+<title>Quickstart 2 - A better word counter using Spirit.Lex</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../tutorials.html" title=" Spirit.Lex
- Tutorials">
-<link rel="prev" href="lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">
-<link rel="next" href="lexer_quickstart3.html" title=" Quickstart
- 3 - Counting Words Using a Parser">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../tutorials.html" title="Spirit.Lex Tutorials">
+<link rel="prev" href="lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">
+<link rel="next" href="lexer_quickstart3.html" title="Quickstart 3 - Counting Words Using a Parser">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -26,30 +22,29 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_quickstart1.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorials.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="lexer_quickstart3.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Quickstart 2 - A better word counter using Spirit.Lex">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.tutorials.lexer_quickstart2"></a><a href="lexer_quickstart2.html" title=" Quickstart
- 2 - A better word counter using Spirit.Lex"> Quickstart
- 2 - A better word counter using Spirit.Lex</a></h4></div></div></div>
+<a name="spirit.lex.tutorials.lexer_quickstart2"></a><a class="link" href="lexer_quickstart2.html" title="Quickstart 2 - A better word counter using Spirit.Lex"> Quickstart
+ 2 - A better word counter using Spirit.Lex</a>
+</h4></div></div></div>

 People knowing Flex will
- probably complain about the example from the section <a href="lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">Lex
+ probably complain about the example from the section <a class="link" href="lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">Lex
 Quickstart 1 - A word counter using Spirit.Lex</a>
 as being overly complex and not being written to leverage the possibilities
 provided by this tool. In particular the previous example did not directly
- use the lexer actions to count the lines, words and characters. So the
+ use the lexer actions to count the lines, words, and characters. So the
 example provided in this step of the tutorial will show how to use semantic
 actions in Spirit.Lex. Even if it still will allow
 to count text elements only it introduces other new concepts and configuration
 options along the lines (for the full example code see here: word_count_lexer.cpp).
 
-<a name="spirit.lex.tutorials.lexer_quickstart2.prerequisites"></a><h5>
-<a name="id492776"></a>
- Prerequisites
- </h5>
+<a name="spirit.lex.tutorials.lexer_quickstart2.prerequisites"></a><h6>
+<a name="id735401"></a>
+ <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.prerequisites">Prerequisites</a>
+ </h6>

- In addition to the only required <tt class="computeroutput">#include</tt>
+ In addition to the only required <code class="computeroutput">#include</code>
 specific to Spirit.Lex this example needs to include
 a couple of header files from the Phoenix2
 library. This example shows how to attach functors to token definitions,
@@ -65,8 +60,7 @@



-<pre class="programlisting">#include <boost/spirit/include/support_argument.hpp>
-#include <boost/spirit/include/lex_lexer_lexertl.hpp>
+<pre class="programlisting">#include <boost/spirit/include/lex_lexertl.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/spirit/include/phoenix_algorithm.hpp>
@@ -119,18 +113,18 @@
 

 
-<a name="spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_"></a><h5>
-<a name="id493728"></a>
- <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_">Semantic
+<a name="spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_"></a><h6>
+<a name="id737157"></a>
+ <a class="link" href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.semantic_actions_in__emphasis_spirit_lex__emphasis_">Semantic
 Actions in Spirit.Lex</a>
- </h5>
+ </h6>

 Spirit.Lex uses a very similar way of associating
 actions with the token definitions (which should look familiar to anybody
 knowlegdeable with Spirit
- as well): specifying the operations to execute inside of a pair of <tt class="computeroutput">[]</tt> brackets. In order to be able to attach
+ as well): specifying the operations to execute inside of a pair of <code class="computeroutput">[]</code> brackets. In order to be able to attach
 semantic actions to token definitions for each of them there is defined
- an instance of a <tt class="computeroutput">token_def<></tt>.
+ an instance of a <code class="computeroutput">token_def<></code>.
 

 
@@ -138,27 +132,25 @@


<pre class="programlisting">template <typename Lexer>
-struct word_count_tokens : lexer_def<Lexer>
+struct word_count_tokens : lexer<Lexer>
{
 word_count_tokens()
- : c(0), w(0), l(0),
- word("[^ \t\n]+"), eol("\n"), any(".") // define tokens
- {}
-
- template <typename Self>
- void def (Self& self)
+ : c(0), w(0), l(0)
+ , word("[^ \t\n]+") // define tokens
+ , eol("\n")
+ , any(".")
 {
 using boost::phoenix::ref;
 using boost::phoenix::distance;
- using boost::spirit::arg_names::_1;

 // associate tokens with the lexer
- self = word [++ref(w), ref(c) += distance(_1)]
+ this->self
+ = word [++ref(w), ref(c) += distance(_1)]
 | eol [++ref(c), ++ref(l)]
 | any [++ref(c)]
 ;
 }
-
+
 std::size_t c, w, l;
 token_def<> word, eol, any;
};
@@ -168,7 +160,7 @@

 

- The semantics of the shown code is as follows. The code inside the <tt class="computeroutput">[]</tt> brackets will be executed whenever the
+ The semantics of the shown code is as follows. The code inside the <code class="computeroutput">[]</code> brackets will be executed whenever the
 corresponding token has been matched by the lexical analyzer. This is very
 similar to Flex, where
 the action code associated with a token definition gets executed after
@@ -179,31 +171,31 @@
 
<pre class="programlisting">void f (Range r, Idtype id, bool& matched, Context& ctx);
</pre>
-<div class="variablelist">
+<div class="variablelist" title="where:">
where:
<dl>
-<dt><tt class="computeroutput">Range
- r</tt></dt>
+<dt><code class="computeroutput">Range
+ r</code></dt>
<dd>
- This is a <tt class="computeroutput">boost::iterator_range</tt> holding two iterators
+ This is a <code class="computeroutput">boost::iterator_range</code> holding two iterators
 pointing to the matched range in the underlying input sequence. The
 type of the held iterators is the same as specified while defining
- the type of the <tt class="computeroutput">lexertl_lexer<...></tt> (its first template parameter).
+ the type of the <code class="computeroutput">lexertl_lexer<...></code> (its first template parameter).
 </dd>
-<dt><tt class="computeroutput">Idtype
- id</tt></dt>
+<dt><code class="computeroutput">Idtype
+ id</code></dt>
<dd>
- This is the token id of the type <tt class="computeroutput">std::size_t</tt>
+ This is the token id of the type <code class="computeroutput">std::size_t</code>
 for the matched token.
 </dd>
-<dt><tt class="computeroutput">bool& matched</tt></dt>
+<dt><code class="computeroutput">bool& matched</code></dt>
<dd>
- This boolean value is pre/initialized to <tt class="computeroutput">true</tt>.
- If the functor sets it to <tt class="computeroutput">false</tt>
+ This boolean value is pre/initialized to <code class="computeroutput">true</code>.
+ If the functor sets it to <code class="computeroutput">false</code>
 the lexer stops calling any semantic actions attached to this token
- and behaves as if the token have not been matched in the first place.
+ and behaves as if the token has not been matched in the first place.
 </dd>
-<dt><tt class="computeroutput">Context& ctx</tt></dt>
+<dt><code class="computeroutput">Context& ctx</code></dt>
<dd>
 This is a reference to a lexer specific, unspecified type, providing
 the context for the current lexer state. It can be used to access different
@@ -226,27 +218,26 @@
 lexer semantic actions is to use Phoenix2.
 In this case you can access the four parameters described in the table
 above by using the predefined Spirit
- placeholders: <tt class="computeroutput">_1</tt> for the
- iterator range, <tt class="computeroutput">_2</tt> for
- the token id, <tt class="computeroutput">_3</tt> for the
+ placeholders: <code class="computeroutput">_1</code> for the
+ iterator range, <code class="computeroutput">_2</code> for
+ the token id, <code class="computeroutput">_3</code> for the
 reference to the boolean value signaling the outcome of the semantic action,
- and <tt class="computeroutput">_4</tt> for the reference
+ and <code class="computeroutput">_4</code> for the reference
 to the internal lexer context.
 
-<a name="spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer"></a><h5>
-<a name="id495186"></a>
- <a href="lexer_quickstart2.html#spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer">Associating
+<a name="spirit.lex.tutorials.lexer_quickstart2.associating_token_definitions_with_the_lexer"></a><h6>
+<a name="id738129"></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>
- </h5>
+ </h6>

- If you compare the with the code from <a href="lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">Lex
+ If you compare this code to the code from <a class="link" href="lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">Lex
 Quickstart 1 - A word counter using Spirit.Lex</a>
 with regard to the way how token definitions are associated with the lexer,
- you will notice a different syntax being used here. If in the previous
- example we have been using the <tt class="computeroutput">self.add()</tt> style of the API, then here we directly
- assign the token definitions to <tt class="computeroutput">self</tt>,
- combining the different token definitions using the <tt class="computeroutput">|</tt>
+ you will notice a different syntax being used here. In the previous example
+ we have been using the <code class="computeroutput">self.add()</code> style of the API, while we here directly
+ assign the token definitions to <code class="computeroutput">self</code>,
+ combining the different token definitions using the <code class="computeroutput">|</code>
 operator. Here is the code snippet again:
 
<pre class="programlisting">self = word [++ref(w), ref(c) += distance(_1)]
@@ -257,24 +248,24 @@

 This way we have a very powerful and natural way of building the lexical
 analyzer. If translated into English this may be read as: The lexical analyer
- will recognize ('<tt class="computeroutput">=</tt>') tokens
- as defined by any of ('<tt class="computeroutput">|</tt>')
- the token definitions <tt class="computeroutput">word</tt>,
- <tt class="computeroutput">eol</tt>, and <tt class="computeroutput">any</tt>.
+ will recognize ('<code class="computeroutput">=</code>') tokens
+ as defined by any of ('<code class="computeroutput">|</code>')
+ the token definitions <code class="computeroutput">word</code>,
+ <code class="computeroutput">eol</code>, and <code class="computeroutput">any</code>.
 

 A second difference to the previous example is that we do not explicitly
 specify any token ids to use for the separate tokens. Using semantic actions
- to trigger some useful work free'd us from the need to define these. To
- ensure every token gets assigned a id the Spirit.Lex
+ to trigger some useful work has freed us from the need to define those.
+ To ensure every token gets assigned a id the Spirit.Lex
 library internally assigns unique numbers to the token definitions, starting
- with the constant defined by <tt class="computeroutput">boost::spirit::lex::min_token_id</tt>.
+ with the constant defined by <code class="computeroutput">boost::spirit::lex::min_token_id</code>.
 
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,16 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title> Quickstart
- 3 - Counting Words Using a Parser</title>
+<title>Quickstart 3 - Counting Words Using a Parser</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../tutorials.html" title=" Spirit.Lex
- Tutorials">
-<link rel="prev" href="lexer_quickstart2.html" title=" Quickstart
- 2 - A better word counter using Spirit.Lex">
-<link rel="next" href="../abstracts.html" title=" Abstracts">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
+<link rel="up" href="../tutorials.html" title="Spirit.Lex Tutorials">
+<link rel="prev" href="lexer_quickstart2.html" title="Quickstart 2 - A better word counter using Spirit.Lex">
+<link rel="next" href="../abstracts.html" title="Abstracts">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -25,11 +22,11 @@
<div class="spirit-nav">
<a accesskey="p" href="lexer_quickstart2.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../tutorials.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="../abstracts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Quickstart 3 - Counting Words Using a Parser">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.lex.tutorials.lexer_quickstart3"></a><a href="lexer_quickstart3.html" title=" Quickstart
- 3 - Counting Words Using a Parser"> Quickstart
- 3 - Counting Words Using a Parser</a></h4></div></div></div>
+<a name="spirit.lex.tutorials.lexer_quickstart3"></a><a class="link" href="lexer_quickstart3.html" title="Quickstart 3 - Counting Words Using a Parser"> Quickstart
+ 3 - Counting Words Using a Parser</a>
+</h4></div></div></div>

 The whole purpose of integrating Spirit.Lex as part
 of the Spirit library
@@ -42,8 +39,7 @@
 usage of possibly different lexical analyzer libraries. The utilization
 of iterators seemed to be the right choice from this standpoint as well,
 mainly because these can be used as an abstraction layer hiding implementation
- specifics of the used lexer library. The <a href="lexer_quickstart3.html#spirit.lex.flowcontrol" title="Figure 4. The common flow control implemented while parsing
- combined with lexical analysis">picture</a>
+ specifics of the used lexer library. The <a class="link" href="lexer_quickstart3.html#spirit.lex.flowcontrol" title="Figure 4. The common flow control implemented while parsing combined with lexical analysis">picture</a>
 below shows the common flow control implemented while parsing combined
 with lexical analysis.
 
@@ -52,16 +48,15 @@
<div class="figure">
<a name="spirit.lex.flowcontrol"></a>Figure 4. The common flow control implemented while parsing
 combined with lexical analysis
-<img src="../../.././images/flowofcontrol.png" alt="The common flow
- control implemented while parsing combined with lexical analysis">
+<div class="figure-contents"><img src="../../.././images/flowofcontrol.png" alt="The common flow control implemented while parsing combined with lexical analysis"></div>
</div>
-
+ 
 

 Another problem related to the integration of the lexical analyzer with
 the parser was to find a way how the defined tokens syntactically could
 be blended with the grammar definition syntax of Spirit.
- For tokens defined as instances of the <tt class="computeroutput">token_def<></tt> class the most natural way of integration
+ For tokens defined as instances of the <code class="computeroutput">token_def<></code> class the most natural way of integration
 was to allow to directly use these as parser components. Semantically these
 parser components succeed matching their input whenever the corresponding
 token type has been matched by the lexer. This quick start example will
@@ -69,14 +64,14 @@
 the numbers inside of semantic actions of a parser (for the full example
 code see here: word_count.cpp).
 
-<a name="spirit.lex.tutorials.lexer_quickstart3.prerequisites"></a><h5>
-<a name="id495762"></a>
- Prerequisites
- </h5>
+<a name="spirit.lex.tutorials.lexer_quickstart3.prerequisites"></a><h6>
+<a name="id738510"></a>
+ <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.prerequisites">Prerequisites</a>
+ </h6>

 This example uses two of the Spirit
 library components: Spirit.Lex and Spirit.Qi,
- consequently we have to <tt class="computeroutput">#include</tt>
+ consequently we have to <code class="computeroutput">#include</code>
 the corresponding header files. Again, we need to include a couple of header
 files from the Phoenix2
 library. This example shows how to attach functors to parser components,
@@ -93,7 +88,7 @@


<pre class="programlisting">#include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/lex_lexer_lexertl.hpp>
+#include <boost/spirit/include/lex_lexertl.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_statement.hpp>
#include <boost/spirit/include/phoenix_container.hpp>
@@ -111,6 +106,7 @@


<pre class="programlisting">using namespace boost::spirit;
+using namespace boost::spirit::ascii;
using namespace boost::spirit::qi;
using namespace boost::spirit::lex;
</pre>
@@ -118,22 +114,20 @@
 

 
-<a name="spirit.lex.tutorials.lexer_quickstart3.defining_tokens"></a><h5>
-<a name="id496323"></a>
- <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.defining_tokens">Defining
+<a name="spirit.lex.tutorials.lexer_quickstart3.defining_tokens"></a><h6>
+<a name="id738941"></a>
+ <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.defining_tokens">Defining
 Tokens</a>
- </h5>
+ </h6>

- If compared to the two previous quick start examples (<a href="lexer_quickstart1.html" title=" Quickstart
- 1 - A word counter using Spirit.Lex">Lex
+ If compared to the two previous quick start examples (<a class="link" href="lexer_quickstart1.html" title="Quickstart 1 - A word counter using Spirit.Lex">Lex
 Quickstart 1 - A word counter using Spirit.Lex</a>
- and <a href="lexer_quickstart2.html" title=" Quickstart
- 2 - A better word counter using Spirit.Lex">Lex Quickstart
+ and <a class="link" href="lexer_quickstart2.html" title="Quickstart 2 - A better word counter using Spirit.Lex">Lex Quickstart
 2 - A better word counter using Spirit.Lex</a>)
 the token definition class for this example does not reveal any surprises.
 However, it uses lexer token definition macros to simplify the composition
 of the regular expressions, which will be described in more detail in the
- section FIXME. Generally, any token definition
+ section FIXME. Generally, any token definition
 is usable without modification either for a standalone lexical analyzer
 or in conjunction with a parser.
 
@@ -143,59 +137,59 @@


<pre class="programlisting">template <typename Lexer>
-struct word_count_tokens : lexer_def<Lexer>
+struct word_count_tokens : lexer<Lexer>
{
- template <typename Self>
- void def (Self& self)
+ word_count_tokens()
 {
 // define patterns (lexer macros) to be used during token definition
 // below
- self.add_pattern
+ this->self.add_pattern
 ("WORD", "[^ \t\n]+")
 ;
-
+
 // define tokens and associate them with the lexer
 word = "{WORD}"; // reference the pattern 'WORD' as defined above

 // this lexer will recognize 3 token types: words, newlines, and
 // everything else
- self.add
+ this->self.add
 (word) // no token id is needed here
 ('\n') // characters are usable as tokens as well
- (".", IDANY)
- ;
+ (".", IDANY) // string literals will not be esacped by the library
+ ;
 }
-
- token_def<std::string> word;
+
+ // the token 'word' exposes the matched string as its parser attribute
+ token_def<std::string> word;
};
</pre>

 

 
-<a name="spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers"></a><h5>
-<a name="id496819"></a>
- <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers">Using
+<a name="spirit.lex.tutorials.lexer_quickstart3.using_token_definition_instances_as_parsers"></a><h6>
+<a name="id739461"></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>
- </h5>
+ </h6>

 While the integration of lexer and parser in the control flow is achieved
 by using special iterators wrapping the lexical analyzer, we still nead
 a means of expressing in the grammar what tokens to match and where. The
 token definition class above uses three different ways of defining a token:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
- Using an instance of a <tt class="computeroutput">token_def<></tt>, which is handy whenever you
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ Using an instance of a <code class="computeroutput">token_def<></code>, which is handy whenever you
 need to specify a token attribute (for more information about lexer related
- attributes please look here: <a href="../abstracts/lexer_attributes.html" title=" Lexer Attributes">Lexer
+ attributes please look here: <a class="link" href="../abstracts/lexer_attributes.html" title="Lexer Attributes">Lexer
 Attributes</a>).
 </li>
-<li>
+<li class="listitem">
 Using a single character as the token, in this case the character represents
 itself as a token, where the token id is the ASCII character value.
 </li>
-<li>
+<li class="listitem">
 Using a regular expression represented as a string, where the token id
 needs to be specified explicitly to make the token accessible from the
 grammar level.
@@ -228,12 +222,12 @@
<tr>
<td>
 
- <tt class="computeroutput">token_def<></tt>
+ <code class="computeroutput">token_def<></code>
 
 </td>
<td>
 
- The <tt class="computeroutput">token_def<></tt>
+ The <code class="computeroutput">token_def<></code>
 instance is directly usable as a parser component. Parsing of this
 component will succeed if the regular expression used to define
 this has been matched successfully.
@@ -249,7 +243,7 @@
<td>
 
 The single character is directly usable in the grammar, under certain
- circumstances it needs to be wrapped by a <tt class="computeroutput">char_()</tt> parser component, though. Parsing
+ circumstances it needs to be wrapped by a <code class="computeroutput">char_()</code> parser component, though. Parsing
 of this component will succeed if the single character has been
 matched.
 
@@ -264,10 +258,10 @@
<td>
 
 To use an explicit token id in a Spirit.Qi
- grammar you are required to wrap it with the special <tt class="computeroutput">token()</tt>
+ grammar you are required to wrap it with the special <code class="computeroutput">token()</code>
 parser component. Parsing of this component will succeed if the
 current token has the same token id as specified in the expression
- <tt class="computeroutput">token(<id>)</tt>.
+ <code class="computeroutput">token(<id>)</code>.
 
 </td>
</tr>
@@ -287,19 +281,14 @@
{
 template <typename TokenDef>
 word_count_grammar(TokenDef const& tok)
- : grammar<Iterator>(start), c(0), w(0), l(0)
+ : word_count_grammar::base_type(start)
+ , c(0), w(0), l(0)
 {
 using boost::phoenix::ref;
 using boost::phoenix::size;
-
- // As documented in the Spirit.Qi documentation, any placeholders
- // (_1 et.al.) used in semantic actions inside a grammar need to be
- // imported from the namespace boost::spirit::arg_names, and not from
- // the corresponding namespace in Phoenix.
- using boost::spirit::arg_names::_1;

 start = *( tok.word [++ref(w), ref(c) += size(_1)]
- | char_('\n') [++ref(c), ++ref(l)]
+ | lit('\n') [++ref(c), ++ref(l)]
 | token(IDANY) [++ref(c)]
 )
 ;
@@ -314,54 +303,53 @@

 

- As already described (see: Attributes),
+ As already described (see: <a class="link" href="../../qi_and_karma/abstracts/attributes.html" title="Attributes">Attributes</a>),
 the Spirit.Qi parser library builds upon a set of
 of fully attributed parser components. Consequently, all the token definitions
 do support the this attribute model as well. The most natural way of implementing
 this was to use the token values as the attributes exposed by the parser
 component corresponding to the token definition (you can read more about
- this topic here: <a href="../abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values" title="
- About Tokens and Token Values">About
+ this topic here: <a class="link" href="../abstracts.html#spirit.lex.abstracts.lexer_primitives.lexer_token_values" title="About Tokens and Token Values">About
 Tokens and Token Values</a>). The example above takes advantage of the
- full integration of the token values as the <tt class="computeroutput">token_def<></tt>'s parser attributes: the <tt class="computeroutput">word</tt> token definition is declared as
- a <tt class="computeroutput">token_def<std::string></tt>,
- making every instance of a <tt class="computeroutput">word</tt>
+ full integration of the token values as the <code class="computeroutput">token_def<></code>'s parser attributes: the <code class="computeroutput">word</code> token definition is declared as
+ a <code class="computeroutput">token_def<std::string></code>,
+ making every instance of a <code class="computeroutput">word</code>
 token carry the string representation of the matched input sequence as
- its value. The semantic action attached to <tt class="computeroutput">tok.word</tt>
- receives this string (represented by the <tt class="computeroutput">_1</tt>
+ its value. The semantic action attached to <code class="computeroutput">tok.word</code>
+ receives this string (represented by the <code class="computeroutput">_1</code>
 placeholder) and uses it to calculate the number of matched characters:
- <tt class="computeroutput">ref(c) +=
- size(_1)</tt>.
+ <code class="computeroutput">ref(c) +=
+ size(_1)</code>.
 
-<div class="important"><table border="0" summary="Important">
+<div class="important" title="Important"><table border="0" summary="Important">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="../../../images/important.png"></td>
<th align="left">Important</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
- All placeholders (<tt class="computeroutput">_1</tt>,
- <tt class="computeroutput">_2</tt>, etc.) used in parser
+<tr><td align="left" valign="top">
+ All placeholders (<code class="computeroutput">_1</code>,
+ <code class="computeroutput">_2</code>, etc.) used in parser
 semantic actions in conjunction with functors created based on Phoenix2 need to be imported
- from the <tt class="computeroutput">namespace boost::spirit::arg_names</tt>
- (and not <tt class="computeroutput">namespace
- boost::phoenix::arg_names</tt>, which is different from
+ from the <code class="computeroutput">namespace boost::spirit::arg_names</code>
+ (and not <code class="computeroutput">namespace
+ boost::phoenix::arg_names</code>, which is different from
 using placeholders in Spirit.Lex). Using the wrong
 placeholders leads to subtle compilation errors which are difficult to
 backtrack to their cause.
 </td></tr>
</table></div>
-<a name="spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together"></a><h5>
-<a name="id498236"></a>
- <a href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together">Pulling
+<a name="spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together"></a><h6>
+<a name="id740406"></a>
+ <a class="link" href="lexer_quickstart3.html#spirit.lex.tutorials.lexer_quickstart3.pulling_everything_together">Pulling
 Everything Together</a>
- </h5>
+ </h6>

 The main function needs to implement a bit more logic now as we have to
 initialize and start not only the lexical analysis but the parsing process
- as well. The three type definitions (<tt class="computeroutput">typedef</tt>
+ as well. The three type definitions (<code class="computeroutput">typedef</code>
 statements) simplify the creation of the lexical analyzer and the grammar.
 After reading the contents of the given file into memory it calls the function
- tokenize_and_parse()
+ <a class="link" href="../../qi_and_karma/abstracts/parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function"><code class="computeroutput">tokenize_and_parse()</code></a>
 to initialize the lexical analysis and parsing processes.
 

@@ -371,18 +359,18 @@

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

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

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

 // now we use the types defined above to create the lexer and grammar
 // object instances needed to invoke the parsing process
- word_count_tokens<lexer_type> word_count; // Our token definition
- word_count_grammar<iterator_type> g (word_count); // Our grammar definition
+ word_count_tokens<lexer_type> word_count; // Our lexer
+ word_count_grammar<iterator_type> g (word_count); // Our parser

 // read in the file int memory
 std::string str (read_from_file(1 == argc ? "word_count.input" : argv[1]));
@@ -393,7 +381,7 @@
 // stream read from the input. The function `tokenize_and_parse()` wraps
 // the passed iterator range `[first, last)` by the lexical analyzer and
 // uses its exposed iterators to parse the toke stream.
- bool r = tokenize_and_parse(first, last, make_lexer(word_count), g);
+ bool r = tokenize_and_parse(first, last, word_count, g);

 if (r) {
 std::cout << "lines: " << g.l << ", words: " << g.w
@@ -415,22 +403,19 @@
 
<div class="calloutlist"><table border="0" summary="Callout list">
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit4"></a> </td>
-<td valign="top" align="left"> define the token type to be used: <tt class="computeroutput">std::string</tt>
- is available as the type of the token value </td>
+<td width="5%" valign="top" align="left"><a name="spirit4"></a> </td>
+<td valign="top" align="left"> define the token type to be used: <code class="computeroutput">std::string</code>
+ is available as the type of the token attribute </td>
</tr>
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit5"></a> </td>
-<td valign="top" align="left"> define the lexer type to
- use implementing the state machine </td>
+<td width="5%" valign="top" align="left"><a name="spirit5"></a> </td>
+<td valign="top" align="left"> define the lexer type
+ to use implementing the state machine </td>
</tr>
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit6"></a> </td>
-<td valign="top" align="left"> define the iterator type exposed by
- the lexer type </td>
+<td width="5%" valign="top" align="left"><a name="spirit6"></a> </td>
+<td valign="top" align="left"> define the iterator type exposed
+ by the lexer type </td>
</tr>
</table></div>

@@ -440,8 +425,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/notes.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/notes.html (original)
+++ trunk/libs/spirit/doc/html/spirit/notes.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,12 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Notes</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="faq.html" title="FAQ">
-<link rel="next" href="notes/porting_from_spirit_1_8_x.html" title="Porting from
- Spirit 1.8.x">
+<link rel="next" href="notes/porting_from_spirit_1_8_x.html" title="Porting from Spirit 1.8.x">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="faq.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="notes/porting_from_spirit_1_8_x.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Notes">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.notes"></a>Notes</h2></div></div></div>
+<a name="spirit.notes"></a><a class="link" href="notes.html" title="Notes">Notes</a>
+</h2></div></div></div>
<div class="toc"><dl>
<dt>Portability</dt>
<dt><a href="notes/porting_from_spirit_1_8_x.html">Porting from
@@ -33,13 +33,14 @@
<dt>Style Guide</dt>
<dt>Techniques</dt>
</dl></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.notes.portability"></a>Portability</h3></div></div></div></div>
+<div class="section" title="Portability"><div class="titlepage"><div><div><h3 class="title">
+<a name="spirit.notes.portability"></a><a class="link" href="notes.html#spirit.notes.portability" title="Portability">Portability</a>
+</h3></div></div></div></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html (original)
+++ trunk/libs/spirit/doc/html/spirit/notes/porting_from_spirit_1_8_x.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,11 +1,10 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Porting from
- Spirit 1.8.x</title>
+<title>Porting from Spirit 1.8.x</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../notes.html" title="Notes">
<link rel="prev" href="../notes.html" title="Notes">
<link rel="next" href="style_guide.html" title="Style Guide">
@@ -23,14 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="../notes.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../notes.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="style_guide.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.notes.porting_from_spirit_1_8_x"></a><a href="porting_from_spirit_1_8_x.html" title="Porting from
- Spirit 1.8.x">Porting from
- Spirit 1.8.x</a></h3></div></div></div></div>
+<div class="section" title="Porting from Spirit 1.8.x"><div class="titlepage"><div><div><h3 class="title">
+<a name="spirit.notes.porting_from_spirit_1_8_x"></a><a class="link" href="porting_from_spirit_1_8_x.html" title="Porting from Spirit 1.8.x">Porting from
+ Spirit 1.8.x</a>
+</h3></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/notes/style_guide.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/notes/style_guide.html (original)
+++ trunk/libs/spirit/doc/html/spirit/notes/style_guide.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,11 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Style Guide</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../notes.html" title="Notes">
-<link rel="prev" href="porting_from_spirit_1_8_x.html" title="Porting from
- Spirit 1.8.x">
+<link rel="prev" href="porting_from_spirit_1_8_x.html" title="Porting from Spirit 1.8.x">
<link rel="next" href="techniques.html" title="Techniques">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="porting_from_spirit_1_8_x.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../notes.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="techniques.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Style Guide">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.notes.style_guide"></a>Style Guide</h3></div></div></div>
+<a name="spirit.notes.style_guide"></a><a class="link" href="style_guide.html" title="Style Guide">Style Guide</a>
+</h3></div></div></div>

 At some point, especially when there are lots of semantic actions attached
 to various points, the grammar tends to be quite difficult to follow. In
@@ -38,22 +38,22 @@
 coding guidelines</a> (David Abrahams and Nathan Myers) and is the combined
 work of Joel de Guzman, Chris Uzdavinis and Hartmut Kaiser.
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 Rule names use std C++ (Boost) convention. The rule name may be very long.
 </li>
-<li>
+<li class="listitem">
 The '=' is neatly indented 4 spaces below. Like in Boost, use spaces instead
 of tabs.
 </li>
-<li>
+<li class="listitem">
 Breaking the operands into separate lines puts the semantic actions neatly
 to the right.
 </li>
-<li>
+<li class="listitem">
 Semicolon at the last line terminates the rule.
 </li>
-<li>
+<li class="listitem">
 The adjacent parts of a sequence should be indented accordingly to have
 all, what belongs to one level, at one indentation level.
 </li>
@@ -66,20 +66,20 @@
 >> etc
 ;
</pre>
-<div class="itemizedlist"><ul type="disc">
-<li>
- Prefer literals in the grammar instead of identifiers. e.g. <tt class="computeroutput">"program"</tt> instead of <tt class="computeroutput">PROGRAM</tt>, <tt class="computeroutput">'>='</tt>
- instead of <tt class="computeroutput">GTE</tt> and <tt class="computeroutput">'.'</tt> instead of <tt class="computeroutput">DOT</tt>.
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ Prefer literals in the grammar instead of identifiers. e.g. <code class="computeroutput">"program"</code> instead of <code class="computeroutput">PROGRAM</code>, <code class="computeroutput">'>='</code>
+ instead of <code class="computeroutput">GTE</code> and <code class="computeroutput">'.'</code> instead of <code class="computeroutput">DOT</code>.
 This makes it much easier to read. If this isn't possible (for instance
 where the used tokens must be identified through integers) capitalized
 identifiers should be used instead.
 </li>
-<li>
- Breaking the operands may not be needed for short expressions. e.g. <tt class="computeroutput">*(',' >>
- file_identifier)</tt>
+<li class="listitem">
+ Breaking the operands may not be needed for short expressions. e.g. <code class="computeroutput">*(',' >>
+ file_identifier)</code>
 as long as the line does not exceed 80 characters.
 </li>
-<li>
+<li class="listitem">
 If a sequence fits on one line, put spaces inside the parentheses to clearly
 separate them from the rules.
 </li>
@@ -94,7 +94,7 @@
 >> ';'
 ;
</pre>
-<div class="itemizedlist"><ul type="disc"><li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 Nesting directives: If a rule does not fit on one line (80 characters)
 it should be continued on the next line intended by one level. The brackets
 of directives, semantic expressions (using Phoenix or LL lambda expressions)
@@ -110,9 +110,9 @@
 ]
 ;
</pre>
-<div class="itemizedlist"><ul type="disc"><li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 Nesting unary operators (e.g.Kleene star): Unary rule operators (Kleene
- star, <tt class="computeroutput">'!'</tt>, <tt class="computeroutput">'+'</tt>
+ star, <code class="computeroutput">'!'</code>, <code class="computeroutput">'+'</code>
 etc.) should be moved out one space before the corresponding indentation
 level, if this rule has a body or a sequence after it, which does not fit
 on on line. This makes the formatting more consistent and moves the rule
@@ -132,8 +132,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/notes/techniques.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/notes/techniques.html (original)
+++ trunk/libs/spirit/doc/html/spirit/notes/techniques.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Techniques</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../notes.html" title="Notes">
<link rel="prev" href="style_guide.html" title="Style Guide">
<link rel="next" href="../rationale.html" title="Rationale">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="style_guide.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../notes.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="../rationale.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.notes.techniques"></a>Techniques</h3></div></div></div></div>
+<div class="section" title="Techniques"><div class="titlepage"><div><div><h3 class="title">
+<a name="spirit.notes.techniques"></a><a class="link" href="techniques.html" title="Techniques">Techniques</a>
+</h3></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Qi and Karma</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="introduction.html" title="Introduction">
<link rel="next" href="qi_and_karma/abstracts.html" title="Abstracts">
</head>
@@ -22,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="introduction.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="qi_and_karma/abstracts.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Qi and Karma">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.qi_and_karma"></a>Qi and Karma</h2></div></div></div>
+<a name="spirit.qi_and_karma"></a><a class="link" href="qi_and_karma.html" title="Qi and Karma">Qi and Karma</a>
+</h2></div></div></div>
<div class="toc"><dl>
<dt>Tutorials</dt>
<dd><dl>
@@ -89,9 +90,10 @@
<dt>Debug</dt>
</dl></dd>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Tutorials">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.qi_and_karma.tutorials"></a>Tutorials</h3></div></div></div>
+<a name="spirit.qi_and_karma.tutorials"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials" title="Tutorials">Tutorials</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Quick Start</dt>
<dt>Warming up</dt>
@@ -116,14 +118,15 @@
<dt><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling">Mini
 XML - Error Handling</a></dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Quick Start">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.quick_start"></a>Quick Start</h4></div></div></div>
-<a name="spirit.qi_and_karma.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_"></a><h5>
-<a name="id460252"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_">Why
+<a name="spirit.qi_and_karma.tutorials.quick_start"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.quick_start" title="Quick Start">Quick Start</a>
+</h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_"></a><h6>
+<a name="id688482"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.quick_start.why_would_you_want_to_use_spirit_qi_">Why
 would you want to use Spirit.Qi?</a>
- </h5>
+ </h6>

 Spirit.Qi is designed to be a practical parsing tool. The ability to generate
 a fully-working parser from a formal EBNF specification inlined in C++
@@ -159,18 +162,19 @@
 Have fun!
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Warming up">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.warming_up"></a>Warming up</h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.warming_up"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up" title="Warming up">Warming up</a>
+</h4></div></div></div>

 We'll start by showing examples of parser expressions to give you a feel
 on how to build parsers from the simplest parser, building up as we go.
 
-<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__1_parsing_a_number"></a><h5>
-<a name="id460361"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__1_parsing_a_number">Trivial
+<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__1_parsing_a_number"></a><h6>
+<a name="id688527"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__1_parsing_a_number">Trivial
 Example #1 Parsing a number</a>
- </h5>
+ </h6>

 Create a parser that will parse a floating-point number.
 
@@ -181,11 +185,11 @@
 a Spirit floating point parser (a built-in parser). Spirit has many pre-defined
 parsers and consistent naming conventions help you keep from going insane!
 
-<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__2_parsing_two_numbers"></a><h5>
-<a name="id460416"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__2_parsing_two_numbers">Trivial
+<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__2_parsing_two_numbers"></a><h6>
+<a name="id688556"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__2_parsing_two_numbers">Trivial
 Example #2 Parsing two numbers</a>
- </h5>
+ </h6>

 Create a parser that will accept a line consisting of two floating-point
 numbers.
@@ -193,8 +197,8 @@
<pre class="programlisting">double_ >> double_
</pre>

- Here you see the familiar floating-point numeric parser <tt class="computeroutput">double_</tt>
- used twice, once for each number. What's that <tt class="computeroutput">>></tt>
+ Here you see the familiar floating-point numeric parser <code class="computeroutput">double_</code>
+ used twice, once for each number. What's that <code class="computeroutput">>></code>
 operator doing in there? Well, they had to be separated by something, and
 this was chosen as the "followed by" sequence operator. The above
 program creates a parser from two simpler parsers, glueing them together
@@ -202,31 +206,31 @@
 of smaller parsers. Whitespace between numbers can implicitly be consumed
 depending on how the parser is invoked (see below).
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 When we combine parsers, we end up with a "bigger" parser,
 but it's still a parser. Parsers can get bigger and bigger, nesting more
 and more, but whenever you glue two parsers together, you end up with
 one bigger parser. This is an important concept.
 </td></tr>
</table></div>
-<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers"></a><h5>
-<a name="id460526"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers">Trivial
+<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers"></a><h6>
+<a name="id688617"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__3_parsing_one_or_more_numbers">Trivial
 Example #3 Parsing one or more numbers</a>
- </h5>
+ </h6>

- Create a parser that will accept one or more floating-point numbers.
+ Create a parser that will accept zero or more floating-point numbers.
 
<pre class="programlisting">*double_
</pre>

 This is like a regular-expression Kleene Star, though the syntax might
- look a bit odd for a C++ programmer not used to seeing the <tt class="computeroutput">*</tt> operator overloaded like this. Actually,
+ look a bit odd for a C++ programmer not used to seeing the <code class="computeroutput">*</code> operator overloaded like this. Actually,
 if you know regular expressions it may look odd too since the star is before
 the expression it modifies. C'est la vie. Blame it on the fact that we
 must work with the syntax rules of C++.
@@ -238,11 +242,11 @@
 Kleene Star is also known as a Kleene Closure, but we call it the Star
 in most places.
 
-<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers"></a><h5>
-<a name="id460609"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers">Trivial
+<a name="spirit.qi_and_karma.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers"></a><h6>
+<a name="id688662"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.trivial_example__4_parsing_a_comma_delimited_list_of_numbers">Trivial
 Example #4 Parsing a comma-delimited list of numbers</a>
- </h5>
+ </h6>

 This example will create a parser that accepts a comma-delimited list of
 numbers.
@@ -250,8 +254,8 @@
<pre class="programlisting">double_ >> *(char_(',') >> double_)
</pre>

- Notice <tt class="computeroutput">char_(',')</tt>. It is
- a literal character parser that can recognize the comma <tt class="computeroutput">','</tt>.
+ Notice <code class="computeroutput">char_(',')</code>. It is
+ a literal character parser that can recognize the comma <code class="computeroutput">','</code>.
 In this case, the Kleene Star is modifying a more complex parser, namely,
 the one generated by the expression:
 
@@ -261,39 +265,39 @@
 Note that this is a case where the parentheses are necessary. The Kleene
 star encloses the complete expression above.
 
-<a name="spirit.qi_and_karma.tutorials.warming_up.let_s_parse_"></a><h5>
-<a name="id460803"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.let_s_parse_">Let's
+<a name="spirit.qi_and_karma.tutorials.warming_up.let_s_parse_"></a><h6>
+<a name="id688792"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.warming_up.let_s_parse_">Let's
 Parse!</a>
- </h5>
+ </h6>

 We're done with defining the parser. So the next step is now invoking this
 parser to do its work. There are a couple of ways to do this. For now,
- we will use the <tt class="computeroutput">phrase_parse</tt>
+ we will use the <code class="computeroutput">phrase_parse</code>
 function. One overload of this function accepts four arguments:
 
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 An iterator pointing to the start of the input
 </li>
-<li>
+<li class="listitem">
 An iterator pointing to one past the end of the input
 </li>
-<li>
+<li class="listitem">
 The parser object
 </li>
-<li>
+<li class="listitem">
 Another parser called the skip parser
 </li>
</ol></div>

 In our example, we wish to skip spaces and tabs. Another parser named
- <tt class="computeroutput">space</tt> is included in Spirit's
+ <code class="computeroutput">space</code> is included in Spirit's
 repertoire of predefined parsers. It is a very simple parser that simply
- recognizes whitespace. We will use <tt class="computeroutput">space</tt>
+ recognizes whitespace. We will use <code class="computeroutput">space</code>
 as our skip parser. The skip parser is the one responsible for skipping
- characters in between parser elements such as the <tt class="computeroutput">double_</tt>
- and <tt class="computeroutput">char_</tt>.
+ characters in between parser elements such as the <code class="computeroutput">double_</code>
+ and <code class="computeroutput">char_</code>.
 

 Ok, so now let's parse!
@@ -306,11 +310,15 @@
<pre class="programlisting">template <typename Iterator>
bool parse_numbers(Iterator first, Iterator last)
{
+ using qi::double_;
+ using qi::phrase_parse;
+ using ascii::space;
+
 bool r = phrase_parse(
- first, <a name="spirit0co" href="qi_and_karma.html#spirit0"><img src="../images/callouts/1.png" alt="1" border="0"></a>
- last, <a name="spirit1co" href="qi_and_karma.html#spirit1"><img src="../images/callouts/2.png" alt="2" border="0"></a>
- double_ >> *(',' >> double_), <a name="spirit2co" href="qi_and_karma.html#spirit2"><img src="../images/callouts/3.png" alt="3" border="0"></a>
- space <a name="spirit3co" href="qi_and_karma.html#spirit3"><img src="../images/callouts/4.png" alt="4" border="0"></a>
+ first, <a class="co" name="spirit0co" href="qi_and_karma.html#spirit0"><img src="../../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a>
+ last, <a class="co" name="spirit1co" href="qi_and_karma.html#spirit1"><img src="../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a>
+ double_ >> *(',' >> double_), <a class="co" name="spirit2co" href="qi_and_karma.html#spirit2"><img src="../../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a>
+ space <a class="co" name="spirit3co" href="qi_and_karma.html#spirit3"><img src="../../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a>
 );
 if (first != last) // fail if we did not get a full match
 return false;
@@ -325,23 +333,19 @@
 
<div class="calloutlist"><table border="0" summary="Callout list">
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit0"></a> </td>
+<td width="5%" valign="top" align="left"><a name="spirit0"></a> </td>
<td valign="top" align="left"> start iterator </td>
</tr>
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit1"></a> </td>
+<td width="5%" valign="top" align="left"><a name="spirit1"></a> </td>
<td valign="top" align="left"> end iterator </td>
</tr>
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit2"></a> </td>
+<td width="5%" valign="top" align="left"><a name="spirit2"></a> </td>
<td valign="top" align="left"> the parser </td>
</tr>
<tr>
-<td width="5%" valign="top" align="left">
-<a name="spirit3"></a> </td>
+<td width="5%" valign="top" align="left"><a name="spirit3"></a> </td>
<td valign="top" align="left"> the skip-parser </td>
</tr>
</table></div>
@@ -350,8 +354,8 @@

 

- The parse function returns <tt class="computeroutput">true</tt>
- or <tt class="computeroutput">false</tt> depending on the
+ The parse function returns <code class="computeroutput">true</code>
+ or <code class="computeroutput">false</code> depending on the
 result of the parse. The first iterator is passed by reference. On a successful
 parse, this iterator is repositioned to the rightmost position consumed
 by the parser. If this becomes equal to str.end(), then we have a full
@@ -371,39 +375,39 @@

 You can find the full cpp file here: ../../example/qi/num_list1.cpp
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">

- <tt class="computeroutput">char</tt> and <tt class="computeroutput">wchar_t</tt>
+ <code class="computeroutput">char</code> and <code class="computeroutput">wchar_t</code>
 operands
 

- The careful reader may notice that the parser expression has <tt class="computeroutput">','</tt> instead of <tt class="computeroutput">char_(',')</tt>
+ The careful reader may notice that the parser expression has <code class="computeroutput">','</code> instead of <code class="computeroutput">char_(',')</code>
 as the previous examples did. This is ok due to C++ syntax rules of conversion.
- There are <tt class="computeroutput">>></tt> operators
- that are overloaded to accept a <tt class="computeroutput">char</tt>
- or <tt class="computeroutput">wchar_t</tt> argument on its
+ There are <code class="computeroutput">>></code> operators
+ that are overloaded to accept a <code class="computeroutput">char</code>
+ or <code class="computeroutput">wchar_t</code> argument on its
 left or right (but not both). An operator may be overloaded if at least
- one of its parameters is a user-defined type. In this case, the <tt class="computeroutput">double_</tt> is the 2nd argument to <tt class="computeroutput">operator>></tt>,
- and so the proper overload of <tt class="computeroutput">>></tt>
- is used, converting <tt class="computeroutput">','</tt> into
+ one of its parameters is a user-defined type. In this case, the <code class="computeroutput">double_</code> is the 2nd argument to <code class="computeroutput">operator>></code>,
+ and so the proper overload of <code class="computeroutput">>></code>
+ is used, converting <code class="computeroutput">','</code> into
 a character literal parser.
 

- The problem with omiting the <tt class="computeroutput">char_</tt>
- should be obvious: <tt class="computeroutput">'a' >>
- 'b'</tt> is not a spirit parser, it is
+ The problem with omiting the <code class="computeroutput">char_</code>
+ should be obvious: <code class="computeroutput">'a' >>
+ 'b'</code> is not a spirit parser, it is
 a numeric expression, right-shifting the ASCII (or another encoding)
- value of <tt class="computeroutput">'a'</tt> by the ASCII value
- of <tt class="computeroutput">'b'</tt>. However, both <tt class="computeroutput">char_('a') >>
- 'b'</tt> and <tt class="computeroutput">'a'
- >> char_('b')</tt>
- are Spirit sequence parsers for the letter <tt class="computeroutput">'a'</tt>
- followed by <tt class="computeroutput">'b'</tt>. You'll get
+ value of <code class="computeroutput">'a'</code> by the ASCII value
+ of <code class="computeroutput">'b'</code>. However, both <code class="computeroutput">char_('a') >>
+ 'b'</code> and <code class="computeroutput">'a'
+ >> char_('b')</code>
+ are Spirit sequence parsers for the letter <code class="computeroutput">'a'</code>
+ followed by <code class="computeroutput">'b'</code>. You'll get
 used to it, sooner or later.
 
</td></tr>
@@ -415,11 +419,11 @@
 are to be allowed.
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Semantic Actions">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.semantic_actions"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.semantic_actions" title="Semantic
- Actions">Semantic
- Actions</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.semantic_actions"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.semantic_actions" title="Semantic Actions">Semantic
+ Actions</a>
+</h4></div></div></div>

 Our parser above is really nothing but a recognizer. It answers the question
 "did the input match our grammar?", but it does not do anything
@@ -431,22 +435,22 @@
 Enter Semantic actions. Semantic actions may be attached to any point in
 the grammar specification. These actions are C++ functions or function
 objects that are called whenever a part of the parser successfully recognizes
- a portion of the input. Say you have a parser <tt class="computeroutput">P</tt>,
- and a C++ function <tt class="computeroutput">F</tt>, you
- can make the parser call <tt class="computeroutput">F</tt>
- whenever it matches an input by attaching <tt class="computeroutput">F</tt>:
+ a portion of the input. Say you have a parser <code class="computeroutput">P</code>,
+ and a C++ function <code class="computeroutput">F</code>, you
+ can make the parser call <code class="computeroutput">F</code>
+ whenever it matches an input by attaching <code class="computeroutput">F</code>:
 
<pre class="programlisting">P[F]
</pre>

- The expression above links <tt class="computeroutput">F</tt>
- to the parser, <tt class="computeroutput">P</tt>.
+ The expression above links <code class="computeroutput">F</code>
+ to the parser, <code class="computeroutput">P</code>.
 

 The function/function object signature depends on the type of the parser
- to which it is attached. The parser <tt class="computeroutput">double_</tt>
- passes the parsed number. Thus, if we were to attach a function <tt class="computeroutput">F</tt> to <tt class="computeroutput">double_</tt>,
- we need <tt class="computeroutput">F</tt> to be declared
+ to which it is attached. The parser <code class="computeroutput">double_</code>
+ passes the parsed number. Thus, if we were to attach a function <code class="computeroutput">F</code> to <code class="computeroutput">double_</code>,
+ we need <code class="computeroutput">F</code> to be declared
 as:
 
<pre class="programlisting">void F(double n);
@@ -461,22 +465,22 @@

 Presented are various ways to attach semantic actions:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 Using plain function pointer
 </li>
-<li>
+<li class="listitem">
 Using simple function object
 </li>
-<li>
+<li class="listitem">
 Using Boost.Bind
 with a plain function
 </li>
-<li>
+<li class="listitem">
 Using Boost.Bind
 with a member function
 </li>
-<li>
+<li class="listitem">
 Using Boost.Lambda
</li>
</ul></div>
@@ -488,40 +492,45 @@



-<pre class="programlisting">// A plain function
-void write(int const& i)
+<pre class="programlisting">namespace client
{
- std::cout << i << std::endl;
-}
+ namespace qi = boost::spirit::qi;

-// A member function
-struct writer
-{
- void print(int const& i) const
+ // A plain function
+ void print(int const& i)
 {
 std::cout << i << std::endl;
 }
-};

-// A function object
-struct write_action
-{
- void operator()(int const& i, unused_type, unused_type) const
+ // A member function
+ struct writer
 {
- std::cout << i << std::endl;
- }
-};
+ void print(int const& i) const
+ {
+ std::cout << i << std::endl;
+ }
+ };
+
+ // A function object
+ struct print_action
+ {
+ void operator()(int const& i, qi::unused_type, qi::unused_type) const
+ {
+ std::cout << i << std::endl;
+ }
+ };
+}
</pre>

 

 

- Take note that with function objects, we need to have an <tt class="computeroutput">operator()</tt>
+ Take note that with function objects, we need to have an <code class="computeroutput">operator()</code>
 with 3 arguments. Since we don't care about the other two, we can use
- <tt class="computeroutput">unused_type</tt> for these.
- We'll see more of <tt class="computeroutput">unused_type</tt>
- elsewhere. Get used to it. <tt class="computeroutput">unused_type</tt>
+ <code class="computeroutput">unused_type</code> for these.
+ We'll see more of <code class="computeroutput">unused_type</code>
+ elsewhere. Get used to it. <code class="computeroutput">unused_type</code>
 is a Spirit supplied support class.
 

@@ -540,15 +549,15 @@



-<pre class="programlisting">qi::parse(first, last, '{' >> int_[&write] >> '}');
+<pre class="programlisting">parse(first, last, '{' >> int_[&print] >> '}');
</pre>

 

 

- What's new? Well <tt class="computeroutput">int_</tt> is
- the sibbling of <tt class="computeroutput">double_</tt>.
+ What's new? Well <code class="computeroutput">int_</code> is
+ the sibbling of <code class="computeroutput">double_</code>.
 I'm sure you can guess what this parser does.
 

@@ -559,7 +568,7 @@



-<pre class="programlisting">qi::parse(first, last, '{' >> int_[write_action()] >> '}');
+<pre class="programlisting">parse(first, last, '{' >> int_[print_action()] >> '}');
</pre>

 
@@ -575,7 +584,7 @@


<pre class="programlisting">writer w;
-qi::parse(first, last, '{' >> int_[boost::bind(&writer::print, &w, _1)] >> '}');
+parse(first, last, '{' >> int_[boost::bind(&writer::print, &w, _1)] >> '}');
</pre>

 
@@ -590,7 +599,7 @@



-<pre class="programlisting">qi::parse(first, last, '{' >> int_[boost::bind(&write, _1)] >> '}');
+<pre class="programlisting">parse(first, last, '{' >> int_[boost::bind(&print, _1)] >> '}');
</pre>

 
@@ -604,7 +613,7 @@



-<pre class="programlisting">qi::parse(first, last, '{' >> int_[std::cout << _1 << '\n'] >> '}');
+<pre class="programlisting">parse(first, last, '{' >> int_[std::cout << _1 << '\n'] >> '}');
</pre>

 
@@ -621,10 +630,10 @@

 The examples above can be found here: ../../example/qi/actions.cpp
 
-<a name="spirit.qi_and_karma.tutorials.semantic_actions.phoenix"></a><h5>
-<a name="id463328"></a>
- Phoenix
- </h5>
+<a name="spirit.qi_and_karma.tutorials.semantic_actions.phoenix"></a><h6>
+<a name="id691769"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.semantic_actions.phoenix">Phoenix</a>
+ </h6>

 <a href="../../../phoenix/doc/html/index.html" target="_top">Phoenix</a>, a companion
 library bundled with Spirit, is specifically suited for binding semantic
@@ -635,11 +644,11 @@
 shall be using the library exclusively
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Complex - Our first complex parser">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.complex___our_first_complex_parser"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.complex___our_first_complex_parser" title="Complex
- - Our first complex parser">Complex
- - Our first complex parser</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.complex___our_first_complex_parser"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.complex___our_first_complex_parser" title="Complex - Our first complex parser">Complex
+ - Our first complex parser</a>
+</h4></div></div></div>

 Well, not really a complex parser, but a parser that parses complex numbers.
 This time, we're using Phoenix
@@ -654,26 +663,26 @@

 What's new? Well, we have:
 
-<div class="orderedlist"><ol type="1">
-<li>
- Alternates: e.g. <tt class="computeroutput">a |
- b</tt>. Try <tt class="computeroutput">a</tt>
- first. If it succeeds, good. If not, try the next alternative, <tt class="computeroutput">b</tt>.
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ Alternates: e.g. <code class="computeroutput">a |
+ b</code>. Try <code class="computeroutput">a</code>
+ first. If it succeeds, good. If not, try the next alternative, <code class="computeroutput">b</code>.
 </li>
-<li>
+<li class="listitem">
 Optionals: e.g. -p. Match the parser p zero or one time.
 </li>
</ol></div>

 The complex parser presented above reads as:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 One or two real number in parantheses, separated by comma (the second
 number is optional)
 </li>
-<li>
-OR a single real number.
+<li class="listitem">
+OR a single real number.
 </li>
</ul></div>

@@ -691,27 +700,36 @@



-<pre class="programlisting">template <typename Iterator>
-bool parse_complex(Iterator first, Iterator last, std::complex<double>& c)
+<pre class="programlisting">namespace client
{
- double rN = 0.0;
- double iN = 0.0;
- bool r = phrase_parse(first, last,
-
- // Begin grammar
- (
- '(' >> double_[ref(rN) = _1]
- >> -(',' >> double_[ref(iN) = _1]) >> ')'
- | double_[ref(rN) = _1]
- ),
- // End grammar
+ template <typename Iterator>
+ bool parse_complex(Iterator first, Iterator last, std::complex<double>& c)
+ {
+ using boost::spirit::qi::double_;
+ using boost::spirit::qi::_1;
+ using boost::spirit::qi::phrase_parse;
+ using boost::spirit::ascii::space;
+ using boost::phoenix::ref;
+
+ double rN = 0.0;
+ double iN = 0.0;
+ bool r = phrase_parse(first, last,
+
+ // Begin grammar
+ (
+ '(' >> double_[ref(rN) = _1]
+ >> -(',' >> double_[ref(iN) = _1]) >> ')'
+ | double_[ref(rN) = _1]
+ ),
+ // End grammar

- space);
+ space);

- if (!r || first != last) // fail if we did not get a full match
- return false;
- c = std::complex<double>(rN, iN);
- return r;
+ if (!r || first != last) // fail if we did not get a full match
+ return false;
+ c = std::complex<double>(rN, iN);
+ return r;
+ }
}
</pre>

@@ -722,23 +740,23 @@
 The full cpp file for this example can be found here: ../../example/qi/complex_number.cpp
 

- The <tt class="computeroutput">double_</tt> parser attaches
+ The <code class="computeroutput">double_</code> parser attaches
 this action:
 
<pre class="programlisting">ref(n) = _1
</pre>

- This assigns the parsed result (actually, the attribute of <tt class="computeroutput">double_</tt>) to n. <tt class="computeroutput">ref(n)</tt>
- tells Phoenix that <tt class="computeroutput">n</tt> is
- a mutable reference. <tt class="computeroutput">_1</tt>
+ This assigns the parsed result (actually, the attribute of <code class="computeroutput">double_</code>) to n. <code class="computeroutput">ref(n)</code>
+ tells Phoenix that <code class="computeroutput">n</code> is
+ a mutable reference. <code class="computeroutput">_1</code>
 is a Phoenix placeholder for the parsed result attribute.
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Sum - adding numbers">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.sum___adding_numbers"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.sum___adding_numbers" title="Sum
- - adding numbers">Sum
- - adding numbers</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.sum___adding_numbers"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.sum___adding_numbers" title="Sum - adding numbers">Sum
+ - adding numbers</a>
+</h4></div></div></div>

 Here's a parser that sums a comma-separated list of numbers.
 
@@ -769,11 +787,14 @@



-<pre class="programlisting">using namespace boost::phoenix;
-using namespace boost::spirit;
-using namespace boost::spirit::qi;
-using namespace boost::spirit::ascii;
-using namespace boost::spirit::arg_names;
+<pre class="programlisting">namespace qi = boost::spirit::qi;
+namespace ascii = boost::spirit::ascii;
+namespace phoenix = boost::phoenix;
+
+using qi::double_;
+using qi::_1;
+using ascii::space;
+using phoenix::ref;
</pre>

 
@@ -841,7 +862,7 @@
 </td>
<td>
 
- ASCII version of <tt class="computeroutput">char_</tt>
+ ASCII version of <code class="computeroutput">char_</code>
 and all char related parsers. Other encodings are also provided
 (e.g. also an ISO8859.1)
 
@@ -861,12 +882,12 @@
</tr>
</tbody>
</table></div>
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 If you feel uneasy with using whole namespaces, feel free to qualify
 your code, use namespace aliases, etc. For the purpose of this tutorial,
 we will be presenting unqualified names for both Spirit and Phoenix.
@@ -887,7 +908,7 @@
<pre class="programlisting">template <typename Iterator>
bool adder(Iterator first, Iterator last, double& n)
{
- bool r = phrase_parse(first, last,
+ bool r = qi::phrase_parse(first, last,

 // Begin grammar
 (
@@ -918,35 +939,35 @@
 the sum of all the parsed numbers.
 

- The first <tt class="computeroutput">double_</tt> parser
+ The first <code class="computeroutput">double_</code> parser
 attaches this action:
 
<pre class="programlisting">ref(n) = _1
</pre>

- This assigns the parsed result (actually, the attribute of <tt class="computeroutput">double_</tt>) to <tt class="computeroutput">n</tt>.
- <tt class="computeroutput">ref(n)</tt> tells
- Phoenix that <tt class="computeroutput">n</tt> is a mutable reference. <tt class="computeroutput">_1</tt> is a Phoenix
+ This assigns the parsed result (actually, the attribute of <code class="computeroutput">double_</code>) to <code class="computeroutput">n</code>.
+ <code class="computeroutput">ref(n)</code> tells
+ Phoenix that <code class="computeroutput">n</code> is a mutable reference. <code class="computeroutput">_1</code> is a Phoenix
 placeholder for the parsed result attribute.
 

- The second <tt class="computeroutput">double_</tt> parser
+ The second <code class="computeroutput">double_</code> parser
 attaches this action:
 
<pre class="programlisting">ref(n) += _1
</pre>

- So, subsequent numbers add into <tt class="computeroutput">n</tt>.
+ So, subsequent numbers add into <code class="computeroutput">n</code>.
 

 That wasn't too bad, was it :-) ?
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Number List - stuffing numbers into a std::vector">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.number_list___stuffing_numbers_into_a_std__vector"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list___stuffing_numbers_into_a_std__vector" title="Number
- List - stuffing numbers into a std::vector">Number
- List - stuffing numbers into a std::vector</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.number_list___stuffing_numbers_into_a_std__vector"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list___stuffing_numbers_into_a_std__vector" title="Number List - stuffing numbers into a std::vector">Number
+ List - stuffing numbers into a std::vector</a>
+</h4></div></div></div>

 This sample demontrates a parser for a comma separated list of numbers.
 The numbers are inserted in a vector using phoenix.
@@ -959,6 +980,13 @@
<pre class="programlisting">template <typename Iterator>
bool parse_numbers(Iterator first, Iterator last, std::vector<double>& v)
{
+ using qi::double_;
+ using qi::phrase_parse;
+ using qi::_1;
+ using ascii::space;
+ using phoenix::push_back;
+ using phoenix::ref;
+
 bool r = phrase_parse(first, last,

 // Begin grammar
@@ -985,26 +1013,26 @@
 

 This, again, is the same parser as before. This time, instead of summing
- up the numbers, we stuff them in a <tt class="computeroutput">std::vector</tt>.
- <tt class="computeroutput">push_back</tt> is supplied by
+ up the numbers, we stuff them in a <code class="computeroutput">std::vector</code>.
+ <code class="computeroutput">push_back</code> is supplied by
 <a href="../../../phoenix/doc/html/index.html" target="_top">Phoenix</a>. The expression:
 
<pre class="programlisting">push_back(ref(v), _1)
</pre>

- appends the parsed number. Like before, <tt class="computeroutput">_1</tt>
+ appends the parsed number. Like before, <code class="computeroutput">_1</code>
 is a Phoenix placeholder
- for the parsed result attribute. Also, like before, <tt class="computeroutput">ref(v)</tt>
+ for the parsed result attribute. Also, like before, <code class="computeroutput">ref(v)</code>
 tells Phoenix that
- <tt class="computeroutput">v</tt>, the <tt class="computeroutput">std::vector</tt>,
+ <code class="computeroutput">v</code>, the <code class="computeroutput">std::vector</code>,
 is a mutable reference.
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Number List Redux - list syntax">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.number_list_redux___list_syntax"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list_redux___list_syntax" title="Number
- List Redux - list syntax">Number
- List Redux - list syntax</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.number_list_redux___list_syntax"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list_redux___list_syntax" title="Number List Redux - list syntax">Number
+ List Redux - list syntax</a>
+</h4></div></div></div>

 So far, we've been using the syntax:
 
@@ -1018,7 +1046,7 @@
<pre class="programlisting">double_ % ','
</pre>

- read as: a list of doubles separated by <tt class="computeroutput">','</tt>.
+ read as: a list of doubles separated by <code class="computeroutput">','</code>.
 

 This sample, again a variation of our previous example, demonstrates just
@@ -1032,6 +1060,13 @@
<pre class="programlisting">template <typename Iterator>
bool parse_numbers(Iterator first, Iterator last, std::vector<double>& v)
{
+ using qi::double_;
+ using qi::phrase_parse;
+ using qi::_1;
+ using ascii::space;
+ using phoenix::push_back;
+ using phoenix::ref;
+
 bool r = phrase_parse(first, last,

 // Begin grammar
@@ -1056,14 +1091,14 @@
 The full cpp file for this example can be found here: ../../example/qi/num_list3.cpp
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Number List Attribute - one more, with style">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.number_list_attribute___one_more__with_style"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list_attribute___one_more__with_style" title="Number
- List Attribute - one more, with style">Number
- List Attribute - one more, with style</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.number_list_attribute___one_more__with_style"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.number_list_attribute___one_more__with_style" title="Number List Attribute - one more, with style">Number
+ List Attribute - one more, with style</a>
+</h4></div></div></div>

- You've seen that the <tt class="computeroutput">double_</tt>
- parser has a <tt class="computeroutput">double</tt> attribute.
+ You've seen that the <code class="computeroutput">double_</code>
+ parser has a <code class="computeroutput">double</code> attribute.
 All parsers have an attribute, even complex parsers, those that are composed
 from primitives using operators, like the list parser, also have an attribute.
 It so happens that the the attribute of a list parser:
@@ -1071,7 +1106,7 @@
<pre class="programlisting">p % d
</pre>

- is a <tt class="computeroutput">std::vector</tt> of the attribute of <tt class="computeroutput">p</tt>. So, for our parser:
+ is a <code class="computeroutput">std::vector</code> of the attribute of <code class="computeroutput">p</code>. So, for our parser:
 
<pre class="programlisting">double_ % ','
</pre>
@@ -1081,25 +1116,25 @@
<pre class="programlisting">std::vector<double>
</pre>

- So, what does this give us? Well, we can simply pass in a <tt class="computeroutput">std::vector<double></tt>
+ So, what does this give us? Well, we can simply pass in a <code class="computeroutput">std::vector<double></code>
 to our number list parser and it will happily churn out our result in our
- vector. For that to happen, we'll use a variation of the <tt class="computeroutput">phrase_parse</tt> with an additional argument:
+ vector. For that to happen, we'll use a variation of the <code class="computeroutput">phrase_parse</code> with an additional argument:
 the parser's attribute:
 
-<div class="orderedlist"><ol type="1">
-<li>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 An iterator pointing to the start of the input
 </li>
-<li>
+<li class="listitem">
 An iterator pointing to one past the end of the input
 </li>
-<li>
+<li class="listitem">
 The parser object
 </li>
-<li>
+<li class="listitem">
 The parser's attribute
 </li>
-<li>
+<li class="listitem">
 Another parser called the skip parser
 </li>
</ol></div>
@@ -1114,6 +1149,11 @@
<pre class="programlisting">template <typename Iterator>
bool parse_numbers(Iterator first, Iterator last, std::vector<double>& v)
{
+ using qi::double_;
+ using qi::phrase_parse;
+ using qi::_1;
+ using ascii::space;
+
 bool r = phrase_parse(first, last,

 // Begin grammar
@@ -1123,7 +1163,7 @@
 ,
 // End grammar

- v, space);
+ space, v);

 if (first != last) // fail if we did not get a full match
 return false;
@@ -1138,37 +1178,37 @@
 The full cpp file for this example can be found here: ../../example/qi/num_list4.cpp
 

- Hey, no more actions!!! Now we're entering
+ Hey, no more actions!!! Now we're entering
 the realm of attribute grammars. Cool eh?
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Roman Numerals">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.roman_numerals"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals" title="Roman
- Numerals">Roman
- Numerals</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.roman_numerals"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals" title="Roman Numerals">Roman
+ Numerals</a>
+</h4></div></div></div>

 This example demonstrates:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 symbol table
 </li>
-<li>
+<li class="listitem">
 rule
 </li>
-<li>
+<li class="listitem">
 grammar
 </li>
</ul></div>
-<a name="spirit.qi_and_karma.tutorials.roman_numerals.symbol_table"></a><h5>
-<a name="id467678"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.symbol_table">Symbol
+<a name="spirit.qi_and_karma.tutorials.roman_numerals.symbol_table"></a><h6>
+<a name="id697127"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.symbol_table">Symbol
 Table</a>
- </h5>
+ </h6>

 The symbol table holds a dictionary of symbols where each symbol is a sequence
- of characters (a <tt class="computeroutput">char</tt>, <tt class="computeroutput">wchar_t</tt>, <tt class="computeroutput">int</tt>,
+ of characters (a <code class="computeroutput">char</code>, <code class="computeroutput">wchar_t</code>, <code class="computeroutput">int</code>,
 enumeration etc.) . The template class, parameterized by the character
 type, can work efficiently with 8, 16, 32 and even 64 bit characters. Mutable
 data of type T is associated with each symbol.
@@ -1203,7 +1243,7 @@



-<pre class="programlisting">struct hundreds_ : symbols<char, unsigned>
+<pre class="programlisting">struct hundreds_ : qi::symbols<char, unsigned>
{
 hundreds_()
 {
@@ -1234,7 +1274,7 @@



-<pre class="programlisting">struct tens_ : symbols<char, unsigned>
+<pre class="programlisting">struct tens_ : qi::symbols<char, unsigned>
{
 tens_()
 {
@@ -1265,7 +1305,7 @@



-<pre class="programlisting">struct ones_ : symbols<char, unsigned>
+<pre class="programlisting">struct ones_ : qi::symbols<char, unsigned>
{
 ones_()
 {
@@ -1289,19 +1329,19 @@

 

- Now we can use <tt class="computeroutput">hundreds</tt>,
- <tt class="computeroutput">tens</tt> and <tt class="computeroutput">ones</tt> anywhere in our parser expressions.
+ Now we can use <code class="computeroutput">hundreds</code>,
+ <code class="computeroutput">tens</code> and <code class="computeroutput">ones</code> anywhere in our parser expressions.
 They are all parsers.
 
-<a name="spirit.qi_and_karma.tutorials.roman_numerals.rules"></a><h5>
-<a name="id468962"></a>
- Rules
- </h5>
+<a name="spirit.qi_and_karma.tutorials.roman_numerals.rules"></a><h6>
+<a name="id698105"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.rules">Rules</a>
+ </h6>

 Up until now, we've been inlining our parser expressions, passing them
- directly to the <tt class="computeroutput">phrase_parse</tt>
+ directly to the <code class="computeroutput">phrase_parse</code>
 function. The expression evaluates into a temporary, unnamed parser which
- is passed into the <tt class="computeroutput">phrase_parse</tt>
+ is passed into the <code class="computeroutput">phrase_parse</code>
 function, used, and then destroyed. This is fine for small parsers. When
 the expressions get complicated, you'd want to break the expressions into
 smaller easier to understand pieces, name them, and refer to them from
@@ -1315,8 +1355,8 @@
</pre>

 At the very least, the rule needs to know the iterator type it will be
- working on. This rule cannot be used with <tt class="computeroutput">phrase_parse</tt>.
- It can only be used with the <tt class="computeroutput">parse</tt>
+ working on. This rule cannot be used with <code class="computeroutput">phrase_parse</code>.
+ It can only be used with the <code class="computeroutput">parse</code>
 function -- a version that does not do white space skipping (does not have
 the skipper argument). If you want to have it skip white spaces, you need
 to pass in the type skip parser, as in the next form:
@@ -1329,8 +1369,8 @@
<pre class="programlisting">rule<std::string::iterator, space_type> r;
</pre>

- This type of rule can be used for both <tt class="computeroutput">phrase_parse</tt>
- and <tt class="computeroutput">parse</tt>.
+ This type of rule can be used for both <code class="computeroutput">phrase_parse</code>
+ and <code class="computeroutput">parse</code>.
 

 For our next example, there's one more rule form you should know about:
@@ -1342,19 +1382,19 @@
 
<pre class="programlisting">rule<Iterator, Signature, Skipper> r;
</pre>
-<div class="tip"><table border="0" summary="Tip">
+<div class="tip" title="Tip"><table border="0" summary="Tip">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="../images/tip.png"></td>
<th align="left">Tip</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 All rule template arguments after Iterator can be supplied in any order.
 </td></tr>
</table></div>

 The Signature specifies the attributes of the rule. You've seen that our
- parsers can have an attribute. Recall that the <tt class="computeroutput">double_</tt>
- parser has an attribute of <tt class="computeroutput">double</tt>.
+ parsers can have an attribute. Recall that the <code class="computeroutput">double_</code>
+ parser has an attribute of <code class="computeroutput">double</code>.
 To be precise, these are synthesized attributes. The
 parser "synthesizes" the attribute value. Think of them as function
 return values.
@@ -1373,27 +1413,27 @@
 
<pre class="programlisting">r = double_ >> *(',' >> double_);
</pre>
-<a name="spirit.qi_and_karma.tutorials.roman_numerals.grammars"></a><h5>
-<a name="id469547"></a>
- Grammars
- </h5>
+<a name="spirit.qi_and_karma.tutorials.roman_numerals.grammars"></a><h6>
+<a name="id700136"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.grammars">Grammars</a>
+ </h6>

 A grammar encapsulates one or more rules. It has the same template parameters
 as the rule. You declare a grammar by:
 
-<div class="orderedlist"><ol type="1">
-<li>
- deriving a struct (or class) from the <tt class="computeroutput">grammar</tt>
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ deriving a struct (or class) from the <code class="computeroutput">grammar</code>
 class template
 </li>
-<li>
+<li class="listitem">
 declare one or more rules as member variables
 </li>
-<li>
+<li class="listitem">
 initialize the base grammar class by giving it the start rule (its the
 first rule that gets called when the grammar starts parsing)
 </li>
-<li>
+<li class="listitem">
 initialize your rules in your constructor
 </li>
</ol></div>
@@ -1406,13 +1446,19 @@


<pre class="programlisting">template <typename Iterator>
-struct roman : grammar<Iterator, unsigned()>
+struct roman : qi::grammar<Iterator, unsigned()>
{
 roman() : roman::base_type(start)
 {
+ using qi::eps;
+ using qi::lit;
+ using qi::_val;
+ using qi::_1;
+ using ascii::char_;
+
 start = eps [_val = 0] >>
 (
- +char_('M') [_val += 1000]
+ +lit('M') [_val += 1000]
 || hundreds [_val += _1]
 || tens [_val += _1]
 || ones [_val += _1]
@@ -1420,7 +1466,7 @@
 ;
 }

- rule<Iterator, unsigned()> start;
+ qi::rule<Iterator, unsigned()> start;
};
</pre>

@@ -1430,53 +1476,53 @@

 Things to take notice of:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
- The grammar and start rule signature is <tt class="computeroutput">unsigned()</tt>. It has a synthesized attribute (return
- value) of type <tt class="computeroutput">unsigned</tt>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ The grammar and start rule signature is <code class="computeroutput">unsigned()</code>. It has a synthesized attribute (return
+ value) of type <code class="computeroutput">unsigned</code>
 with no inherited attributes (arguments).
 </li>
-<li>
+<li class="listitem">
 We did not specify a skip-parser. We don't want to skip in between the
 numerals.
 </li>
-<li>
-<tt class="computeroutput">roman::base_type</tt> is a typedef for <tt class="computeroutput">grammar<Iterator,
- unsigned()></tt>.
- If <tt class="computeroutput">roman</tt> was not a template,
+<li class="listitem">
+<code class="computeroutput">roman::base_type</code> is a typedef for <code class="computeroutput">grammar<Iterator,
+ unsigned()></code>.
+ If <code class="computeroutput">roman</code> was not a template,
 you can simply write: base_type(start)
 </li>
-<li>
+<li class="listitem">
 But it's best to make your grammar templates, so that they can be reused
 for different iterator types.
 </li>
-<li>
-<tt class="computeroutput">_val</tt> is another Phoenix placeholder representing
+<li class="listitem">
+<code class="computeroutput">_val</code> is another Phoenix placeholder representing
 the rule's synthesized attribute.
 </li>
-<li>
-<tt class="computeroutput">eps</tt> is a special spirit
+<li class="listitem">
+<code class="computeroutput">eps</code> is a special spirit
 parser that consumes no input but is always successful. We use it to
- initialize <tt class="computeroutput">_val</tt>, the
+ initialize <code class="computeroutput">_val</code>, the
 rule's synthesized attribute, to zero before anything else. The actual
- parser starts at <tt class="computeroutput">+char_('M')</tt>,
- parsing roman thousands. Using <tt class="computeroutput">eps</tt>
+ parser starts at <code class="computeroutput">+char_('M')</code>,
+ parsing roman thousands. Using <code class="computeroutput">eps</code>
 this way is good for doing pre and post initializations.
 </li>
-<li>
- The expression <tt class="computeroutput">a ||
- b</tt> reads: match a or b and in
- sequence. That is, if both <tt class="computeroutput">a</tt>
- and <tt class="computeroutput">b</tt> match, it must
- be in sequence; this is equivalent to <tt class="computeroutput">a
- >> !b | b</tt>, but more efficient.
+<li class="listitem">
+ The expression <code class="computeroutput">a ||
+ b</code> reads: match a or b and in
+ sequence. That is, if both <code class="computeroutput">a</code>
+ and <code class="computeroutput">b</code> match, it must
+ be in sequence; this is equivalent to <code class="computeroutput">a
+ >> -b | b</code>, but more efficient.
 </li>
</ul></div>
-<a name="spirit.qi_and_karma.tutorials.roman_numerals.let_s_parse_"></a><h5>
-<a name="id470410"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.let_s_parse_">Let's
+<a name="spirit.qi_and_karma.tutorials.roman_numerals.let_s_parse_"></a><h6>
+<a name="id700866"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.roman_numerals.let_s_parse_">Let's
 Parse!</a>
- </h5>
+ </h6>

 

@@ -1505,23 +1551,23 @@

 

- <tt class="computeroutput">roman_parser</tt> is an object
- of type <tt class="computeroutput">roman</tt> -our roman
+ <code class="computeroutput">roman_parser</code> is an object
+ of type <code class="computeroutput">roman</code> -our roman
 numeral parser. This time around, we are using the no-skipping version
 of the parse functions. We do not want to skip any spaces! We are also
- passing in an attribute, <tt class="computeroutput">unsigned
- result</tt>, which will receive the
+ passing in an attribute, <code class="computeroutput">unsigned
+ result</code>, which will receive the
 parsed value.
 

 The full cpp file for this example can be found here: ../../example/qi/roman.cpp
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Employee - Parsing into structs">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs" title="Employee
- - Parsing into structs">Employee
- - Parsing into structs</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs" title="Employee - Parsing into structs">Employee
+ - Parsing into structs</a>
+</h4></div></div></div>

 It's a common question in the <a href="http://www.nabble.com/The-Spirit-Parser-Library-f3430.html" target="_top">Spirit
 General List</a>: how do I parse and place the results into a C++ struct?
@@ -1530,17 +1576,17 @@
 attributed, makes it even easier. The next example demonstrates some features
 of Spirit2 that makes this easy. In the process, you'll learn about:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 More about attributes
 </li>
-<li>
+<li class="listitem">
 Auto rules
 </li>
-<li>
+<li class="listitem">
 Some more built-in parsers
 </li>
-<li>
+<li class="listitem">
 Directives
 </li>
</ul></div>
@@ -1581,7 +1627,7 @@


<pre class="programlisting">BOOST_FUSION_ADAPT_STRUCT(
- employee,
+ client::employee,
 (int, age)
 (std::string, surname)
 (std::string, forename)
@@ -1606,10 +1652,16 @@


<pre class="programlisting">template <typename Iterator>
-struct employee_parser : grammar<Iterator, employee(), space_type>
+struct employee_parser : qi::grammar<Iterator, employee(), ascii::space_type>
{
 employee_parser() : employee_parser::base_type(start)
 {
+ using qi::int_;
+ using qi::lit;
+ using qi::double_;
+ using qi::lexeme;
+ using ascii::char_;
+
 quoted_string %= lexeme['"' >> +(char_ - '"') >> '"'];

 start %=
@@ -1623,8 +1675,8 @@
 ;
 }

- rule<Iterator, std::string(), space_type> quoted_string;
- rule<Iterator, employee(), space_type> start;
+ qi::rule<Iterator, std::string(), ascii::space_type> quoted_string;
+ qi::rule<Iterator, employee(), ascii::space_type> start;
};
</pre>

@@ -1642,15 +1694,15 @@
struct employee_parser : grammar<Iterator, employee(), space_type>
</pre>

- <tt class="computeroutput">employee_parser</tt> is a grammar.
+ <code class="computeroutput">employee_parser</code> is a grammar.
 Like before, we make it a template so that we can reuse it for different
 iterator types. The grammar's signature is:
 
<pre class="programlisting">employee()
</pre>

- meaning, the parser generates employee structs. <tt class="computeroutput">employee_parser</tt>
- skips white spaces using <tt class="computeroutput">space_type</tt>
+ meaning, the parser generates employee structs. <code class="computeroutput">employee_parser</code>
+ skips white spaces using <code class="computeroutput">space_type</code>
 as its skip parser.
 
<pre class="programlisting">employee_parser() : employee_parser::base_type(start)
@@ -1662,19 +1714,19 @@
rule<Iterator, employee(), space_type> start;
</pre>

- Declares two rules: <tt class="computeroutput">quoted_string</tt>
- and <tt class="computeroutput">start</tt>. <tt class="computeroutput">start</tt> has the same template parameters
- as the grammar itself. <tt class="computeroutput">quoted_string</tt>
- has a <tt class="computeroutput">std::string</tt> attribute.
- 
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.lexeme"></a><h5>
-<a name="id472484"></a>
- Lexeme
- </h5>
+ Declares two rules: <code class="computeroutput">quoted_string</code>
+ and <code class="computeroutput">start</code>. <code class="computeroutput">start</code> has the same template parameters
+ as the grammar itself. <code class="computeroutput">quoted_string</code>
+ has a <code class="computeroutput">std::string</code> attribute.
+ 
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.lexeme"></a><h6>
+<a name="id702604"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.lexeme">Lexeme</a>
+ </h6>
<pre class="programlisting">lexeme['"' >> +(char_ - '"') >> '"'];
</pre>

- <tt class="computeroutput">lexeme</tt> inhibits space skipping
+ <code class="computeroutput">lexeme</code> inhibits space skipping
 from the open brace to the closing brace. The expression parses quoted
 strings.
 
@@ -1684,35 +1736,35 @@
 parses one or more chars, except the double quote. It stops when it sees
 a double quote.
 
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.difference"></a><h5>
-<a name="id472645"></a>
- Difference
- </h5>
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.difference"></a><h6>
+<a name="id702712"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.difference">Difference</a>
+ </h6>

 The expression:
 
<pre class="programlisting">a - b
</pre>

- parses <tt class="computeroutput">a</tt> but not <tt class="computeroutput">b</tt>. Its attribute is just <tt class="computeroutput">A</tt>, the attribute of <tt class="computeroutput">a</tt>.
- <tt class="computeroutput">b</tt>'s attribute is ignored.
+ parses <code class="computeroutput">a</code> but not <code class="computeroutput">b</code>. Its attribute is just <code class="computeroutput">A</code>, the attribute of <code class="computeroutput">a</code>.
+ <code class="computeroutput">b</code>'s attribute is ignored.
 Hence, the attribute of:
 
<pre class="programlisting">char_ - '"'
</pre>

- is just <tt class="computeroutput">char</tt>.
+ is just <code class="computeroutput">char</code>.
 
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.plus"></a><h5>
-<a name="id472806"></a>
- Plus
- </h5>
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.plus"></a><h6>
+<a name="id702815"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.plus">Plus</a>
+ </h6>
<pre class="programlisting">+a
</pre>

 is the close kin of the kleene star we got so used to in our tutorial.
- Like it's kin, the kleene star, its attribute is a <tt class="computeroutput">std::vector<A></tt> where <tt class="computeroutput">A</tt>
- is the attribute of <tt class="computeroutput">a</tt>.
+ Like it's kin, the kleene star, its attribute is a <code class="computeroutput">std::vector<A></code> where <code class="computeroutput">A</code>
+ is the attribute of <code class="computeroutput">a</code>.
 So, putting all these together, the attribute of
 
<pre class="programlisting">+(char_ - '"')
@@ -1722,11 +1774,11 @@
 
<pre class="programlisting">std::vector<char>
</pre>
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.sequence_attribute"></a><h5>
-<a name="id472994"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.sequence_attribute">Sequence
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.sequence_attribute"></a><h6>
+<a name="id702939"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.sequence_attribute">Sequence
 Attribute</a>
- </h5>
+ </h6>

 Now what's the attribute of
 
@@ -1746,45 +1798,45 @@
<pre class="programlisting">fusion::vector<A, B, C>
</pre>

- where <tt class="computeroutput">A</tt> is the attribute
- of <tt class="computeroutput">a</tt>, <tt class="computeroutput">B</tt>
- is the attribute of <tt class="computeroutput">b</tt> and
- <tt class="computeroutput">C</tt> is the attribute of
- <tt class="computeroutput">c</tt>. What is <tt class="computeroutput">fusion::vector</tt>? - a tuple.
+ where <code class="computeroutput">A</code> is the attribute
+ of <code class="computeroutput">a</code>, <code class="computeroutput">B</code>
+ is the attribute of <code class="computeroutput">b</code> and
+ <code class="computeroutput">C</code> is the attribute of
+ <code class="computeroutput">c</code>. What is <code class="computeroutput">fusion::vector</code>? - a tuple.
 
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
+<tr><td align="left" valign="top">
 If you don't know what I am talking about, see: <a href="http://tinyurl.com/6xun4j" target="_top">Fusion
 Vector</a>. It might be a good idea to have a look into Fusion
 at this point. You'll definitely see more of it in the coming pages.
 </td></tr>
</table></div>
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.attribute_collapsing"></a><h5>
-<a name="id473317"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.attribute_collapsing">Attribute
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.attribute_collapsing"></a><h6>
+<a name="id703161"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.attribute_collapsing">Attribute
 Collapsing</a>
- </h5>
+ </h6>

 Some parsers, especially those very little literal parsers you see, like
- <tt class="computeroutput">'"'</tt>, do not have attributes.
+ <code class="computeroutput">'"'</code>, do not have attributes.
 

 Nodes without attributes are disregarded. In a sequence, like above, all
- nodes with no attributes are filtered out of the <tt class="computeroutput">fusion:vector</tt>.
- So, since <tt class="computeroutput">'"'</tt> has no attribute,
- and <tt class="computeroutput">+(char_
- - '"')</tt> has a <tt class="computeroutput">std::vector<char></tt> attribute, the whole expression's attribute
+ nodes with no attributes are filtered out of the <code class="computeroutput">fusion:vector</code>.
+ So, since <code class="computeroutput">'"'</code> has no attribute,
+ and <code class="computeroutput">+(char_
+ - '"')</code> has a <code class="computeroutput">std::vector<char></code> attribute, the whole expression's attribute
 should have been:
 
<pre class="programlisting">fusion::vector<std::vector<char> >
</pre>

 But wait, there's one more collapsing rule: If after the attribute is a
- single element <tt class="computeroutput">fusion::vector</tt>, The element is stripped naked
+ single element <code class="computeroutput">fusion::vector</code>, The element is stripped naked
 from its container. So, to make a long story short, the attribute of the
 expression:
 
@@ -1795,11 +1847,11 @@
 
<pre class="programlisting">std::vector<char>
</pre>
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.auto_rules"></a><h5>
-<a name="id473668"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.auto_rules">Auto
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.auto_rules"></a><h6>
+<a name="id703397"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.auto_rules">Auto
 Rules</a>
- </h5>
+ </h6>

 It is typical to see rules like:
 
@@ -1813,11 +1865,11 @@
<pre class="programlisting">r %= p;
</pre>

- The attribute of <tt class="computeroutput">p</tt> automatically
- uses the attribute of <tt class="computeroutput">r</tt>.
+ The attribute of <code class="computeroutput">p</code> automatically
+ uses the attribute of <code class="computeroutput">r</code>.
 

- So, going back to our <tt class="computeroutput">quoted_string</tt>
+ So, going back to our <code class="computeroutput">quoted_string</code>
 rule:
 
<pre class="programlisting">quoted_string %= lexeme['"' >> +(char_ - '"') >> '"'];
@@ -1828,15 +1880,15 @@
<pre class="programlisting">quoted_string = lexeme['"' >> +(char_ - '"') >> '"'][val_ = _1];
</pre>

- The attribute of the <tt class="computeroutput">quoted_string</tt>
- rule: <tt class="computeroutput">std::string</tt> is compatible
- with the attribute of the RHS: <tt class="computeroutput">std::vector<char></tt>. The RHS extracts the parsed attribute
+ The attribute of the <code class="computeroutput">quoted_string</code>
+ rule: <code class="computeroutput">std::string</code> is compatible
+ with the attribute of the RHS: <code class="computeroutput">std::vector<char></code>. The RHS extracts the parsed attribute
 directly into the rule's attribute, in-situ.
 
-<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.finally"></a><h5>
-<a name="id474119"></a>
- Finally
- </h5>
+<a name="spirit.qi_and_karma.tutorials.employee___parsing_into_structs.finally"></a><h6>
+<a name="id703712"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.employee___parsing_into_structs.finally">Finally</a>
+ </h6>

 We're down to one rule, the start rule:
 
@@ -1858,28 +1910,28 @@

 These nodes do not have an attribute:
 
-<div class="itemizedlist"><ul type="disc">
-<li><tt class="computeroutput">lit("employee")</tt></li>
-<li><tt class="computeroutput">'{'</tt></li>
-<li><tt class="computeroutput">'}'</tt></li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem"><code class="computeroutput">lit("employee")</code></li>
+<li class="listitem"><code class="computeroutput">'{'</code></li>
+<li class="listitem"><code class="computeroutput">'}'</code></li>
</ul></div>
-<div class="note"><table border="0" summary="Note">
+<div class="note" title="Note"><table border="0" summary="Note">
<tr>
<td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="../images/note.png"></td>
<th align="left">Note</th>
</tr>
-<tr><td colspan="2" align="left" valign="top">
- In case you are wondering, <tt class="computeroutput">lit("employee")</tt> is the same as "employee".
- We had to wrap it inside <tt class="computeroutput">lit</tt>
- because immediately after it is <tt class="computeroutput">>>
- '{'</tt>. You can't right-shift a <tt class="computeroutput">char[]</tt>
- and a <tt class="computeroutput">char</tt> - you know, C++
+<tr><td align="left" valign="top">
+ In case you are wondering, <code class="computeroutput">lit("employee")</code> is the same as "employee".
+ We had to wrap it inside <code class="computeroutput">lit</code>
+ because immediately after it is <code class="computeroutput">>>
+ '{'</code>. You can't right-shift a <code class="computeroutput">char[]</code>
+ and a <code class="computeroutput">char</code> - you know, C++
 syntax rules.
 </td></tr>
</table></div>

- Recall that the attribute of <tt class="computeroutput">start</tt>
- is the <tt class="computeroutput">employee</tt> struct:
+ Recall that the attribute of <code class="computeroutput">start</code>
+ is the <code class="computeroutput">employee</code> struct:
 

 
@@ -1899,25 +1951,25 @@

 

- Now everything is clear, right? The <tt class="computeroutput">struct
- employee</tt> IS
- compatible with <tt class="computeroutput">fusion::vector<int, std::string, std::string, double></tt>. So, the RHS of <tt class="computeroutput">start</tt>
- uses start's attribute (a <tt class="computeroutput">struct
- employee</tt>) in-situ when it does
+ Now everything is clear, right? The <code class="computeroutput">struct
+ employee</code> IS
+ compatible with <code class="computeroutput">fusion::vector<int, std::string, std::string, double></code>. So, the RHS of <code class="computeroutput">start</code>
+ uses start's attribute (a <code class="computeroutput">struct
+ employee</code>) in-situ when it does
 its work.
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Mini XML - ASTs!">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_" title="Mini
- XML - ASTs!">Mini
- XML - ASTs!</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_" title="Mini XML - ASTs!">Mini
+ XML - ASTs!</a>
+</h4></div></div></div>

 Stop and think about it... We've come very close to generating an AST in
 our last example. We parsed a single structure and generated an in-memory
- representation of it in the form of a struct: the <tt class="computeroutput">struct
- employee</tt>. If we changed the implementation
- to parse one or more employees, the result would be a <tt class="computeroutput">std::vector<employee></tt>. We can go on and add more hierarchy:
+ representation of it in the form of a struct: the <code class="computeroutput">struct
+ employee</code>. If we changed the implementation
+ to parse one or more employees, the result would be a <code class="computeroutput">std::vector<employee></code>. We can go on and add more hierarchy:
 teams, departments, corporations. Then we'll have an AST representation
 of it all.
 
@@ -1929,20 +1981,20 @@

 Along the way, we'll see new features:
 
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
 Inherited attributes
 </li>
-<li>
+<li class="listitem">
 Variant attributes
 </li>
-<li>
+<li class="listitem">
 Local Variables
 </li>
-<li>
+<li class="listitem">
 Not Predicate
 </li>
-<li>
+<li class="listitem">
 Lazy Lit
 </li>
</ul></div>
@@ -1954,11 +2006,11 @@
 There are a couple of sample toy-xml files in: ../../example/qi/mini_xml_samples
 for testing purposes. "4.toyxml" has an error in it.
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.first_cut"></a><h5>
-<a name="id475029"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.first_cut">First
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.first_cut"></a><h6>
+<a name="id705998"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.first_cut">First
 Cut</a>
- </h5>
+ </h6>

 Without further delay, here's the first version of the XML grammar:
 
@@ -1968,23 +2020,32 @@


<pre class="programlisting">template <typename Iterator>
-struct mini_xml_grammar : grammar<Iterator, mini_xml(), space_type>
+struct mini_xml_grammar : qi::grammar<Iterator, mini_xml(), ascii::space_type>
{
 mini_xml_grammar() : mini_xml_grammar::base_type(xml)
 {
+ using qi::lit;
+ using qi::lexeme;
+ using ascii::char_;
+ using ascii::string;
+ using namespace qi::labels;
+
+ using phoenix::at_c;
+ using phoenix::push_back;
+
 text = lexeme[+(char_ - '<') [_val += _1]];
 node = (xml | text) [_val = _1];

 start_tag =
 '<'
- >> !char_('/')
+ >> !lit('/')
 >> lexeme[+(char_ - '>') [_val += _1]]
 >> '>'
 ;

 end_tag =
 "</"
- >> lit(_r1)
+ >> string(_r1)
 >> '>'
 ;

@@ -1995,11 +2056,11 @@
 ;
 }

- rule<Iterator, mini_xml(), space_type> xml;
- rule<Iterator, mini_xml_node(), space_type> node;
- rule<Iterator, std::string(), space_type> text;
- rule<Iterator, std::string(), space_type> start_tag;
- rule<Iterator, void(std::string), space_type> end_tag;
+ qi::rule<Iterator, mini_xml(), ascii::space_type> xml;
+ qi::rule<Iterator, mini_xml_node(), ascii::space_type> node;
+ qi::rule<Iterator, std::string(), ascii::space_type> text;
+ qi::rule<Iterator, std::string(), ascii::space_type> start_tag;
+ qi::rule<Iterator, void(std::string), ascii::space_type> end_tag;
};
</pre>

@@ -2007,7 +2068,7 @@

 

- Going bottom up, let's examine the <tt class="computeroutput">text</tt>
+ Going bottom up, let's examine the <code class="computeroutput">text</code>
 rule:
 
<pre class="programlisting">rule<Iterator, std::string(), space_type> text;
@@ -2019,13 +2080,13 @@
</pre>

 The semantic action collects the chars and appends them (via +=) to the
- <tt class="computeroutput">std::string</tt> attribute of the rule (represented
- by the placeholder <tt class="computeroutput">_val</tt>).
+ <code class="computeroutput">std::string</code> attribute of the rule (represented
+ by the placeholder <code class="computeroutput">_val</code>).
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.alternates"></a><h5>
-<a name="id476318"></a>
- Alternates
- </h5>
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.alternates"></a><h6>
+<a name="id707184"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.alternates">Alternates</a>
+ </h6>
<pre class="programlisting">rule<Iterator, mini_xml_node(), space_type> node;
</pre>

@@ -2034,15 +2095,15 @@
<pre class="programlisting">node = (xml | text) [_val = _1];
</pre>

- We'll see what a <tt class="computeroutput">mini_xml_node</tt>
+ We'll see what a <code class="computeroutput">mini_xml_node</code>
 structure later. Looking at the rule definition, we see some alternation
- goiing on here. An xml <tt class="computeroutput">node</tt>
- is either an <tt class="computeroutput">xml</tt> OR <tt class="computeroutput">text</tt>. Hmmm... hold on to that thought...
+ goiing on here. An xml <code class="computeroutput">node</code>
+ is either an <code class="computeroutput">xml</code> OR <code class="computeroutput">text</code>. Hmmm... hold on to that thought...
 
<pre class="programlisting">rule<Iterator, std::string(), space_type> start_tag;
</pre>

- Again, with an attribute of <tt class="computeroutput">std::string</tt>.
+ Again, with an attribute of <code class="computeroutput">std::string</code>.
 Then, it's definition:
 
<pre class="programlisting">start_tag =
@@ -2052,46 +2113,46 @@
 >> '>'
;
</pre>
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.not_predicate"></a><h5>
-<a name="id476781"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.not_predicate">Not
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.not_predicate"></a><h6>
+<a name="id707516"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.not_predicate">Not
 Predicate</a>
- </h5>
+ </h6>

- <tt class="computeroutput">start_tag</tt> is similar to
- the <tt class="computeroutput">text</tt> rule apart from
- the added <tt class="computeroutput">'<'</tt> and <tt class="computeroutput">'>'</tt>. But wait, to make sure that the <tt class="computeroutput">start_tag</tt> does not parse <tt class="computeroutput">end_tag</tt>s too, we add: <tt class="computeroutput">!char_('/')</tt>. This
+ <code class="computeroutput">start_tag</code> is similar to
+ the <code class="computeroutput">text</code> rule apart from
+ the added <code class="computeroutput">'<'</code> and <code class="computeroutput">'>'</code>. But wait, to make sure that the <code class="computeroutput">start_tag</code> does not parse <code class="computeroutput">end_tag</code>s too, we add: <code class="computeroutput">!char_('/')</code>. This
 is a "Not Predicate":
 
<pre class="programlisting">!p
</pre>

- It will try the parser, <tt class="computeroutput">p</tt>.
+ It will try the parser, <code class="computeroutput">p</code>.
 If it is successful, fail, otherwise, pass. In other words, it negates
- the result of <tt class="computeroutput">p</tt>. Like the
- <tt class="computeroutput">eps</tt>, it does not consume
+ the result of <code class="computeroutput">p</code>. Like the
+ <code class="computeroutput">eps</code>, it does not consume
 any input though. It will always rewind the iterator position to where
 it was upon entry. So, the expression:
 
<pre class="programlisting">!char_('/')
</pre>

- basically says: we should not have a <tt class="computeroutput">'/'</tt>
+ basically says: we should not have a <code class="computeroutput">'/'</code>
 at this point.
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.inherited_attribute"></a><h5>
-<a name="id477026"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.inherited_attribute">Inherited
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.inherited_attribute"></a><h6>
+<a name="id707671"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.inherited_attribute">Inherited
 Attribute</a>
- </h5>
+ </h6>

- The <tt class="computeroutput">end_tag</tt>:
+ The <code class="computeroutput">end_tag</code>:
 
<pre class="programlisting">rule<Iterator, void(std::string), space_type> end_tag;
</pre>

- Ohh! Now we see an inherited attribute there: <tt class="computeroutput">std::string</tt>.
- The <tt class="computeroutput">end_tag</tt> does not have
+ Ohh! Now we see an inherited attribute there: <code class="computeroutput">std::string</code>.
+ The <code class="computeroutput">end_tag</code> does not have
 a synthesized attribute. Let's see its definition:
 
<pre class="programlisting">end_tag =
@@ -2101,28 +2162,28 @@
;
</pre>

- <tt class="computeroutput">_r1</tt> is yet another Phoenix placeholder for
- the 1st inherited attribute (we have only one, use <tt class="computeroutput">_r2</tt>,
- <tt class="computeroutput">_r3</tt>, etc. if you have more).
- 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.a_lazy_lit"></a><h5>
-<a name="id477308"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.a_lazy_lit">A
+ <code class="computeroutput">_r1</code> is yet another Phoenix placeholder for
+ the 1st inherited attribute (we have only one, use <code class="computeroutput">_r2</code>,
+ <code class="computeroutput">_r3</code>, etc. if you have more).
+ 
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.a_lazy_lit"></a><h6>
+<a name="id707866"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.a_lazy_lit">A
 Lazy Lit</a>
- </h5>
+ </h6>

- Check out how we used <tt class="computeroutput">lit</tt>
+ Check out how we used <code class="computeroutput">lit</code>
 here, this time, not with a literal string, but with the value of the 1st
- inherited attribute, which is specified as <tt class="computeroutput">std::string</tt>
+ inherited attribute, which is specified as <code class="computeroutput">std::string</code>
 in our rule declaration.
 

- Finally, our <tt class="computeroutput">xml</tt> rule:
+ Finally, our <code class="computeroutput">xml</code> rule:
 
<pre class="programlisting">rule<Iterator, mini_xml(), space_type> xml;
</pre>

- <tt class="computeroutput">mini_xml</tt> is our attribute
+ <code class="computeroutput">mini_xml</code> is our attribute
 here. We'll see later what it is. Let's see its definition:
 
<pre class="programlisting">xml =
@@ -2133,37 +2194,37 @@
</pre>

 Those who know Fusion
- now will notice <tt class="computeroutput">at_c<0></tt> and
- <tt class="computeroutput">at_c<1></tt>. This
- gives us a hint that <tt class="computeroutput">mini_xml</tt>
- is a sort of a tuple - a fusion sequence. <tt class="computeroutput">at_c<N></tt> here is a lazy version of the tuple
+ now will notice <code class="computeroutput">at_c<0></code> and
+ <code class="computeroutput">at_c<1></code>. This
+ gives us a hint that <code class="computeroutput">mini_xml</code>
+ is a sort of a tuple - a fusion sequence. <code class="computeroutput">at_c<N></code> here is a lazy version of the tuple
 accessors, provided by Phoenix.
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.how_it_all_works"></a><h5>
-<a name="id477789"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.how_it_all_works">How
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.how_it_all_works"></a><h6>
+<a name="id708202"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.how_it_all_works">How
 it all works</a>
- </h5>
+ </h6>

 So, what's happening?
 
-<div class="orderedlist"><ol type="1">
-<li>
- Upon parsing <tt class="computeroutput">start_tag</tt>,
- the parsed start-tag string is placed in <tt class="computeroutput">at_c<0>(_val)</tt>.
- </li>
-<li>
- Then we parse zero or more <tt class="computeroutput">node</tt>s.
- At each step, we <tt class="computeroutput">push_back</tt>
- the result into <tt class="computeroutput">at_c<1>(_val)</tt>.
- </li>
-<li>
- Finally, we parse the <tt class="computeroutput">end_tag</tt>
- giving it an inherited attribute: <tt class="computeroutput">at_c<0>(_val)</tt>.
- This is the string we obtained from the <tt class="computeroutput">start_tag</tt>.
- Investigate <tt class="computeroutput">end_tag</tt> above.
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ Upon parsing <code class="computeroutput">start_tag</code>,
+ the parsed start-tag string is placed in <code class="computeroutput">at_c<0>(_val)</code>.
+ </li>
+<li class="listitem">
+ Then we parse zero or more <code class="computeroutput">node</code>s.
+ At each step, we <code class="computeroutput">push_back</code>
+ the result into <code class="computeroutput">at_c<1>(_val)</code>.
+ </li>
+<li class="listitem">
+ Finally, we parse the <code class="computeroutput">end_tag</code>
+ giving it an inherited attribute: <code class="computeroutput">at_c<0>(_val)</code>.
+ This is the string we obtained from the <code class="computeroutput">start_tag</code>.
+ Investigate <code class="computeroutput">end_tag</code> above.
 It will fail to parse if it gets something different from what we got
- from the <tt class="computeroutput">start_tag</tt>. This
+ from the <code class="computeroutput">start_tag</code>. This
 ensures that our tags are balanced.
 </li>
</ol></div>
@@ -2182,15 +2243,15 @@
;
</pre>

- passing in <tt class="computeroutput">at_c<0>(_val)</tt>, the string from start tag. This is referred
- to in the <tt class="computeroutput">end_tag</tt> body
- as <tt class="computeroutput">_r1</tt>.
- 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.the_structures"></a><h5>
-<a name="id478235"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.the_structures">The
+ passing in <code class="computeroutput">at_c<0>(_val)</code>, the string from start tag. This is referred
+ to in the <code class="computeroutput">end_tag</code> body
+ as <code class="computeroutput">_r1</code>.
+ 
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.the_structures"></a><h6>
+<a name="id708503"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.the_structures">The
 Structures</a>
- </h5>
+ </h6>

 Let's see our structures. It will definitely be hierarchical: xml is hierarchical.
 It will also be recursive: xml is recursive.
@@ -2219,17 +2280,17 @@
 

 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.of_alternates_and_variants"></a><h5>
-<a name="id478508"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.of_alternates_and_variants">Of
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.of_alternates_and_variants"></a><h6>
+<a name="id708699"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.of_alternates_and_variants">Of
 Alternates and Variants</a>
- </h5>
+ </h6>

- So that's how a <tt class="computeroutput">mini_xml_node</tt>
- looks like. We had a hint that it is either a <tt class="computeroutput">string</tt>
- or a <tt class="computeroutput">mini_xml</tt>. For this,
- we use boost.variant<>.
- <tt class="computeroutput">boost::recursive_wrapper</tt> wraps <tt class="computeroutput">mini_xml</tt>, making it a recursive data
+ So that's how a <code class="computeroutput">mini_xml_node</code>
+ looks like. We had a hint that it is either a <code class="computeroutput">string</code>
+ or a <code class="computeroutput">mini_xml</code>. For this,
+ we use boost.variant<>.
+ <code class="computeroutput">boost::recursive_wrapper</code> wraps <code class="computeroutput">mini_xml</code>, making it a recursive data
 structure.
 

@@ -2243,16 +2304,16 @@
<pre class="programlisting">boost::variant<A, B>
</pre>

- where <tt class="computeroutput">A</tt> is the attribute
- of <tt class="computeroutput">a</tt> and <tt class="computeroutput">B</tt> is the attribute of <tt class="computeroutput">b</tt>.
+ where <code class="computeroutput">A</code> is the attribute
+ of <code class="computeroutput">a</code> and <code class="computeroutput">B</code> is the attribute of <code class="computeroutput">b</code>.
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.adapting_structs_again"></a><h5>
-<a name="id478778"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.adapting_structs_again">Adapting
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.adapting_structs_again"></a><h6>
+<a name="id708874"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.adapting_structs_again">Adapting
 structs again</a>
- </h5>
+ </h6>

- <tt class="computeroutput">mini_xml</tt> is no brainier.
+ <code class="computeroutput">mini_xml</code> is no brainier.
 It is a plain ol' struct. But as we've seen in our employee example, we
 can adapt that to be a Fusion
 sequence:
@@ -2263,20 +2324,20 @@


<pre class="programlisting">BOOST_FUSION_ADAPT_STRUCT(
- mini_xml,
+ client::mini_xml,
 (std::string, name)
- (std::vector<mini_xml_node>, children)
+ (std::vector<client::mini_xml_node>, children)
)
</pre>

 

 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.one_more_take"></a><h5>
-<a name="id478959"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.one_more_take">One
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.one_more_take"></a><h6>
+<a name="id709015"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.one_more_take">One
 More Take</a>
- </h5>
+ </h6>

 Here's another version. The AST structure remains the same, but this time,
 you'll see that we make use of auto-rules making the grammar semantic-action-
@@ -2289,24 +2350,30 @@

<pre class="programlisting">template <typename Iterator>
struct mini_xml_grammar
- : grammar<Iterator, mini_xml(), locals<std::string>, space_type>
+ : qi::grammar<Iterator, mini_xml(), qi::locals<std::string>, ascii::space_type>
{
 mini_xml_grammar()
 : mini_xml_grammar::base_type(xml)
 {
+ using qi::lit;
+ using qi::lexeme;
+ using ascii::char_;
+ using ascii::string;
+ using namespace qi::labels;
+
 text %= lexeme[+(char_ - '<')];
 node %= xml | text;

 start_tag %=
 '<'
- >> !char_('/')
+ >> !lit('/')
 >> lexeme[+(char_ - '>')]
 >> '>'
 ;

 end_tag =
 "</"
- >> lit(_r1)
+ >> string(_r1)
 >> '>'
 ;

@@ -2317,11 +2384,11 @@
 ;
 }

- rule<Iterator, mini_xml(), locals<std::string>, space_type> xml;
- rule<Iterator, mini_xml_node(), space_type> node;
- rule<Iterator, std::string(), space_type> text;
- rule<Iterator, std::string(), space_type> start_tag;
- rule<Iterator, void(std::string), space_type> end_tag;
+ qi::rule<Iterator, mini_xml(), qi::locals<std::string>, ascii::space_type> xml;
+ qi::rule<Iterator, mini_xml_node(), ascii::space_type> node;
+ qi::rule<Iterator, std::string(), ascii::space_type> text;
+ qi::rule<Iterator, std::string(), ascii::space_type> start_tag;
+ qi::rule<Iterator, void(std::string), ascii::space_type> end_tag;
};
</pre>

@@ -2333,19 +2400,19 @@
 the first xml parser example. The rules are almost the same, except that,
 we got rid of semantic actions and used auto-rules (see the employee example
 if you missed that). There are a couple of new stuff, though. It's all
- in the <tt class="computeroutput">xml</tt> rule:
+ in the <code class="computeroutput">xml</code> rule:
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.local_variables"></a><h5>
-<a name="id479925"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.local_variables">Local
+<a name="spirit.qi_and_karma.tutorials.mini_xml___asts_.local_variables"></a><h6>
+<a name="id709935"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___asts_.local_variables">Local
 Variables</a>
- </h5>
+ </h6>
<pre class="programlisting">rule<Iterator, mini_xml(), locals<std::string>, space_type> xml;
</pre>

- Wow, we have four template parameters now. What's that <tt class="computeroutput">locals</tt>
- guy doing there? Well, it declares that the rule <tt class="computeroutput">xml</tt>
- will have one local variable: a <tt class="computeroutput">string</tt>.
+ Wow, we have four template parameters now. What's that <code class="computeroutput">locals</code>
+ guy doing there? Well, it declares that the rule <code class="computeroutput">xml</code>
+ will have one local variable: a <code class="computeroutput">string</code>.
 Let's see how this is used in action:
 
<pre class="programlisting">xml %=
@@ -2354,33 +2421,33 @@
 >> end_tag(_a)
;
</pre>
-<div class="orderedlist"><ol type="1">
-<li>
- Upon parsing <tt class="computeroutput">start_tag</tt>,
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
+ Upon parsing <code class="computeroutput">start_tag</code>,
 the parsed start-tag string is placed in the local variable specified
 by (yet another) Phoenix
- placeholder: <tt class="computeroutput">_a</tt>. We have
- only one local variable. If we had more, these are designated by <tt class="computeroutput">_b</tt>..<tt class="computeroutput">_z</tt>.
+ placeholder: <code class="computeroutput">_a</code>. We have
+ only one local variable. If we had more, these are designated by <code class="computeroutput">_b</code>..<code class="computeroutput">_z</code>.
 </li>
-<li>
- Then we parse zero or more <tt class="computeroutput">node</tt>s.
+<li class="listitem">
+ Then we parse zero or more <code class="computeroutput">node</code>s.
 </li>
-<li>
- Finally, we parse the <tt class="computeroutput">end_tag</tt>
- giving it an inherited attribute: <tt class="computeroutput">_a</tt>,
+<li class="listitem">
+ Finally, we parse the <code class="computeroutput">end_tag</code>
+ giving it an inherited attribute: <code class="computeroutput">_a</code>,
 our local variable.
 </li>
</ol></div>

- There are no actions involved in stuffing data into our <tt class="computeroutput">xml</tt>
+ There are no actions involved in stuffing data into our <code class="computeroutput">xml</code>
 attribute. It's all taken cared of thatnks to the auto-rule.
 
</div>
-<div class="section" lang="en">
+<div class="section" title="Mini XML - Error Handling">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling"></a><a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling" title="Mini
- XML - Error Handling">Mini
- XML - Error Handling</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling"></a><a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling" title="Mini XML - Error Handling">Mini
+ XML - Error Handling</a>
+</h4></div></div></div>

 A parser will not be complete without error handling. Spirit2 provides
 some facilities to make it easy to adapt a grammar for error handling.
@@ -2395,77 +2462,13 @@
 Here's the grammar:
 

- 
-
-
-
-<pre class="programlisting">template <typename Iterator>
-struct mini_xml_grammar
- : grammar<Iterator, mini_xml(), locals<std::string>, space_type>
-{
- mini_xml_grammar()
- : mini_xml_grammar::base_type(xml, "xml")
- {
- text %= lexeme[+(char_ - '<')];
- node %= xml | text;
-
- start_tag %=
- '<'
- >> !char_('/')
- > lexeme[+(char_ - '>')]
- > '>'
- ;
-
- end_tag =
- "</"
- > lit(_r1)
- > '>'
- ;
-
- xml %=
- start_tag[_a = _1]
- > *node
- > end_tag(_a)
- ;
-
- xml.name("xml");
- node.name("node");
- text.name("text");
- start_tag.name("start_tag");
- end_tag.name("end_tag");
-
- on_error<fail>
- (
- xml
- , std::cout
- << val("Error! Expecting ")
- << _4 // what failed?
- << val(" here: \"")
- << construct<std::string>(_3, _2) // iterators to error-pos, end
- << val("\"")
- << std::endl
- );
- }
-
- rule<Iterator, mini_xml(), locals<std::string>, space_type> xml;
- rule<Iterator, mini_xml_node(), space_type> node;
- rule<Iterator, std::string(), space_type> text;
- rule<Iterator, std::string(), space_type> start_tag;
- rule<Iterator, void(std::string), space_type> end_tag;
-};
-</pre>
-
- 
-
- 
-
 What's new?
 
-<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.readable_names"></a><h5>
-<a name="id481710"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.readable_names">Readable
+<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.readable_names"></a><h6>
+<a name="id710240"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.readable_names">Readable
 Names</a>
- </h5>
+ </h6>

 First, when we call the base class, we give the grammar a name:
 
@@ -2480,13 +2483,13 @@
start_tag.name("start_tag");
end_tag.name("end_tag");
</pre>
-<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.on_error"></a><h5>
-<a name="id481964"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.on_error">On
+<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.on_error"></a><h6>
+<a name="id712125"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.on_error">On
 Error</a>
- </h5>
+ </h6>

- <tt class="computeroutput">on_error</tt> declares our error
+ <code class="computeroutput">on_error</code> declares our error
 handler:
 
<pre class="programlisting">on_error<Action>(rule, handler)
@@ -2508,8 +2511,8 @@
);
</pre>

- we choose to <tt class="computeroutput">fail</tt> in our
- example for the <tt class="computeroutput">Action</tt>:
+ we choose to <code class="computeroutput">fail</code> in our
+ example for the <code class="computeroutput">Action</code>:
 Quit and fail. Return a no_match (false). It can be one of:
 
<div class="informaltable"><table class="table">
@@ -2520,7 +2523,7 @@
<thead><tr>
<th>
 
- <tt class="computeroutput">Action</tt>
+ <code class="computeroutput">Action</code>
 
 </th>
<th>
@@ -2581,12 +2584,12 @@
</tbody>
</table></div>

- <tt class="computeroutput">rule</tt> is the rule we attach
- the handler to. In our case, we are attaching to the <tt class="computeroutput">xml</tt>
+ <code class="computeroutput">rule</code> is the rule we attach
+ the handler to. In our case, we are attaching to the <code class="computeroutput">xml</code>
 rule.
 

- <tt class="computeroutput">handler</tt> is the actual error
+ <code class="computeroutput">handler</code> is the actual error
 handling function. It expects 4 arguments:
 
<div class="informaltable"><table class="table">
@@ -2658,14 +2661,14 @@
</tr>
</tbody>
</table></div>
-<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.expectation_points"></a><h5>
-<a name="id482635"></a>
- <a href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.expectation_points">Expectation
+<a name="spirit.qi_and_karma.tutorials.mini_xml___error_handling.expectation_points"></a><h6>
+<a name="id712633"></a>
+ <a class="link" href="qi_and_karma.html#spirit.qi_and_karma.tutorials.mini_xml___error_handling.expectation_points">Expectation
 Points</a>
- </h5>
+ </h6>

 You might not have noticed it, but some of our expressions changed from
- using the <tt class="computeroutput">>></tt> to <tt class="computeroutput">></tt>. Look, for example:
+ using the <code class="computeroutput">>></code> to <code class="computeroutput">></code>. Look, for example:
 
<pre class="programlisting">end_tag =
 "</"
@@ -2676,10 +2679,10 @@

 What is it? It's the expectation operator. You will
 have some "deterministic points" in the grammar. Those are the
- places where backtracking cannot occur.
- For our example above, when you get a <tt class="computeroutput">"</"</tt>,
+ places where backtracking cannot occur.
+ For our example above, when you get a <code class="computeroutput">"</"</code>,
 you definitely must see a valid end-tag label next. It should be the one
- you got from the start-tag. After that, you definitely must have a <tt class="computeroutput">'>'</tt> next. Otherwise, there is no point in
+ you got from the start-tag. After that, you definitely must have a <code class="computeroutput">'>'</code> next. Otherwise, there is no point in
 proceeding forward and trying other branches, regardless where they are.
 The input is definitely erroneous. When this happens, an expectation_failure
 exception is thrown. Somewhere outward, the error handler will catch the
@@ -2706,8 +2709,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Abstracts</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../qi_and_karma.html" title="Qi and Karma">
<link rel="prev" href="../qi_and_karma.html" title="Qi and Karma">
<link rel="next" href="abstracts/parsing.html" title="Parsing">
@@ -22,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="../qi_and_karma.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi_and_karma.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="abstracts/parsing.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Abstracts">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.qi_and_karma.abstracts"></a>Abstracts</h3></div></div></div>
+<a name="spirit.qi_and_karma.abstracts"></a><a class="link" href="abstracts.html" title="Abstracts">Abstracts</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt><a href="abstracts.html#spirit.qi_and_karma.abstracts.parsing_expression_grammar">Parsing
 Expression Grammar</a></dt>
@@ -45,15 +46,15 @@
<dt><a href="abstracts/parse_trees_and_asts.html">Parse
 Trees and ASTs</a></dt>
</dl></div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.parsing_expression_grammar"></a><a href="abstracts.html#spirit.qi_and_karma.abstracts.parsing_expression_grammar" title="Parsing
- Expression Grammar">Parsing
- Expression Grammar</a></h4></div></div></div></div>
+<div class="section" title="Parsing Expression Grammar"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.parsing_expression_grammar"></a><a class="link" href="abstracts.html#spirit.qi_and_karma.abstracts.parsing_expression_grammar" title="Parsing Expression Grammar">Parsing
+ Expression Grammar</a>
+</h4></div></div></div></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/attributes.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,12 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Attributes</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="operators.html" title="Operators">
-<link rel="next" href="semantic_actions.html" title="Semantic
- Actions">
+<link rel="next" href="semantic_actions.html" title="Semantic Actions">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="operators.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="semantic_actions.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.attributes"></a>Attributes</h4></div></div></div></div>
+<div class="section" title="Attributes"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.attributes"></a><a class="link" href="attributes.html" title="Attributes">Attributes</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/debugging.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,12 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Debugging</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="grammars.html" title="Grammars">
-<link rel="next" href="mini_xml___error_handling.html" title="Mini
- XML - Error Handling">
+<link rel="next" href="mini_xml___error_handling.html" title="Mini XML - Error Handling">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="grammars.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="mini_xml___error_handling.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.debugging"></a>Debugging</h4></div></div></div></div>
+<div class="section" title="Debugging"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.debugging"></a><a class="link" href="debugging.html" title="Debugging">Debugging</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/directives.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,11 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Directives</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
-<link rel="prev" href="semantic_actions.html" title="Semantic
- Actions">
+<link rel="prev" href="semantic_actions.html" title="Semantic Actions">
<link rel="next" href="rules.html" title="Rules">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,12 +22,13 @@
<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="../abstracts.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="rules.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.directives"></a>Directives</h4></div></div></div></div>
+<div class="section" title="Directives"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.directives"></a><a class="link" href="directives.html" title="Directives">Directives</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Deleted: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/error_handling.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/error_handling.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
+++ (empty file)
@@ -1,45 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Error
- Handling</title>
-<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
-<link rel="up" href="../abstracts.html" title="Abstracts">
-<link rel="prev" href="debugging.html" title="Debugging">
-<link rel="next" href="parse_trees_and_asts.html" title="Parse
- Trees and ASTs">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table cellpadding="2" width="100%"><tr>
-<td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center">Home</td>
-<td align="center">Libraries</td>
-<td align="center">People</td>
-<td align="center">FAQ</td>
-<td align="center">More</td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="debugging.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="parse_trees_and_asts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.error_handling"></a><a href="error_handling.html" title="Error
- Handling">Error
- Handling</a></h4></div></div></div></div>
-<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- 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)
- 
-</div></td>
-</tr></table>
-<hr>
-<div class="spirit-nav">
-<a accesskey="p" href="debugging.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="parse_trees_and_asts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
-</div>
-</body>
-</html>

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/grammars.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Grammars</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="rules.html" title="Rules">
<link rel="next" href="debugging.html" title="Debugging">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="rules.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="debugging.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.grammars"></a>Grammars</h4></div></div></div></div>
+<div class="section" title="Grammars"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.grammars"></a><a class="link" href="grammars.html" title="Grammars">Grammars</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/mini_xml___error_handling.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,15 +1,13 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Mini
- XML - Error Handling</title>
+<title>Mini XML - Error Handling</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="debugging.html" title="Debugging">
-<link rel="next" href="parse_trees_and_asts.html" title="Parse
- Trees and ASTs">
+<link rel="next" href="parse_trees_and_asts.html" title="Parse Trees and ASTs">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -24,11 +22,11 @@
<div class="spirit-nav">
<a accesskey="p" href="debugging.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="parse_trees_and_asts.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Mini XML - Error Handling">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling"></a><a href="mini_xml___error_handling.html" title="Mini
- XML - Error Handling">Mini
- XML - Error Handling</a></h4></div></div></div>
+<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling"></a><a class="link" href="mini_xml___error_handling.html" title="Mini XML - Error Handling">Mini
+ XML - Error Handling</a>
+</h4></div></div></div>

 A parser will not be complete without error handling. Spirit2 provides
 some facilities to make it easy to adapt a grammar for error handling.
@@ -43,77 +41,13 @@
 Here's the grammar:
 

- 
-
-
-
-<pre class="programlisting">template <typename Iterator>
-struct mini_xml_grammar
- : grammar<Iterator, mini_xml(), locals<std::string>, space_type>
-{
- mini_xml_grammar()
- : mini_xml_grammar::base_type(xml, "xml")
- {
- text %= lexeme[+(char_ - '<')];
- node %= xml | text;
-
- start_tag %=
- '<'
- >> !char_('/')
- > lexeme[+(char_ - '>')]
- > '>'
- ;
-
- end_tag =
- "</"
- > lit(_r1)
- > '>'
- ;
-
- xml %=
- start_tag[_a = _1]
- > *node
- > end_tag(_a)
- ;
-
- xml.name("xml");
- node.name("node");
- text.name("text");
- start_tag.name("start_tag");
- end_tag.name("end_tag");
-
- on_error<fail>
- (
- xml
- , std::cout
- << val("Error! Expecting ")
- << _4 // what failed?
- << val(" here: \"")
- << construct<std::string>(_3, _2) // iterators to error-pos, end
- << val("\"")
- << std::endl
- );
- }
-
- rule<Iterator, mini_xml(), locals<std::string>, space_type> xml;
- rule<Iterator, mini_xml_node(), space_type> node;
- rule<Iterator, std::string(), space_type> text;
- rule<Iterator, std::string(), space_type> start_tag;
- rule<Iterator, void(std::string), space_type> end_tag;
-};
-</pre>
-
- 
-
- 
-
 What's new?
 
-<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.readable_names"></a><h5>
-<a name="id484998"></a>
- <a href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.readable_names">Readable
+<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.readable_names"></a><h6>
+<a name="id713217"></a>
+ <a class="link" href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.readable_names">Readable
 Names</a>
- </h5>
+ </h6>

 First, when we call the base class, we give the grammar a name:
 
@@ -128,13 +62,13 @@
start_tag.name("start_tag");
end_tag.name("end_tag");
</pre>
-<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.on_error"></a><h5>
-<a name="id485249"></a>
- <a href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.on_error">On
+<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.on_error"></a><h6>
+<a name="id713394"></a>
+ <a class="link" href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.on_error">On
 Error</a>
- </h5>
+ </h6>

- <tt class="computeroutput">on_error</tt> declares our error
+ <code class="computeroutput">on_error</code> declares our error
 handler:
 
<pre class="programlisting">on_error<Action>(rule, handler)
@@ -156,8 +90,8 @@
);
</pre>

- we choose to <tt class="computeroutput">fail</tt> in our
- example for the <tt class="computeroutput">Action</tt>:
+ we choose to <code class="computeroutput">fail</code> in our
+ example for the <code class="computeroutput">Action</code>:
 Quit and fail. Return a no_match (false). It can be one of:
 
<div class="informaltable"><table class="table">
@@ -168,7 +102,7 @@
<thead><tr>
<th>
 
- <tt class="computeroutput">Action</tt>
+ <code class="computeroutput">Action</code>
 
 </th>
<th>
@@ -229,12 +163,12 @@
</tbody>
</table></div>

- <tt class="computeroutput">rule</tt> is the rule we attach
- the handler to. In our case, we are attaching to the <tt class="computeroutput">xml</tt>
+ <code class="computeroutput">rule</code> is the rule we attach
+ the handler to. In our case, we are attaching to the <code class="computeroutput">xml</code>
 rule.
 

- <tt class="computeroutput">handler</tt> is the actual error
+ <code class="computeroutput">handler</code> is the actual error
 handling function. It expects 4 arguments:
 
<div class="informaltable"><table class="table">
@@ -306,14 +240,14 @@
</tr>
</tbody>
</table></div>
-<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.expectation_points"></a><h5>
-<a name="id485914"></a>
- <a href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.expectation_points">Expectation
+<a name="spirit.qi_and_karma.abstracts.mini_xml___error_handling.expectation_points"></a><h6>
+<a name="id713903"></a>
+ <a class="link" href="mini_xml___error_handling.html#spirit.qi_and_karma.abstracts.mini_xml___error_handling.expectation_points">Expectation
 Points</a>
- </h5>
+ </h6>

 You might not have noticed it, but some of our expressions changed from
- using the <tt class="computeroutput">>></tt> to <tt class="computeroutput">></tt>. Look, for example:
+ using the <code class="computeroutput">>></code> to <code class="computeroutput">></code>. Look, for example:
 
<pre class="programlisting">end_tag =
 "</"
@@ -324,10 +258,10 @@

 What is it? It's the expectation operator. You will
 have some "deterministic points" in the grammar. Those are the
- places where backtracking cannot occur.
- For our example above, when you get a <tt class="computeroutput">"</"</tt>,
+ places where backtracking cannot occur.
+ For our example above, when you get a <code class="computeroutput">"</"</code>,
 you definitely must see a valid end-tag label next. It should be the one
- you got from the start-tag. After that, you definitely must have a <tt class="computeroutput">'>'</tt> next. Otherwise, there is no point in
+ you got from the start-tag. After that, you definitely must have a <code class="computeroutput">'>'</code> next. Otherwise, there is no point in
 proceeding forward and trying other branches, regardless where they are.
 The input is definitely erroneous. When this happens, an expectation_failure
 exception is thrown. Somewhere outward, the error handler will catch the
@@ -352,8 +286,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/operators.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Operators</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="primitives.html" title="Primitives">
<link rel="next" href="attributes.html" title="Attributes">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="primitives.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="attributes.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.operators"></a>Operators</h4></div></div></div></div>
+<div class="section" title="Operators"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.operators"></a><a class="link" href="operators.html" title="Operators">Operators</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parse_trees_and_asts.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,14 +1,12 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Parse
- Trees and ASTs</title>
+<title>Parse Trees and ASTs</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
-<link rel="prev" href="mini_xml___error_handling.html" title="Mini
- XML - Error Handling">
+<link rel="prev" href="mini_xml___error_handling.html" title="Mini XML - Error Handling">
<link rel="next" href="../quick_reference.html" title="Quick Reference">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -24,14 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="mini_xml___error_handling.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="../quick_reference.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.parse_trees_and_asts"></a><a href="parse_trees_and_asts.html" title="Parse
- Trees and ASTs">Parse
- Trees and ASTs</a></h4></div></div></div></div>
+<div class="section" title="Parse Trees and ASTs"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.parse_trees_and_asts"></a><a class="link" href="parse_trees_and_asts.html" title="Parse Trees and ASTs">Parse
+ Trees and ASTs</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,12 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Parsing</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="../abstracts.html" title="Abstracts">
-<link rel="next" href="parsing_and_generating.html" title="Parsing
- and Generating">
+<link rel="next" href="parsing_and_generating.html" title="Parsing and Generating">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -23,15 +22,16 @@
<div class="spirit-nav">
<a accesskey="p" href="../abstracts.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="parsing_and_generating.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Parsing">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.parsing"></a>Parsing</h4></div></div></div>
+<a name="spirit.qi_and_karma.abstracts.parsing"></a><a class="link" href="parsing.html" title="Parsing">Parsing</a>
+</h4></div></div></div>

 Central to the library is the parser. The parser does the actual work of
 recognizing a linear input stream of data read sequentially from start
 to end by the supplied iterators. The parser attempts to match the input
 following a well-defined set of specifications known as grammar rules.
- The parser returns a <tt class="computeroutput">bool</tt>
+ The parser returns a <code class="computeroutput">bool</code>
 to report the success or failure. When successful, the parser calls a client-supplied
 semantic action, if there is one. The semantic action extracts structural
 information depending on the data passed by the parser and the hierarchical
@@ -55,36 +55,36 @@
 write a user-defined parser. The ease in writing a parser entity is the
 main reason for Spirit's extensibility.
 
-<a name="spirit.qi_and_karma.abstracts.parsing.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__"></a><h5>
-<a name="id483114"></a>
- <a href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__">The
+<a name="spirit.qi_and_karma.abstracts.parsing.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__"></a><h6>
+<a name="id712941"></a>
+ <a class="link" href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__">The
 API functions exposed by Spirit.Qi </a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing.the_parse___function"></a><h5>
-<a name="id483146"></a>
- <a href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing.the_parse___function"></a><h6>
+<a name="id712960"></a>
+ <a class="link" href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_parse___function">The
 parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing.the_phrase_parse___function"></a><h5>
-<a name="id483175"></a>
- <a href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_phrase_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing.the_phrase_parse___function"></a><h6>
+<a name="id712975"></a>
+ <a class="link" href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_phrase_parse___function">The
 phrase_parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_parse___function"></a><h5>
-<a name="id483202"></a>
- <a href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_parse___function"></a><h6>
+<a name="id712989"></a>
+ <a class="link" href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_parse___function">The
 tokenize_and_parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_phrase_parse___function"></a><h5>
-<a name="id483232"></a>
- <a href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_phrase_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_phrase_parse___function"></a><h6>
+<a name="id713002"></a>
+ <a class="link" href="parsing.html#spirit.qi_and_karma.abstracts.parsing.the_tokenize_and_phrase_parse___function">The
 tokenize_and_phrase_parse() function</a>
- </h5>
+ </h6>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/parsing_and_generating.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,11 +1,10 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Parsing
- and Generating</title>
+<title>Parsing and Generating</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="parsing.html" title="Parsing">
<link rel="next" href="primitives.html" title="Primitives">
@@ -23,41 +22,41 @@
<div class="spirit-nav">
<a accesskey="p" href="parsing.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="primitives.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Parsing and Generating">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating"></a><a href="parsing_and_generating.html" title="Parsing
- and Generating">Parsing
- and Generating</a></h4></div></div></div>
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__"></a><h5>
-<a name="id483289"></a>
- <a href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__">The
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating"></a><a class="link" href="parsing_and_generating.html" title="Parsing and Generating">Parsing
+ and Generating</a>
+</h4></div></div></div>
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__"></a><h6>
+<a name="id713026"></a>
+ <a class="link" href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_api_functions_exposed_by__emphasis_spirit_qi__emphasis__">The
 API functions exposed by Spirit.Qi </a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_parse___function"></a><h5>
-<a name="id483324"></a>
- <a href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_parse___function"></a><h6>
+<a name="id713043"></a>
+ <a class="link" href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_parse___function">The
 parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_phrase_parse___function"></a><h5>
-<a name="id483355"></a>
- <a href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_phrase_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_phrase_parse___function"></a><h6>
+<a name="id713056"></a>
+ <a class="link" href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_phrase_parse___function">The
 phrase_parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_parse___function"></a><h5>
-<a name="id483384"></a>
- <a href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_parse___function"></a><h6>
+<a name="id713069"></a>
+ <a class="link" href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_parse___function">The
 tokenize_and_parse() function</a>
- </h5>
-<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function"></a><h5>
-<a name="id483415"></a>
- <a href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function">The
+ </h6>
+<a name="spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function"></a><h6>
+<a name="id713082"></a>
+ <a class="link" href="parsing_and_generating.html#spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function">The
 tokenize_and_phrase_parse() function</a>
- </h5>
+ </h6>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/primitives.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,11 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Primitives</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
-<link rel="prev" href="parsing_and_generating.html" title="Parsing
- and Generating">
+<link rel="prev" href="parsing_and_generating.html" title="Parsing and Generating">
<link rel="next" href="operators.html" title="Operators">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="parsing_and_generating.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="operators.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.primitives"></a>Primitives</h4></div></div></div></div>
+<div class="section" title="Primitives"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.primitives"></a><a class="link" href="primitives.html" title="Primitives">Primitives</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/rules.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Rules</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="directives.html" title="Directives">
<link rel="next" href="grammars.html" title="Grammars">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="directives.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="grammars.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.rules"></a>Rules</h4></div></div></div></div>
+<div class="section" title="Rules"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.rules"></a><a class="link" href="rules.html" title="Rules">Rules</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/abstracts/semantic_actions.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,11 +1,10 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Semantic
- Actions</title>
+<title>Semantic Actions</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../../index.html" title="Spirit 2.1">
<link rel="up" href="../abstracts.html" title="Abstracts">
<link rel="prev" href="attributes.html" title="Attributes">
<link rel="next" href="directives.html" title="Directives">
@@ -23,14 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="attributes.html"><img src="../../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../abstracts.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="directives.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.abstracts.semantic_actions"></a><a href="semantic_actions.html" title="Semantic
- Actions">Semantic
- Actions</a></h4></div></div></div></div>
+<div class="section" title="Semantic Actions"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.abstracts.semantic_actions"></a><a class="link" href="semantic_actions.html" title="Semantic Actions">Semantic
+ Actions</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/quick_reference.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,11 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Quick Reference</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../qi_and_karma.html" title="Qi and Karma">
-<link rel="prev" href="abstracts/parse_trees_and_asts.html" title="Parse
- Trees and ASTs">
+<link rel="prev" href="abstracts/parse_trees_and_asts.html" title="Parse Trees and ASTs">
<link rel="next" href="reference.html" title="Reference">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -23,31 +22,112 @@
<div class="spirit-nav">
<a accesskey="p" href="abstracts/parse_trees_and_asts.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi_and_karma.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" lang="en">
+<div class="section" title="Quick Reference">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.qi_and_karma.quick_reference"></a>Quick Reference</h3></div></div></div>
-
- The following tables use some conventions to encode the attribute type exposed
- by a component
- 
-<div class="variablelist">
-
+<a name="spirit.qi_and_karma.quick_reference"></a><a class="link" href="quick_reference.html" title="Quick Reference">Quick Reference</a>
+</h3></div></div></div>
+<div class="variablelist" title="Notation">
+Notation
<dl>
-<dt><tt class="computeroutput">attribute_of(P)</tt></dt>
+<dt><code class="computeroutput">P</code></dt>
+<dd>
+ Parser type
+ </dd>
+<dt><code class="computeroutput">p, a,
+ b, c</code></dt>
+<dd>
+ Parser objects
+ </dd>
+<dt><code class="computeroutput">A, B,
+ C</code></dt>
+<dd>
+ Attribute types of parsers A, B and C
+ </dd>
+<dt><code class="computeroutput">I</code></dt>
+<dd>
+ The iterator type used for parsing
+ </dd>
+<dt><code class="computeroutput">Unused</code></dt>
+<dd>
+ An <code class="computeroutput">unused_type</code>
+ </dd>
+<dt><code class="computeroutput">Context</code></dt>
+<dd>
+ The enclosing rule's <code class="computeroutput">Context</code>
+ type
+ </dd>
+<dt><code class="computeroutput">Attr</code></dt>
+<dd>
+ An attribute type
+ </dd>
+<dt><code class="computeroutput">b</code></dt>
+<dd>
+ A boolean expression
+ </dd>
+<dt><code class="computeroutput">fp</code></dt>
+<dd>
+ A (lazy parser) function with signature <code class="computeroutput">P(Unused, Context)</code>
+ </dd>
+<dt><code class="computeroutput">fa</code></dt>
+<dd>
+ A (semantic action) function with signature <code class="computeroutput">void(Attr, Context, bool&)</code>. The third parameter is a boolean
+ flag that can be set to false to force the parse to fail.
+ </dd>
+<dt><code class="computeroutput">first</code></dt>
+<dd>
+ An iterator pointing to the start of input
+ </dd>
+<dt><code class="computeroutput">last</code></dt>
+<dd>
+ An iterator pointing to the end of input
+ </dd>
+<dt><code class="computeroutput">Ch</code></dt>
+<dd>
+ Character-class specific character type (See __char_classtypes_)
+ </dd>
+<dt><code class="computeroutput">ch</code></dt>
+<dd>
+ Character-class specific character (See __char_classtypes_)
+ </dd>
+<dt><code class="computeroutput">ch2</code></dt>
+<dd>
+ Character-class specific character (See __char_classtypes_)
+ </dd>
+<dt><code class="computeroutput">chset</code></dt>
<dd>
- The component exposes the same attribute as the component 'P' used as
- part of the overall construct
+ Character-set specifier string (example: "a-z0-9")
 </dd>
-<dt><tt class="computeroutput">value_type(I)</tt></dt>
+<dt><code class="computeroutput">str</code></dt>
<dd>
- The component exposes the value_type of the underlying iterator 'I' as
- its attribute type
+ Character-class specific string (See __char_classtypes_)
+ </dd>
+<dt><code class="computeroutput">Str</code></dt>
+<dd>
+ Attribute of <code class="computeroutput">str</code>: <code class="computeroutput">std::basic_string<T></code>
+ where <code class="computeroutput">T</code> is the underlying
+ character type of <code class="computeroutput">str</code>
+ </dd>
+<dt><code class="computeroutput">tuple<></code></dt>
+<dd>
+ Used as a placeholder for a fusion sequence
+ </dd>
+<dt><code class="computeroutput">vector<></code></dt>
+<dd>
+ Used as a placeholder for an STL container
+ </dd>
+<dt><code class="computeroutput">variant<></code></dt>
+<dd>
+ Used as a placeholder for a boost::variant
+ </dd>
+<dt><code class="computeroutput">optional<></code></dt>
+<dd>
+ Used as a placeholder for a boost::optional
 </dd>
</dl>
</div>
<div class="table">
-<a name="id486409"></a>Table 4. Character Parsers
-<table class="table" summary="Character Parsers">
+<a name="id715488"></a>Table 4. Predefined /Spirit.Qi/ primitive parsers
+<div class="table-contents"><table class="table" summary="Predefined /Spirit.Qi/ primitive parsers">
<colgroup>
<col>
<col>
@@ -56,17 +136,17 @@
<thead><tr>
<th>
 
- Component
+ Expression
 
 </th>
<th>
 
- Description
+ Attribute
 
 </th>
<th>
 
- Attribute
+ Description
 
 </th>
</tr></thead>
@@ -74,283 +154,3034 @@
<tr>
<td>
 
- <tt class="computeroutput">char_</tt>
+ <code class="computeroutput">eol</code>
 
 </td>
<td>
 
+ <code class="computeroutput">Unused</code>
 
 </td>
<td>
 
- <tt class="computeroutput">char</tt>
+ Matches the end of line (<code class="computeroutput">\r</code> or <code class="computeroutput">\n</code> or <code class="computeroutput">\r\n</code>)
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">wchar</tt>
+ <code class="computeroutput">eoi</code>
 
 </td>
<td>
 
+ <code class="computeroutput">Unused</code>
 
 </td>
<td>
 
- <tt class="computeroutput">wchar_t</tt>
+ Matches the end of input (first == last)
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">lit</tt>
+ <code class="computeroutput">eps</code>
 
 </td>
<td>
 
+ <code class="computeroutput">Unused</code>
 
 </td>
<td>
 
- <tt class="computeroutput">unused</tt>
+ Match an empty string
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">wlit</tt>
+ <code class="computeroutput">eps(b)</code>
 
 </td>
<td>
 
+ <code class="computeroutput">Unused</code>
 
 </td>
<td>
 
- <tt class="computeroutput">unused</tt>
+ If <code class="computeroutput">b</code> is true, match
+ an empty string
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">'x'</tt>
+ <code class="computeroutput">lazy(fp)</code>
 
 </td>
<td>
 
+ Attribute of <code class="computeroutput">P</code> where
+ <code class="computeroutput">P</code> is the return type
+ of <code class="computeroutput">fp</code>
 
 </td>
<td>
 
- <tt class="computeroutput">unused</tt>
+ Invoke <code class="computeroutput">fp</code> at parse
+ time, returning a parser <code class="computeroutput">p</code>
+ which is then called to parse.
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">L'x'</tt>
+ <code class="computeroutput">fp</code>
 
 </td>
<td>
 
+ see <code class="computeroutput">lazy(fp)</code>
+ above
 
 </td>
<td>
 
- <tt class="computeroutput">unused</tt>
+ Equivalent to <code class="computeroutput">lazy[fp]</code>
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">alnum</tt>
+ <code class="computeroutput">p[fa]</code>
 
 </td>
<td>
 
+ Attribute of <code class="computeroutput">p</code>
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Call semantic action, <code class="computeroutput">fa</code>
+ if p succeeds.
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">alpha</tt>
+ <code class="computeroutput">byte_</code>
 
 </td>
<td>
 
+ 8 bits native endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches an 8 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">blank</tt>
+ <code class="computeroutput">word</code>
 
 </td>
<td>
 
+ 16 bits native endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 16 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">cntrl</tt>
+ <code class="computeroutput">big_word</code>
 
 </td>
<td>
 
+ 16 bits big endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 16 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">digit</tt>
+ <code class="computeroutput">little_word</code>
 
 </td>
<td>
 
+ 16 bits little endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 16 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">graph</tt>
+ <code class="computeroutput">dword</code>
 
 </td>
<td>
 
+ 32 bits native endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 32 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">print</tt>
+ <code class="computeroutput">big_dword</code>
 
 </td>
<td>
 
+ 32 bits big endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 32 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">punct</tt>
+ <code class="computeroutput">little_dword</code>
 
 </td>
<td>
 
+ 32 bits little endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 32 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">space</tt>
+ <code class="computeroutput">qword</code>
 
 </td>
<td>
 
+ 64 bits native endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 64 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">xdigit</tt>
+ <code class="computeroutput">big_qword</code>
 
 </td>
<td>
 
+ 64 bits big endian
 
 </td>
<td>
 
- <tt class="computeroutput">Char</tt>
+ Matches a 64 bit binary
 
 </td>
</tr>
<tr>
<td>
 
- <tt class="computeroutput">~P</tt>
+ <code class="computeroutput">little_qword</code>
 
 </td>
<td>
 
+ 64 bits little endian
 
 </td>
<td>
 
- <tt class="computeroutput">attribute_of(P)</tt>
+ Matches a 64 bit binary
 
 </td>
</tr>
-</tbody>
-</table>
-</div>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Matches any character
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_(ch)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_("c")</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Matches a single char string literal, <code class="computeroutput">c</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_(ch, ch2)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Matches a range of chars from <code class="computeroutput">ch</code>
+ to <code class="computeroutput">ch2</code> (inclusive)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_(chset)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Matches a character set <code class="computeroutput">chset</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ch</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">str</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lit(ch)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lit(str)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">string(str)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Str</code>
+ 
+ </td>
+<td>
+ 
+ Matches <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lexeme[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Disable skip parsing for <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">nocase[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Inhibits case-sensitivity for <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">omit[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Ignores the attribute type of <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">raw[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">boost::iterator_range<I></code>
+ 
+ </td>
+<td>
+ 
+ Presents the transduction of <code class="computeroutput">a</code>
+ as an iterator range
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> zero or more
+ times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N, M)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> to <code class="computeroutput">M</code>
+ times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N, inf)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">skip[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Reestablish the skipper that got inhibited by lexeme
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">skip(p)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Use <code class="computeroutput">p</code> as a skipper
+ for parsing <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">float_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">float</code>
+ 
+ </td>
+<td>
+ 
+ Parse a floating point number into a <code class="computeroutput">float</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">double_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">double</code>
+ 
+ </td>
+<td>
+ 
+ Parse a floating point number into a <code class="computeroutput">double</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_double</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long double</code>
+ 
+ </td>
+<td>
+ 
+ Parse a floating point number into a <code class="computeroutput">long
+ double</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">bin</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Parse a binary integer into an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">oct</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Parse an octal integer into an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">hex</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Parse a hexadecimal integer into an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ushort_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned short</code>
+ 
+ </td>
+<td>
+ 
+ Parse an unsigned short integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ulong_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned long</code>
+ 
+ </td>
+<td>
+ 
+ Parse an unsigned long integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">uint_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned int</code>
+ 
+ </td>
+<td>
+ 
+ Parse an unsigned int
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ulong_long</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned long
+ long</code>
+ 
+ </td>
+<td>
+ 
+ Parse an unsigned long long
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">short_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">short</code>
+ 
+ </td>
+<td>
+ 
+ Parse a short integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long</code>
+ 
+ </td>
+<td>
+ 
+ Parse a long integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">int_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">int</code>
+ 
+ </td>
+<td>
+ 
+ Parse an int
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_long</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long long</code>
+ 
+ </td>
+<td>
+ 
+ Parse a long long
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">!a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Not predicate. Ensure that <code class="computeroutput">a</code>
+ does not match but don't move the iterator position
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">&a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ And predicate. Ensure that <code class="computeroutput">a</code>
+ matches but don't move the iterator position
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">-a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">optional<A></code>
+ 
+ </td>
+<td>
+ 
+ Optional. Parse <code class="computeroutput">a</code> zero
+ or one time
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">*a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Kleene. Parse <code class="computeroutput">a</code> zero
+ or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">+a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Plus. Parse <code class="computeroutput">a</code> one or
+ more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a |
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">variant<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Alternative. Parse <code class="computeroutput">a</code>
+ or <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a >>
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">tuple<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Sequence. Parse <code class="computeroutput">a</code> followed
+ by <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a >
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">tuple<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Expect. Parse <code class="computeroutput">a</code> followed
+ by <code class="computeroutput">b</code>. <code class="computeroutput">b</code> is expected to match when <code class="computeroutput">a</code> matches, otherwise, an <code class="computeroutput">expectation_failure</code> is thrown.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a -
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Difference. Parse <code class="computeroutput">a</code>
+ but not <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a ||
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">tuple<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Sequential Or. Parse <code class="computeroutput">a</code>
+ or <code class="computeroutput">b</code> or <code class="computeroutput">a</code> followed by <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a %
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ List. Parse <code class="computeroutput">a</code> delimited
+ <code class="computeroutput">b</code> one or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a ^
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">tuple<</code>
+ <code class="computeroutput">optional<A>,</code>
+ <code class="computeroutput">optional<B> ></code>
+ 
+ </td>
+<td>
+ 
+ Permutation. Parse <code class="computeroutput">a</code>
+ and <code class="computeroutput">b</code> in any order
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+ <div class="table">
+<a name="id718928"></a>Table 5. Predefined /Spirit.Karma/ primitive generators
+<div class="table-contents"><table class="table" summary="Predefined /Spirit.Karma/ primitive generators">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Expression
+ 
+ </th>
+<th>
+ 
+ Attribute
+ 
+ </th>
+<th>
+ 
+ Description
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ <code class="computeroutput">eol</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generates the end of line (<code class="computeroutput">\n</code>)
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">eps</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generate an empty string
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">eps(b)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ If <code class="computeroutput">b</code> is true, generate
+ an empty string
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lazy(fg)</code>
+ 
+ </td>
+<td>
+ 
+ Attribute of <code class="computeroutput">G</code> where
+ <code class="computeroutput">G</code> is the return type
+ of <code class="computeroutput">fg</code>
+ 
+ </td>
+<td>
+ 
+ Invoke <code class="computeroutput">fg</code> at generation
+ time, returning a generator <code class="computeroutput">g</code>
+ which is then called to generate.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">fg</code>
+ 
+ </td>
+<td>
+ 
+ see <code class="computeroutput">lazy(fg)</code>
+ above
+ 
+ </td>
+<td>
+ 
+ Equivalent to <code class="computeroutput">lazy[fp]</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">g[fa]</code>
+ 
+ </td>
+<td>
+ 
+ Attribute of <code class="computeroutput">g</code>
+ 
+ </td>
+<td>
+ 
+ Call semantic action <code class="computeroutput">fa</code>
+ (before executing <code class="computeroutput">g</code>).
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">byte_</code>
+ 
+ </td>
+<td>
+ 
+ 8 bits native endian
+ 
+ </td>
+<td>
+ 
+ Generates an 8 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">word</code>
+ 
+ </td>
+<td>
+ 
+ 16 bits native endian
+ 
+ </td>
+<td>
+ 
+ Generates a 16 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">big_word</code>
+ 
+ </td>
+<td>
+ 
+ 16 bits big endian
+ 
+ </td>
+<td>
+ 
+ Generates a 16 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">little_word</code>
+ 
+ </td>
+<td>
+ 
+ 16 bits little endian
+ 
+ </td>
+<td>
+ 
+ Generates a 16 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">dword</code>
+ 
+ </td>
+<td>
+ 
+ 32 bits native endian
+ 
+ </td>
+<td>
+ 
+ Generates a 32 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">big_dword</code>
+ 
+ </td>
+<td>
+ 
+ 32 bits big endian
+ 
+ </td>
+<td>
+ 
+ Generates a 32 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">little_dword</code>
+ 
+ </td>
+<td>
+ 
+ 32 bits little endian
+ 
+ </td>
+<td>
+ 
+ Generates a 32 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">qword</code>
+ 
+ </td>
+<td>
+ 
+ 64 bits native endian
+ 
+ </td>
+<td>
+ 
+ Generates a 64 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">big_qword</code>
+ 
+ </td>
+<td>
+ 
+ 64 bits big endian
+ 
+ </td>
+<td>
+ 
+ Generates a 64 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">little_qword</code>
+ 
+ </td>
+<td>
+ 
+ 64 bits little endian
+ 
+ </td>
+<td>
+ 
+ Generates a 64 bit binary
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_(ch)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">char_("c")</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Ch</code>
+ 
+ </td>
+<td>
+ 
+ Generates a single char string literal, <code class="computeroutput">c</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ch</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">str</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lit(ch)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">ch</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lit(str)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">string(str)</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Str</code>
+ 
+ </td>
+<td>
+ 
+ Generates <code class="computeroutput">str</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">lower[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> as lower
+ case
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">upper[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> as upper
+ case
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">left_align[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> left aligned
+ in column of width BOOST_KARMA_DEFAULT_FIELD_LENGTH
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">left_align(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> left aligned
+ in column of width <code class="computeroutput">N</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">left_align(N, g)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> left aligned
+ in column of width <code class="computeroutput">N</code>
+ while using <code class="computeroutput">g</code> to generate
+ the necesssary padding
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">right_align[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> right aligned
+ in column of width BOOST_KARMA_DEFAULT_FIELD_LENGTH
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">right_align(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> right aligned
+ in column of width <code class="computeroutput">N</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">right_align(N, g)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> right aligned
+ in column of width <code class="computeroutput">N</code>
+ while using <code class="computeroutput">g</code> to generate
+ the necesssary padding
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">center[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> centered
+ in column of width BOOST_KARMA_DEFAULT_FIELD_LENGTH
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">center(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> centered
+ in column of width <code class="computeroutput">N</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">center(N, g)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> centered
+ in column of width <code class="computeroutput">N</code>
+ while using <code class="computeroutput">g</code> to generate
+ the necesssary padding
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">maxwidth[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> truncated
+ to column of width BOOST_KARMA_DEFAULT_FIELD_MAXWIDTH
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">maxwidth(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Generate <code class="computeroutput">a</code> truncated
+ to column of width <code class="computeroutput">N</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> zero or more
+ times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N, M)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> to <code class="computeroutput">M</code>
+ times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">repeat(N, inf)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Repeat <code class="computeroutput">a</code> <code class="computeroutput">N</code> or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">verbatim[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Disable delimited generation for <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">delimit[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Reestablish the delimiter that got inhibited by verbatim
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">delimit(g)[a]</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">A</code>
+ 
+ </td>
+<td>
+ 
+ Use <code class="computeroutput">g</code> as a skipper
+ for generating <code class="computeroutput">a</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">float_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">float</code>
+ 
+ </td>
+<td>
+ 
+ Generate a floating point number from a <code class="computeroutput">float</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">double_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">double</code>
+ 
+ </td>
+<td>
+ 
+ Generate a floating point number from a <code class="computeroutput">double</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_double</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long double</code>
+ 
+ </td>
+<td>
+ 
+ Generate a floating point number from a <code class="computeroutput">long
+ double</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">bin</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Generate a binary integer from an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">oct</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Generate an octal integer from an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">hex</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned</code>
+ 
+ </td>
+<td>
+ 
+ Generate a hexadecimal integer from an <code class="computeroutput">unsigned</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ushort_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned short</code>
+ 
+ </td>
+<td>
+ 
+ Generate an unsigned short integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ulong_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned long</code>
+ 
+ </td>
+<td>
+ 
+ Generate an unsigned long integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">uint_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned int</code>
+ 
+ </td>
+<td>
+ 
+ Generate an unsigned int
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">ulong_long</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">unsigned long
+ long</code>
+ 
+ </td>
+<td>
+ 
+ Generate an unsigned long long
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">short_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">short</code>
+ 
+ </td>
+<td>
+ 
+ Generate a short integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long</code>
+ 
+ </td>
+<td>
+ 
+ Generate a long integer
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">int_</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">int</code>
+ 
+ </td>
+<td>
+ 
+ Generate an int
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">long_long</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">long long</code>
+ 
+ </td>
+<td>
+ 
+ Generate a long long
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">!a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ Not predicate. Ensure that <code class="computeroutput">a</code>
+ does not succeed generating but don't create any output
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">&a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">Unused</code>
+ 
+ </td>
+<td>
+ 
+ And predicate. Ensure that <code class="computeroutput">a</code>
+ does succeed generating but don't create any output
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">-a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">optional<A></code>
+ 
+ </td>
+<td>
+ 
+ Optional. Generate <code class="computeroutput">a</code>
+ zero or one time
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">*a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Kleene. Generate <code class="computeroutput">a</code>
+ zero or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">+a</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ Plus. Generate <code class="computeroutput">a</code> one
+ or more times
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a |
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">variant<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Alternative. Generate <code class="computeroutput">a</code>
+ or <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a <<
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">tuple<A, B></code>
+ 
+ </td>
+<td>
+ 
+ Sequence. Generate <code class="computeroutput">a</code>
+ followed by <code class="computeroutput">b</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">a %
+ b</code>
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">vector<A></code>
+ 
+ </td>
+<td>
+ 
+ List. Generate <code class="computeroutput">a</code> delimited
+ <code class="computeroutput">b</code> one or more times
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+ <a name="spirit.qi_and_karma.quick_reference.compound_attribute_rules"></a><h5>
+<a name="id723636"></a>
+ <a class="link" href="quick_reference.html#spirit.qi_and_karma.quick_reference.compound_attribute_rules">Compound
+ Attribute Rules</a>
+ </h5>
+
+ The notation will be for instance:
+ 
+<pre class="programlisting">a: A, b: B --> (a >> b): tuple<A, B>
+</pre>
+
+ which reads as: given, <code class="computeroutput">a</code>
+ and <code class="computeroutput">b</code> are parsers/generators,
+ and <code class="computeroutput">A</code> is the type of the
+ attribute of <code class="computeroutput">a</code>, and <code class="computeroutput">B</code> is the type of the attribute of <code class="computeroutput">b</code>, then the type of the attribute of <code class="computeroutput">a >> b</code> will be <code class="computeroutput">tuple<A,
+ B></code>.
+ 
+<div class="table">
+<a name="id723826"></a>Table 6. /Spirit.Qi/ compound parser attribute types
+<div class="table-contents"><table class="table" summary="/Spirit.Qi/ compound parser attribute types">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Expression
+ 
+ </th>
+<th>
+ 
+ Attribute
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ sequence (<code class="computeroutput">>></code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ >> b): tuple<A, B></code> <code class="computeroutput">a: A, b: Unused
+ --> (a >>
+ b):
+ A</code> <code class="computeroutput">a: Unused, b: B --> (a >>
+ b):
+ B</code> <code class="computeroutput">a: Unused, b: Unused
+ --> (a >>
+ b):
+ Unused</code> <code class="computeroutput">a: A, b: A -->
+ (a
+ >> b): vector<A></code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ expect (<code class="computeroutput">></code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ > b): tuple<A, B></code> <code class="computeroutput">a: A, b: Unused
+ --> (a >
+ b):
+ A</code> <code class="computeroutput">a: Unused, b: B --> (a >
+ b):
+ B</code> <code class="computeroutput">a: Unused, b: Unused
+ --> (a >
+ b):
+ Unused</code> <code class="computeroutput">a: A, b: A -->
+ (a
+ > b): vector<A></code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ alternative (<code class="computeroutput">|</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ | b): variant<A, B></code> <code class="computeroutput">a: A, b: Unused
+ --> (a | b): variant<Unused,
+ A></code> 
+ <code class="computeroutput">a:
+ Unused,
+ b:
+ B -->
+ (a
+ | b): variant<Unused, B></code> <code class="computeroutput">a: Unused, b: Unused
+ --> (a | b): Unused</code> <code class="computeroutput">a: A, b: A --> (a | b): A</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ difference (<code class="computeroutput">-</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ - b): A</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ kleene (<code class="computeroutput">*</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ *a: vector<A></code> <code class="computeroutput">a: Unused
+ --> a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ plus (<code class="computeroutput">+</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ +a: vector<A></code> <code class="computeroutput">a: Unused
+ --> a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ list (<code class="computeroutput">%</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ % b): vector<A></code> <code class="computeroutput">a: Unused, b: B --> (a % b): Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ repetition
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ repeat(...,...)[a]: vector<A></code> 
+ <code class="computeroutput">a:
+ Unused -->
+ repeat(...,...)[a]: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ sequential or (<code class="computeroutput">||</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ || b): tuple<optional<A>, optional<B> ></code> 
+ <code class="computeroutput">a:
+ A,
+ b:
+ Unused -->
+ (a
+ || b): optional<A></code> <code class="computeroutput">a: Unused, b: B --> (a || b): optional<B></code> 
+ <code class="computeroutput">a:
+ Unused,
+ b:
+ Unused -->
+ (a
+ || b): Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ optional (<code class="computeroutput">-</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ -a: optional<A></code> <code class="computeroutput">a: Unused
+ --> -a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ and predicate (<code class="computeroutput">&</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ &a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ not predicate (<code class="computeroutput">!</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ !a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ permutation (<code class="computeroutput">^</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ ^ b): tuple<optional<A>, optional<B> ></code> 
+ <code class="computeroutput">a:
+ A,
+ b:
+ Unused -->
+ (a
+ ^ b): optional<A></code> <code class="computeroutput">a: Unused, b: B --> (a ^ b): optional<B></code> 
+ <code class="computeroutput">a:
+ Unused,
+ b:
+ Unused -->
+ (a
+ ^ b): Unused</code>
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+ <div class="table">
+<a name="id726513"></a>Table 7. /Spirit.Karma/ compound generator attribute
+ types
+<div class="table-contents"><table class="table" summary="/Spirit.Karma/ compound generator attribute
+ types">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Expression
+ 
+ </th>
+<th>
+ 
+ Attribute
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ sequence (<code class="computeroutput"><<</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ << b): tuple<A, B></code> <code class="computeroutput">a: A, b: Unused
+ --> (a <<
+ b):
+ A</code> <code class="computeroutput">a: Unused, b: B --> (a <<
+ b):
+ B</code> <code class="computeroutput">a: Unused, b: Unused
+ --> (a <<
+ b):
+ Unused</code> <code class="computeroutput">a: A, b: A -->
+ (a
+ << b): vector<A></code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ alternative (<code class="computeroutput">|</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ | b): variant<A, B></code> <code class="computeroutput">a: A, b: Unused
+ --> (a | b): variant<Unused,
+ A></code> 
+ <code class="computeroutput">a:
+ Unused,
+ b:
+ B -->
+ (a
+ | b): variant<Unused, B></code> <code class="computeroutput">a: Unused, b: Unused
+ --> (a | b): Unused</code> <code class="computeroutput">a: A, b: A --> (a | b): A</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ kleene (<code class="computeroutput">*</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ *a: vector<A></code> <code class="computeroutput">a: Unused
+ --> a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ plus (<code class="computeroutput">+</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ +a: vector<A></code> <code class="computeroutput">a: Unused
+ --> a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ list (<code class="computeroutput">%</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A,
+ b:
+ B -->
+ (a
+ % b): vector<A></code> <code class="computeroutput">a: Unused, b: B --> (a % b): Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ repetition
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ repeat(...,...)[a]: vector<A></code> 
+ <code class="computeroutput">a:
+ Unused -->
+ repeat(...,...)[a]: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ optional (<code class="computeroutput">-</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ -a: optional<A></code> <code class="computeroutput">a: Unused
+ --> -a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ and predicate (<code class="computeroutput">&</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ &a: Unused</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ not predicate (<code class="computeroutput">!</code>)
+ 
+ </td>
+<td>
+ 
+ <code class="computeroutput">a:
+ A -->
+ !a: Unused</code>
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
+</div>
+ <a name="spirit.qi_and_karma.quick_reference.lazy_arguments"></a><h5>
+<a name="id729694"></a>
+ <a class="link" href="quick_reference.html#spirit.qi_and_karma.quick_reference.lazy_arguments">Lazy Arguments</a>
+ </h5>
+
+ For all expressions of the form:
+ 
+<pre class="programlisting">p(a1, a2,... aN)
+</pre>
+
+ where <code class="computeroutput">p</code> is a parser, each
+ of the arguments (a1...aN) can either be an immediate value, or a lazy function
+ with signature:
+ 
+<pre class="programlisting">T(Unused, Context)
+</pre>
+
+ where <code class="computeroutput">T</code>, the function's return
+ value, is compatible with the argument type expected. For example, this is
+ a valid expression:
+ 
+<pre class="programlisting">eps(false) // this will always fail
+</pre>
+
+ And so is this:
+ 
+<pre class="programlisting">bool flag = true;
+eps(phoenix::var(flag)) // success or fail depending on the value
+ // of flag at parse time
+</pre>
+
+ since <code class="computeroutput">phoenix::ref(f)</code> is a function that returns a <code class="computeroutput">bool</code>.
+ 
+<a name="spirit.qi_and_karma.quick_reference.non_terminals"></a><h5>
+<a name="id729923"></a>
+ <a class="link" href="quick_reference.html#spirit.qi_and_karma.quick_reference.non_terminals">Non-terminals</a>
+ </h5>
+<div class="variablelist" title="Notation">
+Notation
+<dl>
+<dt><code class="computeroutput">RT</code></dt>
+<dd>
+ Synthesized attribute. The rule or grammar's return type.
+ </dd>
+<dt><code class="computeroutput">Arg1</code>,
+ <code class="computeroutput">Arg2</code>, <code class="computeroutput">ArgN</code></dt>
+<dd>
+ Inherited attributes. Zero or more or arguments.
+ </dd>
+<dt><code class="computeroutput">L1</code>,
+ <code class="computeroutput">L2</code>, <code class="computeroutput">LN</code></dt>
+<dd>
+ Zero or more local variables.
+ </dd>
+<dt><code class="computeroutput">r, r2</code></dt>
+<dd>
+ Rules
+ </dd>
+<dt><code class="computeroutput">g</code></dt>
+<dd>
+ A grammar
+ </dd>
+<dt><code class="computeroutput">p</code></dt>
+<dd>
+ A parser expression
+ </dd>
+</dl>
+</div>
+<div class="variablelist" title="Terminology">
+Terminology
+<dl>
+<dt>Signature</dt>
+<dd>
+ <code class="computeroutput">RT(Arg1, Arg2 ...
+ ,ArgN)</code>. The signature specifies the synthesized
+ (return value) and inherited (arguments) attributes.
+ </dd>
+<dt>Locals</dt>
+<dd>
+ <code class="computeroutput">locals<L1, L2 ..., LN></code>.
+ The local variables.
+ </dd>
+<dt>Skipper</dt>
+<dd>
+ The skip-parser type
+ </dd>
+</dl>
+</div>
+<div class="variablelist" title="Template Arguments">
+Template Arguments
+<dl>
+<dt><code class="computeroutput">Iterator</code></dt>
+<dd>
+ The iterator type you will use for parsing.
+ </dd>
+<dt><code class="computeroutput">A1</code>,
+ <code class="computeroutput">A2</code>, <code class="computeroutput">A3</code></dt>
+<dd>
+ Can be one of 1)Signature 2)Locals 3)Skipper.
+ </dd>
+</dl>
+</div>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Expression
+ 
+ </th>
+<th>
+ 
+ Description
+ 
+ </th>
+</tr></thead>
+<tbody>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rule<Iterator,
+ A1,
+ A2,
+ A3>
+ r(name);</code>
+ 
+ </td>
+<td>
+ 
+ Rule declaration. <code class="computeroutput">Iterator</code>
+ is required. <code class="computeroutput">A1,
+ A2,
+ A3</code> are optional and can
+ be specified in any order. <code class="computeroutput">name</code>
+ is an optional string that gives the nonterminal its name, useful
+ for debugging and error handling.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">rule<Iterator,
+ A1,
+ A2,
+ A3>
+ r(r2);</code>
+ 
+ </td>
+<td>
+ 
+ Copy construct rule <code class="computeroutput">r</code>
+ from rule <code class="computeroutput">r2</code>. <code class="computeroutput">boost::shared_ptr</code> semantics.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r =
+ r2;</code>
+ 
+ </td>
+<td>
+ 
+ Assign rule <code class="computeroutput">r2</code> to
+ <code class="computeroutput">r</code>. <code class="computeroutput">boost::shared_ptr</code> semantics.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r.alias()</code>
+ 
+ </td>
+<td>
+ 
+ return an alias of <code class="computeroutput">r</code>.
+ The alias is a parser that holds a reference to <code class="computeroutput">r</code>.
+ Reference semantics.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r.copy()</code>
+ 
+ </td>
+<td>
+ 
+ Get a copy of <code class="computeroutput">r</code>.
+ <code class="computeroutput">boost::shared_ptr</code> semantics.
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r.name(name)</code>
+ 
+ </td>
+<td>
+ 
+ Naming a rule
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ debug(r)
+ 
+ </td>
+<td>
+ 
+ Debug rule <code class="computeroutput">r</code>
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r =
+ p;</code>
+ 
+ </td>
+<td>
+ 
+ Rule definition
+ 
+ </td>
+</tr>
+<tr>
+<td>
+ 
+ <code class="computeroutput">r %=
+ p;</code>
+ 
+ </td>
+<td>
+ 
+ Auto-rule definition. The attribute of <code class="computeroutput">p</code>
+ should be compatible with the synthesized attribute of <code class="computeroutput">r</code>. When <code class="computeroutput">p</code>
+ is successful, its attribute is automatically propagated to <code class="computeroutput">r</code>'s synthesized attribute.
+ 
+ </td>
+</tr>
+</tbody>
+</table></div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Reference</title>
<link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../index.html" title="Spirit 2.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.0">
+<link rel="home" href="../../index.html" title="Spirit 2.1">
<link rel="up" href="../qi_and_karma.html" title="Qi and Karma">
<link rel="prev" href="quick_reference.html" title="Quick Reference">
<link rel="next" href="reference/char.html" title="Char">
@@ -22,9 +22,10 @@
<div class="spirit-nav">
<a accesskey="p" href="quick_reference.html"><img src="../../../../../../doc/html/images/prev.png" alt="Prev"></a><a accesskey="u" href="../qi_and_karma.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/char.html"><img src="../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="Reference">
<div class="titlepage"><div><div><h3 class="title">
-<a name="spirit.qi_and_karma.reference"></a>Reference</h3></div></div></div>
+<a name="spirit.qi_and_karma.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
+</h3></div></div></div>
<div class="toc"><dl>
<dt>Concepts</dt>
<dt>Char</dt>
@@ -39,35 +40,37 @@
<dt>Auxiliary</dt>
<dt>Debug</dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Concepts">
<div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.concepts"></a>Concepts</h4></div></div></div>
+<a name="spirit.qi_and_karma.reference.concepts"></a><a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts" title="Concepts">Concepts</a>
+</h4></div></div></div>
<div class="toc"><dl>
<dt>Parser</dt>
<dt>Generator</dt>
</dl></div>
-<div class="section" lang="en">
+<div class="section" title="Parser">
<div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.qi_and_karma.reference.concepts.parser"></a>Parser</h5></div></div></div>
+<a name="spirit.qi_and_karma.reference.concepts.parser"></a><a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser" title="Parser">Parser</a>
+</h5></div></div></div>
<a name="spirit.qi_and_karma.reference.concepts.parser.description"></a><h6>
-<a name="id487325"></a>
- Description
+<a name="id731442"></a>
+ <a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser.description">Description</a>
 </h6>

 Description of Parser concept
 
-<div class="variablelist">
+<div class="variablelist" title="Notation">
Notation
<dl>
-<dt><tt class="computeroutput">p</tt></dt>
+<dt><code class="computeroutput">p</code></dt>
<dd>
 A Parser
 </dd>
</dl>
</div>
<a name="spirit.qi_and_karma.reference.concepts.parser.valid_expressions"></a><h6>
-<a name="id487386"></a>
- <a href="reference.html#spirit.qi_and_karma.reference.concepts.parser.valid_expressions">Valid
+<a name="id731489"></a>
+ <a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser.valid_expressions">Valid
 Expressions</a>
 </h6>

@@ -105,12 +108,12 @@
<tbody><tr>
<td>
 
- <tt class="computeroutput">xxx</tt>
+ <code class="computeroutput">xxx</code>
 
 </td>
<td>
 
- Semantics of <tt class="computeroutput">xxx</tt>
+ Semantics of <code class="computeroutput">xxx</code>
 
 </td>
<td>
@@ -126,8 +129,8 @@
</tr></tbody>
</table></div>
<a name="spirit.qi_and_karma.reference.concepts.parser.type_requirements"></a><h6>
-<a name="id487523"></a>
- <a href="reference.html#spirit.qi_and_karma.reference.concepts.parser.type_requirements">Type
+<a name="id731599"></a>
+ <a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser.type_requirements">Type
 Requirements</a>
 </h6>
<div class="informaltable"><table class="table">
@@ -150,39 +153,40 @@
<tbody><tr>
<td>
 
- <tt class="computeroutput">xxx</tt>
+ <code class="computeroutput">xxx</code>
 
 </td>
<td>
 
- Requirements for <tt class="computeroutput">xxx</tt>
+ Requirements for <code class="computeroutput">xxx</code>
 
 </td>
</tr></tbody>
</table></div>
<a name="spirit.qi_and_karma.reference.concepts.parser.invariants"></a><h6>
-<a name="id487627"></a>
- Invariants
+<a name="id731682"></a>
+ <a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser.invariants">Invariants</a>
 </h6>

 For any Parser xxx the following invariants always hold:
 
<a name="spirit.qi_and_karma.reference.concepts.parser.models"></a><h6>
-<a name="id487659"></a>
- Models
+<a name="id731701"></a>
+ <a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.parser.models">Models</a>
 </h6>

 Links to models of Parser concept
 
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h5 class="title">
-<a name="spirit.qi_and_karma.reference.concepts.generator"></a>Generator</h5></div></div></div></div>
+<div class="section" title="Generator"><div class="titlepage"><div><div><h5 class="title">
+<a name="spirit.qi_and_karma.reference.concepts.generator"></a><a class="link" href="reference.html#spirit.qi_and_karma.reference.concepts.generator" title="Generator">Generator</a>
+</h5></div></div></div></div>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/action.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Action</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="directive.html" title="Directive">
<link rel="next" href="nonterminal.html" title="Nonterminal">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="directive.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="nonterminal.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.action"></a>Action</h4></div></div></div></div>
+<div class="section" title="Action"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.action"></a><a class="link" href="action.html" title="Action">Action</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/auxiliary.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Auxiliary</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="stream.html" title="Stream">
<link rel="next" href="debug.html" title="Debug">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="stream.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="debug.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.auxiliary"></a>Auxiliary</h4></div></div></div></div>
+<div class="section" title="Auxiliary"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.auxiliary"></a><a class="link" href="auxiliary.html" title="Auxiliary">Auxiliary</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/binary.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Binary</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="numeric.html" title="Numeric">
<link rel="next" href="directive.html" title="Directive">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="numeric.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="directive.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.binary"></a>Binary</h4></div></div></div></div>
+<div class="section" title="Binary"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.binary"></a><a class="link" href="binary.html" title="Binary">Binary</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/char.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Char</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="../reference.html" title="Reference">
<link rel="next" href="string.html" title="String">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="../reference.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" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.char"></a>Char</h4></div></div></div></div>
+<div class="section" title="Char"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.char"></a><a class="link" href="char.html" title="Char">Char</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/debug.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,11 +3,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Debug</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="auxiliary.html" title="Auxiliary">
-<link rel="next" href="../../lex.html" title=" Spirit.Lex">
+<link rel="next" href="../../lex.html" title="Spirit.Lex">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="auxiliary.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="../../lex.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.debug"></a>Debug</h4></div></div></div></div>
+<div class="section" title="Debug"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.debug"></a><a class="link" href="debug.html" title="Debug">Debug</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/directive.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Directive</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="binary.html" title="Binary">
<link rel="next" href="action.html" title="Action">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="binary.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="action.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.directive"></a>Directive</h4></div></div></div></div>
+<div class="section" title="Directive"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.directive"></a><a class="link" href="directive.html" title="Directive">Directive</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/nonterminal.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Nonterminal</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="action.html" title="Action">
<link rel="next" href="operators.html" title="Operators">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="action.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="operators.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.nonterminal"></a>Nonterminal</h4></div></div></div></div>
+<div class="section" title="Nonterminal"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.nonterminal"></a><a class="link" href="nonterminal.html" title="Nonterminal">Nonterminal</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/numeric.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Numeric</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="string.html" title="String">
<link rel="next" href="binary.html" title="Binary">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="string.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="binary.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.numeric"></a>Numeric</h4></div></div></div></div>
+<div class="section" title="Numeric"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.numeric"></a><a class="link" href="numeric.html" title="Numeric">Numeric</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/operators.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Operators</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="nonterminal.html" title="Nonterminal">
<link rel="next" href="stream.html" title="Stream">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="nonterminal.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="stream.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.operators"></a>Operators</h4></div></div></div></div>
+<div class="section" title="Operators"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.operators"></a><a class="link" href="operators.html" title="Operators">Operators</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/stream.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Stream</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="operators.html" title="Operators">
<link rel="next" href="auxiliary.html" title="Auxiliary">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="operators.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="auxiliary.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.stream"></a>Stream</h4></div></div></div></div>
+<div class="section" title="Stream"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.stream"></a><a class="link" href="stream.html" title="Stream">Stream</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html (original)
+++ trunk/libs/spirit/doc/html/spirit/qi_and_karma/reference/string.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,8 +3,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>String</title>
<link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../../../index.html" title="Spirit 2.0">
+<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="char.html" title="Char">
<link rel="next" href="numeric.html" title="Numeric">
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="char.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="numeric.html"><img src="../../../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h4 class="title">
-<a name="spirit.qi_and_karma.reference.string"></a>String</h4></div></div></div></div>
+<div class="section" title="String"><div class="titlepage"><div><div><h4 class="title">
+<a name="spirit.qi_and_karma.reference.string"></a><a class="link" href="string.html" title="String">String</a>
+</h4></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/rationale.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/rationale.html (original)
+++ trunk/libs/spirit/doc/html/spirit/rationale.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Rationale</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="notes/techniques.html" title="Techniques">
<link rel="next" href="acknowledgments.html" title="Acknowledgments">
</head>
@@ -22,12 +22,13 @@
<div class="spirit-nav">
<a accesskey="p" href="notes/techniques.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="acknowledgments.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.rationale"></a>Rationale</h2></div></div></div></div>
+<div class="section" title="Rationale"><div class="titlepage"><div><div><h2 class="title" style="clear: both">
+<a name="spirit.rationale"></a><a class="link" href="rationale.html" title="Rationale">Rationale</a>
+</h2></div></div></div></div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/html/spirit/references.html
==============================================================================
--- trunk/libs/spirit/doc/html/spirit/references.html (original)
+++ trunk/libs/spirit/doc/html/spirit/references.html 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,9 +3,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>References</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
+<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="acknowledgments.html" title="Acknowledgments">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -21,9 +21,10 @@
<div class="spirit-nav">
<a accesskey="p" href="acknowledgments.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>
</div>
-<div class="section" lang="en">
+<div class="section" title="References">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.references"></a>References</h2></div></div></div>
+<a name="spirit.references"></a><a class="link" href="references.html" title="References">References</a>
+</h2></div></div></div>
<div class="informaltable"><table class="table">
<colgroup>
<col>
@@ -475,8 +476,8 @@
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

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-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -3,10 +3,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>What's New</title>
<link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.66.1">
-<link rel="start" href="../index.html" title="Spirit 2.0">
-<link rel="up" href="../index.html" title="Spirit 2.0">
-<link rel="prev" href="../index.html" title="Spirit 2.0">
+<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="../index.html" title="Spirit 2.1">
<link rel="next" href="introduction.html" title="Introduction">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -22,13 +22,14 @@
<div class="spirit-nav">
<a accesskey="p" href="../index.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="introduction.html"><img src="../../../../../doc/html/images/next.png" alt="Next"></a>
</div>
-<div class="section" lang="en">
+<div class="section" title="What's New">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
-<a name="spirit.what_s_new"></a>What's New</h2></div></div></div>
-<a name="spirit.what_s_new.spirit_classic"></a><h3>
-<a name="id457100"></a>
- Spirit Classic
- </h3>
+<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="id684301"></a>
+ <a class="link" href="what_s_new.html#spirit.what_s_new.spirit_classic">Spirit Classic</a>
+ </h4>

 The Spirit V1.8.x code base has been integrated with Spirit V2. It is now called
 Spirit.Classic. Even if the directory structure has changed
@@ -52,11 +53,11 @@
</pre>

 To avoid namespace conflicts with the new Spirit V2 library we moved Spirit
- Classic into the namespace <tt class="computeroutput">boost::spirit::classic</tt>.
- All references to the former namespace <tt class="computeroutput">boost::spirit</tt>
+ Classic into the namespace <code class="computeroutput">boost::spirit::classic</code>.
+ All references to the former namespace <code class="computeroutput">boost::spirit</code>
 need to be adjusted as soon as the header names are corrected as described
- above. As an alternative you can define the preprocessor constant <tt class="computeroutput">BOOST_SPIRIT_USE_OLD_NAMESPACE</tt>, which will
- force the Spirit Classic code to be in the namespace <tt class="computeroutput">boost::spirit</tt>
+ above. As an alternative you can define the preprocessor constant <code class="computeroutput">BOOST_SPIRIT_USE_OLD_NAMESPACE</code>, which will
+ force the Spirit Classic code to be in the namespace <code class="computeroutput">boost::spirit</code>
 as before. This is not recommended, though, as it may result in naming clashes.
 

@@ -64,11 +65,151 @@
 deprecated include files are being used. This ensures full backwards compatibility
 for existing applications.
 
+<a name="spirit.what_s_new.spirit_v2_1"></a><h4>
+<a name="id684492"></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="id684505"></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 Spirit.Qi and Spirit.Karma
+ from V2.0 to 2.x</a>
+ </h4>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+Spirit is now based on
+ the newest version of Boost.Proto
+</li>
+<li class="listitem">
+ qi::phrase_parse, qi::phrase_format now post-skip by default.
+ </li>
+<li class="listitem">
+ karma::generate_delimited and karma::format_delimited now don't do pre- delimiting
+ by default.
+ </li>
+<li class="listitem">
+ Changed parameter sequence of qi::phrase_parse, qi::phrase_match, karma::generate_delimited,
+ and match_delimited. The attribute is now the last parameter.
+ </li>
+<li class="listitem">
+ Added new overloads of those functions allowing to explicitely specify the
+ post-skipping and pre-delimiting behavior.
+ </li>
+<li class="listitem">
+ multi attribute API functions
+ </li>
+<li class="listitem">
+ removed grammar_def<>
+ </li>
+<li class="listitem">
+ removed functions make_parser() and makegenerator()
+ * removed qi::none and karma::none * sequences and lists now accept a standard
+ container as its attribute * The string placeholder terminal now can take
+ other strings as its parameter (i.e. std::string) * all terminals taking
+ literals now accept a (lazy) function object as well * All placeholders for
+ terminals and directives (such as int, double,
+ verbatim, etc.) were previously defined in the namespace boost::spirit only.
+ Now these are additionally imported into the namespaces spirit::qi, spirit::karma,
+ and spirit::lex (if they are supported by the corresponding sub-library.
+ * The terminal placeholders char and string are not defined in
+ the namespace boost::spirit anymore as they have been moved to the character
+ set namespaces, allowing to do proper character set handling based on the
+ used namespace (as spirit::ascii, etc.)
+ </li>
+<li class="listitem">
+ The uint, ushort, ulong, and byte terminal placeholders have been renamed
+ to uint, ushort, ulong,
+ and byte.
+ </li>
+<li class="listitem">
+ qi: skip[] now re-enables outer skipper if used inside lexeme[]
+ </li>
+<li class="listitem">
+ karma: maxwidth[] directive
+ </li>
+<li class="listitem">
+ karma: delimit[] now re-enables outer delimiter if used inside verbatim[]
+ </li>
+<li class="listitem">
+ karma: added and-predicate (operator&()) and not-predicate (operator!())
+ </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="id684607"></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 Spirit.Lex from V2.0 to 2.x</a>
+ </h4>
+
+ Here is a list of changes in Spirit.Lex since version
+ 2.0. Spirit.Lex 2.x is a complete rewrite of the original
+ Spirit.Lex distributed. As all parts of the Spirit
+ library it is usable either standalone or in conjunction with the other parts.
+ Spirit.Lex now uses the infrastructure provided by Spirit version 2.1.
+ 
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
+ The lex::lexer_def class has been renamed to lex::lexer, while the original
+ class lex::lexer does not exist anymore. This simplifies the creation of
+ lexers.
+ </li>
+<li class="listitem">
+ The lex::lexer class does not have the function <code class="computeroutput">def(Self&
+ self)</code>
+ anymore, token definitions can be added to the lexer at any time, usually
+ in the constructor of the user defined lexer class:
+ </li>
+</ul></div>
+<pre class="programlisting">template <typename Lexer>
+struct example_tokens : lex::lexer<Lexer>
+{
+ example_lexer()
+ {
+ // your token definitions here
+ this->self = ...
+ }
+};
+</pre>
+
+ template <typename Lexer> struct example_tokens : lex::lexer<Lexer>
+ { example_lexer() { / your token definitions here this->self =
+ ... } }; * The new lexer class now can be directly used, their is no need anymore
+ to wrap it using the `make_lexer()` template as before. Therefor the function
+ `make_lexer()` has been removed. * The `lex::tokenize_and_parse()` and `lex::tokenize_and_phrase_parse()`
+ functions have been changed to match the parameter sequence as implemented
+ by the `qi::parse()` and `qi::phrase_parse()` functions. Both take a possibly
+ arbitrary number of attribute arguments as its last parameters (well, the number
+ of attributes is limited by the macro `SPIRIT_ARGUMENTS_LIMIT`, which defaults
+ to `PHOENIX_LIMIT`). * The `lex::lexertl_lexer`, `lex::lexertl_token_set`,
+ and `lex::lexertl_token` classes has been moved to the `lex::lexertl` namespace
+ and the names have been changed to `lex::lexertl::lexer`, `lex::lexertl::token_set`,
+ `lex::lexertl::token` (the same applies to the `lex::lexert_actor_lexer`, and
+ the `static_lexertl_*` family of types). * The __lexer__ library has been updated
+ to use the newest version of Ben Hansons __lexertl__ lexer construction library
+ (Boost review pending). * The `lex::lexer<Lexer>` template constructor
+ now takes an optional parameter specifying the `match_flags` to be used for
+ table generation. Currently, there are the following flags available: ''' match_flags::match_default,
+ / no flags match_flags::match_not_dot_newline, / the regex
+ '.' doesn't match newlines match_flags::match_icase / all matching
+ operations are case insensitive If no parameter is passed to the constructor, `match_flags::match_default` is
+ used, i.e. the `.` matches newlines and matching is case sensitive.
+* Now the `char_()` and `string()` placeholders can be used for token
+ definitions as a replacement for `token_def`, although it is still
+ possible to use the latter one.
+
+[endsect]
+
+
+'''
+ If no parameter is passed to the constructor, <code class="computeroutput">match_flags::match_default</code> is
+ used, i.e. the <code class="computeroutput">.</code> matches newlines and matching is case sensitive.
+* Now the <code class="computeroutput">char_()</code> and <code class="computeroutput">string()</code> placeholders can be used for token
+ definitions as a replacement for <code class="computeroutput">token_def</code>, although it is still
+ possible to use the latter one.
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
<td align="left"></td>
-<td align="right"><div class="copyright-footer">Copyright © 2001-2008 Joel de Guzman,
- Hartmut Kaiser
+<td align="right"><div class="copyright-footer">Copyright © 2001-2009 Joel
+ de Guzman, 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)

Modified: trunk/libs/spirit/doc/lex/tokenizing.qbk
==============================================================================
--- trunk/libs/spirit/doc/lex/tokenizing.qbk (original)
+++ trunk/libs/spirit/doc/lex/tokenizing.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,5 +1,5 @@
[/==============================================================================
- Copyright (C) 2001-2008 Joel de Guzman
+ Copyright (C) 2001-2009 Joel de Guzman
Copyright (C) 2001-2009 Hartmut Kaiser

Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -8,8 +8,8 @@

[section:lexer_tokenizing Tokenizing Input Data]

-[heading The tokenize() function]
+[heading:tokenize_function The tokenize() function]

-[heading The generate_static() function]
+[heading:generate_static_function The generate_static() function]

[endsect]

Modified: trunk/libs/spirit/doc/qi_and_karma/error_handling.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi_and_karma/error_handling.qbk (original)
+++ trunk/libs/spirit/doc/qi_and_karma/error_handling.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -15,11 +15,11 @@

[@../../example/qi/mini_xml1.cpp] and here: [@../../example/qi/mini_xml2.cpp]

-[import ../../example/qi/mini_xml3.cpp]
+[/ import ../example/qi/mini_xml3.cpp /]

Here's the grammar:

-[tutorial_xml3_grammar]
+[/ tutorial_xml3_grammar /]

What's new?

Modified: trunk/libs/spirit/doc/qi_and_karma/quick_reference.qbk
==============================================================================
--- trunk/libs/spirit/doc/qi_and_karma/quick_reference.qbk (original)
+++ trunk/libs/spirit/doc/qi_and_karma/quick_reference.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -9,26 +9,26 @@
[section Quick Reference]

[variablelist Notation
- [[`P`] Parser type]]
- [[`p, a, b, c`] Parser objects]]
- [[`A, B, C`] Attribute types of parsers A, B and C]]
- [[`I`] The iterator type used for parsing]]
- [[`Unused`] An `unused_type`]]
- [[`Context`] The enclosing rule's `Context` type]]
- [[`Attr`] An attribute type]]
- [[`b`] A boolean expression]]
- [[`fp`] A (lazy parser) function with signature `P(Unused, Context)`]]
- [[`fa`] A (semantic action) function with signature `void(Attr, Context, bool&)`.
+ [[`P`] [Parser type]]
+ [[`p, a, b, c`] [Parser objects]]
+ [[`A, B, C`] [Attribute types of parsers A, B and C]]
+ [[`I`] [The iterator type used for parsing]]
+ [[`Unused`] [An `unused_type`]]
+ [[`Context`] [The enclosing rule's `Context` type]]
+ [[`Attr`] [An attribute type]]
+ [[`b`] [A boolean expression]]
+ [[`fp`] [A (lazy parser) function with signature `P(Unused, Context)`]]
+ [[`fa`] [A (semantic action) function with signature `void(Attr, Context, bool&)`.
 The third parameter is a boolean flag that can be set to false to
 force the parse to fail.]]
- [[`first`] An iterator pointing to the start of input]]
- [[`last`] An iterator pointing to the end of input]]
- [[`Ch`] Character-class specific character type (See __char_class_types__)]]
- [[`ch`] Character-class specific character (See __char_class_types__)]]
- [[`ch2`] Character-class specific character (See __char_class_types__)]]
- [[`chset`] Character-set specifier string (example: "a-z0-9")]]
- [[`str`] Character-class specific string (See __char_class_types__)]]
- [[`Str`] Attribute of `str`: `std::basic_string<T>` where `T` is the underlying character type of `str`]]
+ [[`first`] [An iterator pointing to the start of input]]
+ [[`last`] [An iterator pointing to the end of input]]
+ [[`Ch`] [Character-class specific character type (See __char_class_types__)]]
+ [[`ch`] [Character-class specific character (See __char_class_types__)]]
+ [[`ch2`] [Character-class specific character (See __char_class_types__)]]
+ [[`chset`] [Character-set specifier string (example: "a-z0-9")]]
+ [[`str`] [Character-class specific string (See __char_class_types__)]]
+ [[`Str`] [Attribute of `str`: `std::basic_string<T>` where `T` is the underlying character type of `str`]]
 [[`tuple<>`] [Used as a placeholder for a fusion sequence]]
 [[`vector<>`] [Used as a placeholder for an STL container]]
 [[`variant<>`] [Used as a placeholder for a boost::variant]]
@@ -36,15 +36,15 @@
]

-[table Predefined __qi__ primitive parsers
+[table Predefined /Spirit.Qi/ primitive parsers
 [[Expression] [Attribute] [Description]]
- [[`eol`] [`Unused`] [Matches the end of line (\r or \n or \r\n)]]
+ [[`eol`] [`Unused`] [Matches the end of line (`\r` or `\n` or `\r\n`)]]
 [[`eoi`] [`Unused`] [Matches the end of input (first == last)]]
 [[`eps`] [`Unused`] [Match an empty string]]
 [[`eps(b)`] [`Unused`] [If `b` is true, match an empty string]]
 [[`lazy(fp)`] [Attribute of `P` where `P`
 is the return type of `fp`] [Invoke `fp` at parse time, returning a parser
- `p` which is then called to parse.]
+ `p` which is then called to parse.]]
 [[`fp`] [see `lazy(fp)` above] [Equivalent to `lazy[fp]`]]
 [[`p[fa]`] [Attribute of `p`] [Call semantic action, `fa` if p succeeds.]]

@@ -121,14 +121,14 @@
 ] [Permutation. Parse `a` and `b` in any order]]
]

-[table Predefined __karma__ primitive generators
+[table Predefined /Spirit.Karma/ primitive generators
 [[Expression] [Attribute] [Description]]
- [[`eol`] [`Unused`] [Generates the end of line (\n)]]
+ [[`eol`] [`Unused`] [Generates the end of line (`\n`)]]
 [[`eps`] [`Unused`] [Generate an empty string]]
 [[`eps(b)`] [`Unused`] [If `b` is true, generate an empty string]]
 [[`lazy(fg)`] [Attribute of `G` where `G`
 is the return type of `fg`] [Invoke `fg` at generation time, returning a generator
- `g` which is then called to generate.]
+ `g` which is then called to generate.]]
 [[`fg`] [see `lazy(fg)` above] [Equivalent to `lazy[fp]`]]
 [[`g[fa]`] [Attribute of `g`] [Call semantic action `fa` (before executing `g`).]]

@@ -226,67 +226,67 @@
type of the attribute of `a >> b` will be `tuple<A, B>`.

-[table __qi__ compound parser attribute types
+[table /Spirit.Qi/ compound parser attribute types
 [[Expression] [Attribute]]
- [[sequence (`>>`)] [`a: A, b: B --> (a >> b): tuple<A, B>`
- `a: A, b: Unused --> (a >> b): A`
- `a: Unused, b: B --> (a >> b): B`
- `a: Unused, b: Unused --> (a >> b): Unused`
+ [[sequence (`>>`)] [`a: A, b: B --> (a >> b): tuple<A, B>`[br]
+ `a: A, b: Unused --> (a >> b): A`[br]
+ `a: Unused, b: B --> (a >> b): B`[br]
+ `a: Unused, b: Unused --> (a >> b): Unused`[br]
 `a: A, b: A --> (a >> b): vector<A>`]]
- [[expect (`>`)] [`a: A, b: B --> (a > b): tuple<A, B>`
- `a: A, b: Unused --> (a > b): A`
- `a: Unused, b: B --> (a > b): B`
- `a: Unused, b: Unused --> (a > b): Unused`
+ [[expect (`>`)] [`a: A, b: B --> (a > b): tuple<A, B>`[br]
+ `a: A, b: Unused --> (a > b): A`[br]
+ `a: Unused, b: B --> (a > b): B`[br]
+ `a: Unused, b: Unused --> (a > b): Unused`[br]
 `a: A, b: A --> (a > b): vector<A>`]]
- [[alternative (`|`)] [`a: A, b: B --> (a | b): variant<A, B>`
- `a: A, b: Unused --> (a | b): variant<Unused, A>`
- `a: Unused, b: B --> (a | b): variant<Unused, B>`
- `a: Unused, b: Unused --> (a | b): Unused`
+ [[alternative (`|`)] [`a: A, b: B --> (a | b): variant<A, B>`[br]
+ `a: A, b: Unused --> (a | b): variant<Unused, A>`[br]
+ `a: Unused, b: B --> (a | b): variant<Unused, B>`[br]
+ `a: Unused, b: Unused --> (a | b): Unused`[br]
 `a: A, b: A --> (a | b): A`]]
 [[difference (`-`)] [`a: A, b: B --> (a - b): A`]]
- [[kleene (`*`)] [`a: A --> *a: vector<A>`
+ [[kleene (`*`)] [`a: A --> *a: vector<A>`[br]
 `a: Unused --> a: Unused`]]
- [[plus (`+`)] [`a: A --> +a: vector<A>`
+ [[plus (`+`)] [`a: A --> +a: vector<A>`[br]
 `a: Unused --> a: Unused`]]
- [[list (`%`)] [`a: A, b: B --> (a % b): vector<A>`
+ [[list (`%`)] [`a: A, b: B --> (a % b): vector<A>`[br]
 `a: Unused, b: B --> (a % b): Unused`]]
- [[repetition] [`a: A --> repeat(...,...)[a]: vector<A>`
+ [[repetition] [`a: A --> repeat(...,...)[a]: vector<A>`[br]
 `a: Unused --> repeat(...,...)[a]: Unused`]]
- [[sequential or (`||`)] [`a: A, b: B --> (a || b): tuple<optional<A>, optional >`
- `a: A, b: Unused --> (a || b): optional<A>`
- `a: Unused, b: B --> (a || b): optional`
+ [[sequential or (`||`)] [`a: A, b: B --> (a || b): tuple<optional<A>, optional >`[br]
+ `a: A, b: Unused --> (a || b): optional<A>`[br]
+ `a: Unused, b: B --> (a || b): optional`[br]
 `a: Unused, b: Unused --> (a || b): Unused`]]
- [[optional (`-`)] [`a: A --> -a: optional<A>`
+ [[optional (`-`)] [`a: A --> -a: optional<A>`[br]
 `a: Unused --> -a: Unused`]]
 [[and predicate (`&`)] [`a: A --> &a: Unused`]]
 [[not predicate (`!`)] [`a: A --> !a: Unused`]]
- [[permutation (`^`)] [`a: A, b: B --> (a ^ b): tuple<optional<A>, optional >`
- `a: A, b: Unused --> (a ^ b): optional<A>`
- `a: Unused, b: B --> (a ^ b): optional`
+ [[permutation (`^`)] [`a: A, b: B --> (a ^ b): tuple<optional<A>, optional >`[br]
+ `a: A, b: Unused --> (a ^ b): optional<A>`[br]
+ `a: Unused, b: B --> (a ^ b): optional`[br]
 `a: Unused, b: Unused --> (a ^ b): Unused`]]
]

-[table __karma__ compound generator attribute types
+[table /Spirit.Karma/ compound generator attribute types
 [[Expression] [Attribute]]
- [[sequence (`<<`)] [`a: A, b: B --> (a << b): tuple<A, B>`
- `a: A, b: Unused --> (a << b): A`
- `a: Unused, b: B --> (a << b): B`
- `a: Unused, b: Unused --> (a << b): Unused`
+ [[sequence (`<<`)] [`a: A, b: B --> (a << b): tuple<A, B>`[br]
+ `a: A, b: Unused --> (a << b): A`[br]
+ `a: Unused, b: B --> (a << b): B`[br]
+ `a: Unused, b: Unused --> (a << b): Unused`[br]
 `a: A, b: A --> (a << b): vector<A>`]]
- [[alternative (`|`)] [`a: A, b: B --> (a | b): variant<A, B>`
- `a: A, b: Unused --> (a | b): variant<Unused, A>`
- `a: Unused, b: B --> (a | b): variant<Unused, B>`
- `a: Unused, b: Unused --> (a | b): Unused`
+ [[alternative (`|`)] [`a: A, b: B --> (a | b): variant<A, B>`[br]
+ `a: A, b: Unused --> (a | b): variant<Unused, A>`[br]
+ `a: Unused, b: B --> (a | b): variant<Unused, B>`[br]
+ `a: Unused, b: Unused --> (a | b): Unused`[br]
 `a: A, b: A --> (a | b): A`]]
- [[kleene (`*`)] [`a: A --> *a: vector<A>`
+ [[kleene (`*`)] [`a: A --> *a: vector<A>`[br]
 `a: Unused --> a: Unused`]]
- [[plus (`+`)] [`a: A --> +a: vector<A>`
+ [[plus (`+`)] [`a: A --> +a: vector<A>`[br]
 `a: Unused --> a: Unused`]]
- [[list (`%`)] [`a: A, b: B --> (a % b): vector<A>`
+ [[list (`%`)] [`a: A, b: B --> (a % b): vector<A>`[br]
 `a: Unused, b: B --> (a % b): Unused`]]
- [[repetition] [`a: A --> repeat(...,...)[a]: vector<A>`
+ [[repetition] [`a: A --> repeat(...,...)[a]: vector<A>`[br]
 `a: Unused --> repeat(...,...)[a]: Unused`]]
- [[optional (`-`)] [`a: A --> -a: optional<A>`
+ [[optional (`-`)] [`a: A --> -a: optional<A>`[br]
 `a: Unused --> -a: Unused`]]
 [[and predicate (`&`)] [`a: A --> &a: Unused`]]
 [[not predicate (`!`)] [`a: A --> !a: Unused`]]
@@ -320,25 +320,25 @@
[heading Non-terminals]

[variablelist Notation
- [[`RT`] Synthesized attribute. The rule or grammar's return type.]]
- [[`Arg1`, `Arg2`, `ArgN`] Inherited attributes. Zero or more or arguments.]]
- [[`L1`, `L2`, `LN`] Zero or more local variables.]]
- [[`r, r2`] Rules]]
- [[`g`] A grammar]]
- [[`p`] A parser expression]]
+ [[`RT`] [Synthesized attribute. The rule or grammar's return type.]]
+ [[`Arg1`, `Arg2`, `ArgN`] [Inherited attributes. Zero or more or arguments.]]
+ [[`L1`, `L2`, `LN`] [Zero or more local variables.]]
+ [[`r, r2`] [Rules]]
+ [[`g`] [A grammar]]
+ [[`p`] [A parser expression]]
]

[variablelist Terminology
- [[Signature] `RT(Arg1, Arg2 ... ,ArgN)`. The signature specifies
+ [[Signature] [`RT(Arg1, Arg2 ... ,ArgN)`. The signature specifies
 the synthesized (return value) and inherited (arguments)
 attributes.]]
- [[Locals] `locals<L1, L2 ..., LN>`. The local variables.]]
- [[Skipper] The skip-parser type]]
+ [[Locals] [`locals<L1, L2 ..., LN>`. The local variables.]]
+ [[Skipper] [The skip-parser type]]
]

[variablelist Template Arguments
- [[`Iterator`] The iterator type you will use for parsing.]]
- [[`A1`, `A2`, `A3`] Can be one of 1)Signature 2)Locals 3)Skipper.]]
+ [[`Iterator`] [The iterator type you will use for parsing.]]
+ [[`A1`, `A2`, `A3`] [Can be one of 1)Signature 2)Locals 3)Skipper.]]
]

[table

Modified: trunk/libs/spirit/doc/reference/lex/lexer.qbk
==============================================================================
--- trunk/libs/spirit/doc/reference/lex/lexer.qbk (original)
+++ trunk/libs/spirit/doc/reference/lex/lexer.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -1,5 +1,5 @@
[/==============================================================================
- Copyright (C) 2001-2008 Joel de Guzman
+ Copyright (C) 2001-2009 Joel de Guzman
     Copyright (C) 2001-2009 Hartmut Kaiser

     Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -7,6 +7,7 @@
===============================================================================/]

[section Lexer]
+
[table Regular expressions support
     [[Expression] [Meaning]]
     [[`x`] [Match any character `x`]]
@@ -62,17 +63,20 @@

[note POSIX character classes are not currently supported, due to performance issues
when creating them in wide character mode.]
-[br][h1 Regular Expression Precedence]
+
+[heading Regular Expression Precedence]

* `rs` has highest precedence
* `r*` has next highest (`+`, `?`, `{n,m}` have the same precedence as `*`)
* `r|s` has the lowest precedence

-[h1 Macros]
+[heading Macros]

Regular expressions can be given a name and referred to in rules using the
syntax `{NAME}` where `NAME` is the name you have given to the macro. A macro
name can be at most 30 characters long and must start with a `_` or a letter.
Subsequent characters can be `_`, `-`, a letter or a decimal digit.
Use the `rules::add_macro()` method to define a macro.
+
[endsect]
+

Modified: trunk/libs/spirit/doc/spirit2.qbk
==============================================================================
--- trunk/libs/spirit/doc/spirit2.qbk (original)
+++ trunk/libs/spirit/doc/spirit2.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -86,7 +86,7 @@
[/ References to API descriptions ]

[def __api_tokenize_and_parse__ [link spirit.qi_and_karma.abstracts.parsing_and_generating.the_tokenize_and_phrase_parse___function `tokenize_and_parse()`]]
-[def __api_generate_static__ [link spirit.lex.abstracts.tokenizing_input_data.the_generate_static___function `generate_static()`]]
+[def __api_generate_static__ [link spirit.lex.abstracts.tokenizing_input_data.generate_static_function `generate_static()`]]

[/ References to classes ]

Modified: trunk/libs/spirit/doc/what_s_new.qbk
==============================================================================
--- trunk/libs/spirit/doc/what_s_new.qbk (original)
+++ trunk/libs/spirit/doc/what_s_new.qbk 2009-05-18 17:11:36 EDT (Mon, 18 May 2009)
@@ -122,15 +122,15 @@
* The `lex::lexer<Lexer>` template constructor now takes an optional parameter
 specifying the `match_flags` to be used for table generation. Currently, there
 are the following flags available:
-
+'''
 match_flags::match_default, // no flags
 match_flags::match_not_dot_newline, // the regex '.' doesn't match newlines
 match_flags::match_icase // all matching operations are case insensitive
-
+'''
 If no parameter is passed to the constructor, `match_flags::match_default` is
- used, i.e. the '.' matches newlines and matching is case sensitive.
+ used, i.e. the `.` matches newlines and matching is case sensitive.
* Now the `char_()` and `string()` placeholders can be used for token
- definitions as a replacement for `token_def<>(...)`, although it is still
+ definitions as a replacement for `token_def`, although it is still
 possible to use the latter one.

[endsect]

Date view	Thread view	Subject view	Author view

Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk