Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r72579 - in branches/release: . libs libs/spirit libs/spirit/doc libs/spirit/doc/html libs/spirit/doc/html/spirit libs/spirit/doc/html/spirit/abstracts libs/spirit/doc/html/spirit/karma libs/spirit/doc/html/spirit/qi libs/spirit/doc/html/spirit/qi/reference/operator libs/spirit/doc/html/spirit/support
From: hartmut.kaiser_at_[hidden]
Date: 2011-06-14 04:25:24

Next message: chris_at_[hidden]: "[Boost-commit] svn:boost r72581 - website/public_html/beta/feed/history"
Previous message: john_at_[hidden]: "[Boost-commit] svn:boost r72580 - trunk/boost"

Author: hkaiser
Date: 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
New Revision: 72579
URL: http://svn.boost.org/trac/boost/changeset/72579

Log:
Spirit: merging from trunk, authorized by rene
Properties modified:
   branches/release/ (props changed)
   branches/release/libs/ (props changed)
   branches/release/libs/spirit/ (props changed)
   branches/release/libs/spirit/doc/ (props changed)
Text files modified:
   branches/release/libs/spirit/doc/html/index.html | 4 ++--
   branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html | 6 +++---
   branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html | 10 +++++-----
   branches/release/libs/spirit/doc/html/spirit/introduction.html | 4 ++--
   branches/release/libs/spirit/doc/html/spirit/karma/s05.html | 2 +-
   branches/release/libs/spirit/doc/html/spirit/preface.html | 4 ++--
   branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html | 4 ++--
   branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html | 4 ++--
   branches/release/libs/spirit/doc/html/spirit/qi/s04.html | 2 +-
   branches/release/libs/spirit/doc/html/spirit/support/utree.html | 8 ++++----
   10 files changed, 24 insertions(+), 24 deletions(-)

Modified: branches/release/libs/spirit/doc/html/index.html
==============================================================================
--- branches/release/libs/spirit/doc/html/index.html (original)
+++ branches/release/libs/spirit/doc/html/index.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -33,7 +33,7 @@
</div></div>
<div>Copyright © 2001-2011 Joel de Guzman, Hartmut Kaiser</div>
<div><div class="legalnotice">
-<a name="id858023"></a>
+<a name="id841498"></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)
 
@@ -294,7 +294,7 @@
 
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: May 28, 2011 at 18:27:20 GMT</td>
+<td align="left">Last revised: June 13, 2011 at 17:45:26 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/abstracts/parsing_expression_grammar.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -28,7 +28,7 @@
 Expression Grammar</a>
</h3></div></div></div>

- Parsing Expression Grammars (PEG) [<a name="id872982" href="#ftn.id872982" class="footnote">6</a>] are a derivative of Extended Backus-Naur Form (EBNF) [<a name="id872994" href="#ftn.id872994" class="footnote">7</a>] with a different interpretation, designed to represent a recursive
+ Parsing Expression Grammars (PEG) [<a name="id860763" href="#ftn.id860763" class="footnote">6</a>] are a derivative of Extended Backus-Naur Form (EBNF) [<a name="id860775" href="#ftn.id860775" class="footnote">7</a>] with a different interpretation, designed to represent a recursive
 descent parser. A PEG can be directly represented as a recursive-descent
 parser.
 
@@ -189,11 +189,11 @@
</table></div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id872982" href="#id872982" class="para">6</a>] 
+<div class="footnote">[<a name="ftn.id860763" href="#id860763" class="para">6</a>] 
 Bryan Ford: Parsing Expression Grammars: A Recognition-Based Syntactic
 Foundation, http://pdos.csail.mit.edu/~baford/packrat/popl04/
 </div>
-<div class="footnote">[<a name="ftn.id872994" href="#id872994" class="para">7</a>] 
+<div class="footnote">[<a name="ftn.id860775" href="#id860775" class="para">7</a>] 
 Richard E. Pattis: EBNF: A Notation to Describe Syntax, http://www.cs.cmu.edu/~pattis/misc/ebnf.pdf
 </div>
</div>

Modified: branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/abstracts/syntax_diagram.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -28,9 +28,9 @@
</h3></div></div></div>

 In the next section, we will deal with Parsing Expression Grammars (PEG)
- [<a name="id872392" href="#ftn.id872392" class="footnote">3</a>], a variant of Extended Backus-Naur Form (EBNF) [<a name="id872404" href="#ftn.id872404" class="footnote">4</a>] with a different interpretation. It is easier to understand PEG
+ [<a name="id860356" href="#ftn.id860356" class="footnote">3</a>], a variant of Extended Backus-Naur Form (EBNF) [<a name="id860368" href="#ftn.id860368" class="footnote">4</a>] with a different interpretation. It is easier to understand PEG
 using Syntax Diagrams. Syntax diagrams represent a grammar graphically. It
- was used extensively by Niklaus Wirth [<a name="id872416" href="#ftn.id872416" class="footnote">5</a>] in the "Pascal User Manual". Syntax Diagrams are easily
+ was used extensively by Niklaus Wirth [<a name="id860380" href="#ftn.id860380" class="footnote">5</a>] in the "Pascal User Manual". Syntax Diagrams are easily
 understandable by programmers due to their similarity to flow charts. The
 isomorphism of the diagrams and functions make them ideal for representing
 Recursive Descent parsers which are essentially mutually recursive functions.
@@ -147,14 +147,14 @@
 
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id872392" href="#id872392" class="para">3</a>] 
+<div class="footnote">[<a name="ftn.id860356" href="#id860356" class="para">3</a>] 
 Bryan Ford: Parsing Expression Grammars: A Recognition-Based Syntactic
 Foundation, http://pdos.csail.mit.edu/~baford/packrat/popl04/
 </div>
-<div class="footnote">[<a name="ftn.id872404" href="#id872404" class="para">4</a>] 
+<div class="footnote">[<a name="ftn.id860368" href="#id860368" class="para">4</a>] 
 Richard E. Pattis: EBNF: A Notation to Describe Syntax, http://www.cs.cmu.edu/~pattis/misc/ebnf.pdf
 </div>
-<div class="footnote">[<a name="ftn.id872416" href="#id872416" class="para">5</a>] 
+<div class="footnote">[<a name="ftn.id860380" href="#id860380" class="para">5</a>] 
 Niklaus Wirth: The Programming Language Pascal. (July 1973)
 </div>
</div>

Modified: branches/release/libs/spirit/doc/html/spirit/introduction.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/introduction.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/introduction.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -29,7 +29,7 @@

 Boost Spirit is an object-oriented, recursive-descent parser and output generation
 library for C++. It allows you to write grammars and format descriptions using
- a format similar to Extended Backus Naur Form (EBNF)[<a name="id869201" href="#ftn.id869201" class="footnote">2</a>] directly in C++. These inline grammar specifications can mix freely
+ a format similar to Extended Backus Naur Form (EBNF)[<a name="id855003" href="#ftn.id855003" class="footnote">2</a>] 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
@@ -453,7 +453,7 @@
</div>
 <div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id869201" href="#id869201" class="para">2</a>] 
+<div class="footnote">[<a name="ftn.id855003" href="#id855003" class="para">2</a>] 
 <a href="http://www.cl.cam.ac.uk/%7Emgk25/iso-14977.pdf" target="_top">ISO-EBNF</a>
 </div>
</div>

Modified: branches/release/libs/spirit/doc/html/spirit/karma/s05.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/karma/s05.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/karma/s05.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="id1234081"></a>Karma Index</h3></div></div></div>
+<a name="id1220731"></a>Karma Index</h3></div></div></div>
<a class="link" href="s05.html#idx_id_23">A</a> <a class="link" href="s05.html#idx_id_24">B</a> <a class="link" href="s05.html#idx_id_25">C</a> <a class="link" href="s05.html#idx_id_26">D</a> <a class="link" href="s05.html#idx_id_27">E</a> <a class="link" href="s05.html#idx_id_28">F</a> <a class="link" href="s05.html#idx_id_29">G</a> <a class="link" href="s05.html#idx_id_30">H</a> <a class="link" href="s05.html#idx_id_31">I</a> <a class="link" href="s05.html#idx_id_32">K</a> <a class="link" href="s05.html#idx_id_33">L</a> <a class="link" href="s05.html#idx_id_34">M</a> <a class="link" href="s05.html#idx_id_35">N</a> <a class="link" href="s05.html#idx_id_36">O</a> <a class="link" href="s05.html#idx_id_37">P</a> <a class="link" href="s05.html#idx_id_38">Q</a> <a class="link" href="s05.html#idx_id_39">R</a> <a class="link" href="s05.html#idx_id_40">S</a> <a class="link" href="s05.html#idx_id_41">T</a> <a class="link" href="s05.html#idx_id_42">U</a> <a class="link" href="s05.html#idx_id_43">V</a> <a class="l
ink" href="s05.html#idx_id_44">W</a> <a class="link" href="s05.html#idx_id_45">X</a> <a class="link" href="s05.html#idx_id_46">_</a> 
<div class="variablelist"><dl>
<dt>

Modified: branches/release/libs/spirit/doc/html/spirit/preface.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/preface.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/preface.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -162,7 +162,7 @@
 </h4>

 Just before the development of Spirit V2 began, Hartmut came across the StringTemplate library that is
- a part of the ANTLR parser framework. [<a name="id858291" href="#ftn.id858291" class="footnote">1</a>] The concepts presented in that library lead Hartmut to the next
+ a part of the ANTLR parser framework. [<a name="id841766" href="#ftn.id841766" class="footnote">1</a>] The concepts presented in that library lead Hartmut to the next
 step in the evolution of Spirit. Parsing and generation are tightly connected
 to a formal notation, or a grammar. The grammar describes both input and output,
 and therefore, a parser library should have a grammar driven output. This duality
@@ -353,7 +353,7 @@
 
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id858291" href="#id858291" class="para">1</a>] 
+<div class="footnote">[<a name="ftn.id841766" href="#id841766" class="para">1</a>] 
 Quote from http:/www.stringtemplate.org: It is a Java
 template engine (with ports for C# and Python) for generating source code,
 web pages, emails, or any other formatted text output.

Modified: branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/difference.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -36,7 +36,7 @@
 The difference operator, <code class="computeroutput">a
 - b</code>,
 is a binary operator that matches the first (LHS) operand but not the
- second (RHS). [<a name="id1027315" href="#ftn.id1027315" class="footnote">8</a>]
+ second (RHS). [<a name="id1014792" href="#ftn.id1014792" class="footnote">8</a>]
 
<a name="spirit.qi.reference.operator.difference.header"></a><h6>
<a name="spirit.qi.reference.operator.difference.header-heading"></a>
@@ -192,7 +192,7 @@
 
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id1027315" href="#id1027315" class="para">8</a>] 
+<div class="footnote">[<a name="ftn.id1014792" href="#id1014792" class="para">8</a>] 
 Unlike classic Spirit, with Spirit2, the expression will always fail
 if the RHS is a successful match regardless if the RHS matches less
 characters. For example, the rule <code class="computeroutput">lit("policeman") - "police"</code> will always fail to

Modified: branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/reference/operator/optional.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -180,7 +180,7 @@

 

- Parse a person info with name (in quotes) optional age [<a name="id1036547" href="#ftn.id1036547" class="footnote">9</a>] and optional sex, all separated by comma.
+ Parse a person info with name (in quotes) optional age [<a name="id1022248" href="#ftn.id1022248" class="footnote">9</a>] and optional sex, all separated by comma.
 


@@ -206,7 +206,7 @@
 
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a name="ftn.id1036547" href="#id1036547" class="para">9</a>] 
+<div class="footnote">[<a name="ftn.id1022248" href="#id1022248" class="para">9</a>] 
 James Bond is shy about his age :-)
 </div>
</div>

Modified: branches/release/libs/spirit/doc/html/spirit/qi/s04.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/qi/s04.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/qi/s04.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -24,7 +24,7 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="id1054614"></a>Qi Index</h3></div></div></div>
+<a name="id1041803"></a>Qi Index</h3></div></div></div>
<a class="link" href="s04.html#idx_id_0">A</a> <a class="link" href="s04.html#idx_id_1">B</a> <a class="link" href="s04.html#idx_id_2">C</a> <a class="link" href="s04.html#idx_id_3">D</a> <a class="link" href="s04.html#idx_id_4">E</a> <a class="link" href="s04.html#idx_id_5">F</a> <a class="link" href="s04.html#idx_id_6">G</a> <a class="link" href="s04.html#idx_id_7">H</a> <a class="link" href="s04.html#idx_id_8">I</a> <a class="link" href="s04.html#idx_id_9">K</a> <a class="link" href="s04.html#idx_id_10">L</a> <a class="link" href="s04.html#idx_id_11">M</a> <a class="link" href="s04.html#idx_id_12">N</a> <a class="link" href="s04.html#idx_id_13">O</a> <a class="link" href="s04.html#idx_id_14">P</a> <a class="link" href="s04.html#idx_id_15">Q</a> <a class="link" href="s04.html#idx_id_16">R</a> <a class="link" href="s04.html#idx_id_17">S</a> <a class="link" href="s04.html#idx_id_18">T</a> <a class="link" href="s04.html#idx_id_19">U</a> <a class="link" href="s04.html#idx_id_20">W</a> <a class="link" href=
"s04.html#idx_id_21">X</a> <a class="link" href="s04.html#idx_id_22">_</a> 
<div class="variablelist"><dl>
<dt>

Modified: branches/release/libs/spirit/doc/html/spirit/support/utree.html
==============================================================================
--- branches/release/libs/spirit/doc/html/spirit/support/utree.html (original)
+++ branches/release/libs/spirit/doc/html/spirit/support/utree.html 2011-06-14 04:25:22 EDT (Tue, 14 Jun 2011)
@@ -190,7 +190,7 @@

// This initializes a `boolean_type` node, which can hold 'true' or
// 'false' only.
-utree(bool);
+explicit utree(bool);
reference operator=(bool);

// This initializes an `integer_type` node, which can hold arbitrary
@@ -368,7 +368,7 @@
{
 virtual ~function_base() {}
 virtual utree operator()(utree const& env) const = 0;
- virtual utree operator()(utree& env) = 0;
+ virtual utree operator()(utree& env) const = 0;

 // Calling f.clone() must return a newly allocated function_base
 // instance that is equal to f.
@@ -382,7 +382,7 @@
 stored_function(F f = F());
 virtual ~stored_function();
 virtual utree operator()(utree const& env) const;
- virtual utree operator()(utree& env);
+ virtual utree operator()(utree& env) const;
 virtual function_base* clone() const;
};

@@ -393,7 +393,7 @@
 referenced_function(F& f);
 virtual ~referenced_function();
 virtual utree operator()(utree const& env) const;
- virtual utree operator()(utree& env);
+ virtual utree operator()(utree& env) const;
 virtual function_base* clone() const;
};
</pre>

Next message: chris_at_[hidden]: "[Boost-commit] svn:boost r72581 - website/public_html/beta/feed/history"
Previous message: john_at_[hidden]: "[Boost-commit] svn:boost r72580 - trunk/boost"

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