Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r68056 - in sandbox/SOC/2010/phoenix3/libs/phoenix/doc: . html html/phoenix html/phoenix/reference html/phoenix/reference/phoenix_expressions html/phoenix/starter_kit html/phoenix/starter_kit/composites html/phoenix/starter_kit/primitives
From: thom.heller_at_[hidden]
Date: 2011-01-12 11:03:19


Author: theller
Date: 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
New Revision: 68056
URL: http://svn.boost.org/trac/boost/changeset/68056

Log:
next grammar draft try
Text files modified:
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/index.html | 22 +++++++++++-----------
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/introduction.html | 6 +++---
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference.html | 6 +++---
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions.html | 6 +++---
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions/phoenix_ast.html | 18 +++++++++---------
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites.html | 6 +++---
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/construct__new__delete__casts.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_functions.html | 18 +++++++++---------
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_operators.html | 18 +++++++++---------
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_statements.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/more.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives.html | 6 +++---
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/arguments.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/references.html | 8 ++++----
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/values.html | 12 ++++++------
   sandbox/SOC/2010/phoenix3/libs/phoenix/doc/reference.qbk | 12 ++++++------
   17 files changed, 89 insertions(+), 89 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/index.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/index.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/index.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,15 +4,15 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Chapter&#160;1.&#160;Phoenix 3.0</title>
 <link rel="stylesheet" href="../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="next" href="phoenix/introduction.html" title="Introduction">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr><td valign="top"></td></tr></table>
 <hr>
 <div class="spirit-nav"><a accesskey="n" href="phoenix/introduction.html"><img src="images/next.png" alt="Next"></a></div>
-<div class="chapter" lang="en">
+<div class="chapter">
 <div class="titlepage"><div>
 <div><h2 class="title">
 <a name="phoenix"></a>Chapter&#160;1.&#160;Phoenix 3.0</h2></div>
@@ -27,7 +27,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright &#169; 2002-2005, 2010 Joel de Guzman, Dan Marsden, Thomas Heller</p></div>
 <div><div class="legalnotice">
-<a name="id2813809"></a><p>
+<a name="id3195494"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
         file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
       </p>
@@ -67,7 +67,7 @@
 </dl>
 </div>
 <a name="phoenix.preface"></a><h2>
-<a name="id2813832"></a>
+<a name="id3195517"></a>
     <a class="link" href="index.html#phoenix.preface">Preface</a>
   </h2>
 <div class="blockquote"><blockquote class="blockquote"><p>
@@ -86,7 +86,7 @@
     <span class="inlinemediaobject"><img src="images/lambda_cpp.png" alt="lambda_cpp"></span>
   </p>
 <a name="phoenix.description"></a><h3>
-<a name="id2774111"></a>
+<a name="id3195535"></a>
     <a class="link" href="index.html#phoenix.description">Description</a>
   </h3>
 <p>
@@ -104,7 +104,7 @@
     library is organized in highly independent modules and layers.
   </p>
 <a name="phoenix.how_to_use_this_manual"></a><h3>
-<a name="id2774163"></a>
+<a name="id3234248"></a>
     <a class="link" href="index.html#phoenix.how_to_use_this_manual">How to use this manual</a>
   </h3>
 <p>
@@ -126,7 +126,7 @@
     icons precede some text to indicate:
   </p>
 <div class="table">
-<a name="id2774208"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
+<a name="id3234293"></a><p class="title"><b>Table&#160;1.1.&#160;Icons</b></p>
 <div class="table-contents"><table class="table" summary="Icons">
 <colgroup>
 <col>
@@ -207,7 +207,7 @@
 </table></div>
 </div>
 <br class="table-break"><div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
     <span class="inlinemediaobject"><img src="images/note.png" alt="note"></span> Unless otherwise noted <code class="computeroutput"><span class="keyword">using</span>
     <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">phoenix</span><span class="special">;</span></code>
@@ -215,12 +215,12 @@
   </p>
 </div>
 <a name="phoenix._emphasis_role__bold___emphasis____to_my_dear_daughter__phoenix__emphasis___emphasis_"></a><h3>
-<a name="id2773163"></a>
+<a name="id3193249"></a>
     <a class="link" href="index.html#phoenix._emphasis_role__bold___emphasis____to_my_dear_daughter__phoenix__emphasis___emphasis_"><span class="bold"><strong><span class="emphasis"><em>...To my dear daughter, Phoenix</em></span></strong></span></a>
   </h3>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: January 12, 2011 at 14:14:59 GMT</small></p></td>
+<td align="left"><p><small>Last revised: January 12, 2011 at 17:07:33 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/introduction.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/introduction.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/introduction.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Introduction</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="prev" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="next" href="starter_kit.html" title="Starter Kit">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../index.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="starter_kit.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="phoenix.introduction"></a><a class="link" href="introduction.html" title="Introduction">Introduction</a>
 </h2></div></div></div>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Reference</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="prev" href="starter_kit/composites/more.html" title="More">
 <link rel="next" href="reference/phoenix_expressions.html" title="Phoenix Expressions">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="starter_kit/composites/more.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="reference/phoenix_expressions.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="phoenix.reference"></a><a class="link" href="reference.html" title="Reference">Reference</a>
 </h2></div></div></div>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Phoenix Expressions</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../reference.html" title="Reference">
 <link rel="prev" href="../reference.html" title="Reference">
 <link rel="next" href="phoenix_expressions/phoenix_ast.html" title="Language Definition - The Phoenix AST">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../reference.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../reference.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="phoenix_expressions/phoenix_ast.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="phoenix.reference.phoenix_expressions"></a><a class="link" href="phoenix_expressions.html" title="Phoenix Expressions">Phoenix Expressions</a>
 </h3></div></div></div>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions/phoenix_ast.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions/phoenix_ast.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/reference/phoenix_expressions/phoenix_ast.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Language Definition - The Phoenix AST</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../phoenix_expressions.html" title="Phoenix Expressions">
 <link rel="prev" href="../phoenix_expressions.html" title="Phoenix Expressions">
 </head>
@@ -15,7 +15,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../phoenix_expressions.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../phoenix_expressions.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.reference.phoenix_expressions.phoenix_ast"></a><a class="link" href="phoenix_ast.html" title="Language Definition - The Phoenix AST">Language
         Definition - The Phoenix AST</a>
@@ -38,18 +38,18 @@
 
 cast := ( "static_cast_" | "dynamic_cast_" | "reinterpret_cast_" | "const_cast_" ) "&lt;" T "&gt;(" expression ")"
 
-construction := ( ( "construct" | "new" ) "&lt;" T "&gt;(" [ expression ( "," expression )* ] ")" ) |
+construction := ( ( "construct" | "new_" ) "&lt;" T "&gt;(" [ expression ( "," expression )* ] ")" ) |
                     ( "delete_(" expression ")" )
 
 bind := "bind(" ( expression | function_pointer ) ( "," expression )* ")"
 
 scope := let | lambda
 
-local_var_def := local_var_name "=" expression
+local_var_def := local_var "=" expression
 
-let := "let(" [ local_var_def ( "," local_var_def )* ] ")[" phoenix "]"
+let := "let(" [ local_var_def ( "," local_var_def )* ] ")[" ( phoenix | local_var )* "]"
 
-lambda := "lambda" [ "(" [ local_var_def ( "," local_var_def )* ] ")" ] "[" phoenix "]"
+lambda := "lambda" [ "(" [ local_var_def ( "," local_var_def )* ] ")" ] "[" ( phoenix | local_var )* "]"
 
 loops := for_loop | while_loop | do_while_loop
 
@@ -66,7 +66,7 @@
 throw := "throw_(" [ expression ] ")"
 
 try_catch := "try_[" phoenix "]"
- ( ".catch_&lt;" exception "&gt;()[" phoenix "]" )*
+ ( ".catch_&lt;" E "&gt;()[" phoenix "]" )*
                     [ ".catch_all[" phoenix "]" ]
 
 switch := "switch_(" expression ")[" (
@@ -125,7 +125,7 @@
 
 multiplicative_op := member_pointer_op (
                         ( "*" member_pointer_op )* |
- ( "/" member_pointer_op )* |
+ ( "/" member_pointer_op )*
                     )
 
 member_pointer_op := unary_op ( "-&gt;*" unary_op )*

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Starter Kit</title>
 <link rel="stylesheet" href="../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="prev" href="introduction.html" title="Introduction">
 <link rel="next" href="starter_kit/primitives.html" title="Primitives">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="introduction.html"><img src="../images/prev.png" alt="Prev"></a><a accesskey="u" href="../index.html"><img src="../images/up.png" alt="Up"></a><a accesskey="h" href="../index.html"><img src="../images/home.png" alt="Home"></a><a accesskey="n" href="starter_kit/primitives.html"><img src="../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <a name="phoenix.starter_kit"></a><a class="link" href="starter_kit.html" title="Starter Kit">Starter Kit</a>
 </h2></div></div></div>
@@ -62,7 +62,7 @@
       into high gear quickly.
     </p>
 <a name="phoenix.starter_kit.functors_everywhere"></a><h4>
-<a name="id2773301"></a>
+<a name="id3193388"></a>
       <a class="link" href="starter_kit.html#phoenix.starter_kit.functors_everywhere">Functors everywhere</a>
     </h4>
 <p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Composites</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../starter_kit.html" title="Starter Kit">
 <link rel="prev" href="primitives/arguments.html" title="Arguments">
 <link rel="next" href="composites/lazy_operators.html" title="Lazy Operators">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="primitives/arguments.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../starter_kit.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="composites/lazy_operators.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="phoenix.starter_kit.composites"></a><a class="link" href="composites.html" title="Composites">Composites</a>
 </h3></div></div></div>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/construct__new__delete__casts.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/construct__new__delete__casts.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/construct__new__delete__casts.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Construct, New, Delete, Casts</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../composites.html" title="Composites">
 <link rel="prev" href="lazy_statements.html" title="Lazy Statements">
 <link rel="next" href="lazy_functions.html" title="Lazy Functions">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="lazy_statements.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../composites.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="lazy_functions.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.composites.construct__new__delete__casts"></a><a class="link" href="construct__new__delete__casts.html" title="Construct, New, Delete, Casts">Construct,
         New, Delete, Casts</a>
@@ -41,7 +41,7 @@
           </p></td></tr>
 </table></div>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about this <a class="link" href="../../../">here.</a>
         </p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_functions.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_functions.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_functions.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Lazy Functions</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../composites.html" title="Composites">
 <link rel="prev" href="construct__new__delete__casts.html" title="Construct, New, Delete, Casts">
 <link rel="next" href="more.html" title="More">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="construct__new__delete__casts.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../composites.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="more.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.composites.lazy_functions"></a><a class="link" href="lazy_functions.html" title="Lazy Functions">Lazy
         Functions</a>
@@ -47,21 +47,21 @@
 <span class="identifier">function</span><span class="special">&lt;</span><span class="identifier">is_odd_impl</span><span class="special">&gt;</span> <span class="identifier">is_odd</span><span class="special">;</span>
 </pre>
 <a name="phoenix.starter_kit.composites.lazy_functions.things_to_note_"></a><h6>
-<a name="id2826200"></a>
+<a name="id3246447"></a>
           <a class="link" href="lazy_functions.html#phoenix.starter_kit.composites.lazy_functions.things_to_note_">Things
           to note:</a>
         </h6>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
               Result type deduction is implemented with the help of the result_of
               protocol. For more information see <a href="http://www.boost.org/doc/libs/1_43_0/libs/utility/utility.htm#result_of" target="_top">Boost.Result
               Of</a>
             </li>
-<li>
+<li class="listitem">
               <code class="computeroutput"><span class="identifier">is_odd_impl</span></code> implements
               the function.
             </li>
-<li>
+<li class="listitem">
               <code class="computeroutput"><span class="identifier">is_odd</span></code>, an instance
               of <code class="computeroutput"><span class="identifier">function</span><span class="special">&lt;</span><span class="identifier">is_odd_impl</span><span class="special">&gt;</span></code>,
               is the lazy function.
@@ -78,7 +78,7 @@
           (See function.cpp)
         </p>
 <a name="phoenix.starter_kit.composites.lazy_functions.predefined_lazy_functions"></a><h6>
-<a name="id2826391"></a>
+<a name="id3246638"></a>
           <a class="link" href="lazy_functions.html#phoenix.starter_kit.composites.lazy_functions.predefined_lazy_functions">Predefined
           Lazy Functions</a>
         </h6>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_operators.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_operators.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_operators.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Lazy Operators</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../composites.html" title="Composites">
 <link rel="prev" href="../composites.html" title="Composites">
 <link rel="next" href="lazy_statements.html" title="Lazy Statements">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../composites.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../composites.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="lazy_statements.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.composites.lazy_operators"></a><a class="link" href="lazy_operators.html" title="Lazy Operators">Lazy
         Operators</a>
@@ -38,13 +38,13 @@
           you will have to explicitly wrap your values in <code class="computeroutput"><span class="identifier">val</span></code>.
           Rules of thumb:
         </p>
-<div class="itemizedlist"><ul type="disc">
-<li>
+<div class="itemizedlist"><ul class="itemizedlist" type="disc">
+<li class="listitem">
               In a binary expression (e.g. <code class="computeroutput"><span class="number">3</span>
               <span class="special">*</span> <span class="identifier">arg3</span></code>),
               at least one of the operands must be a phoenix primitive or composite.
             </li>
-<li>
+<li class="listitem">
               In a unary expression (e.g. <code class="computeroutput"><span class="identifier">arg1</span><span class="special">++</span></code>), the single operand must be a phoenix
               primitive or composite.
             </li>
@@ -65,13 +65,13 @@
 </span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">x</span><span class="special">[</span><span class="identifier">ref</span><span class="special">(</span><span class="identifier">i</span><span class="special">)])</span> <span class="comment">// illegal (x is not a phoenix primitive or composite)
 </span></pre>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about operators <a class="link" href="../../../">here.</a>
         </p>
 </div>
 <a name="phoenix.starter_kit.composites.lazy_operators.first_practical_example"></a><h6>
-<a name="id2825070"></a>
+<a name="id3245318"></a>
           <a class="link" href="lazy_operators.html#phoenix.starter_kit.composites.lazy_operators.first_practical_example">First
           Practical Example</a>
         </h6>
@@ -114,7 +114,7 @@
           (See find_if.cpp)
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> ...<span class="bold"><strong>That's it, we're done</strong></span>.
           Well if you wish to know a little bit more, read on...

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_statements.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_statements.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/lazy_statements.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Lazy Statements</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../composites.html" title="Composites">
 <link rel="prev" href="lazy_operators.html" title="Lazy Operators">
 <link rel="next" href="construct__new__delete__casts.html" title="Construct, New, Delete, Casts">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="lazy_operators.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../composites.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="construct__new__delete__casts.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.composites.lazy_statements"></a><a class="link" href="lazy_statements.html" title="Lazy Statements">Lazy
         Statements</a>
@@ -45,7 +45,7 @@
           (See if.cpp)
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about statements <a class="link" href="../../../">here.</a>
         </p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/more.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/more.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/composites/more.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>More</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../composites.html" title="Composites">
 <link rel="prev" href="lazy_functions.html" title="Lazy Functions">
 <link rel="next" href="../../reference.html" title="Reference">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="lazy_functions.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../composites.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="../../reference.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.composites.more"></a><a class="link" href="more.html" title="More">More</a>
 </h4></div></div></div>
@@ -29,7 +29,7 @@
           vs. <a class="link" href="../../../">Lazy Functions</a>).
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> ...<span class="bold"><strong>If you still wish to learn
           more, the read on...</strong></span>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Primitives</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../starter_kit.html" title="Starter Kit">
 <link rel="prev" href="../starter_kit.html" title="Starter Kit">
 <link rel="next" href="primitives/values.html" title="Values">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../starter_kit.html"><img src="../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../starter_kit.html"><img src="../../images/up.png" alt="Up"></a><a accesskey="h" href="../../index.html"><img src="../../images/home.png" alt="Home"></a><a accesskey="n" href="primitives/values.html"><img src="../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h3 class="title">
 <a name="phoenix.starter_kit.primitives"></a><a class="link" href="primitives.html" title="Primitives">Primitives</a>
 </h3></div></div></div>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/arguments.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/arguments.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/arguments.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Arguments</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../primitives.html" title="Primitives">
 <link rel="prev" href="references.html" title="References">
 <link rel="next" href="../composites.html" title="Composites">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="references.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../primitives.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="../composites.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.primitives.arguments"></a><a class="link" href="arguments.html" title="Arguments">Arguments</a>
 </h4></div></div></div>
@@ -47,7 +47,7 @@
           (See arguments.cpp)
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about arguments <a class="link" href="../../../">here.</a>
         </p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/references.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/references.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/references.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>References</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../primitives.html" title="Primitives">
 <link rel="prev" href="values.html" title="Values">
 <link rel="next" href="arguments.html" title="Arguments">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="values.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../primitives.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="arguments.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.primitives.references"></a><a class="link" href="references.html" title="References">References</a>
 </h4></div></div></div>
@@ -45,7 +45,7 @@
           (See references.cpp)
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about references <a class="link" href="../../../">here.</a>
         </p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/values.html
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/values.html (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/html/phoenix/starter_kit/primitives/values.html 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -4,8 +4,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
 <title>Values</title>
 <link rel="stylesheet" href="../../../../../../../doc/html/boostbook.css" type="text/css">
-<meta name="generator" content="DocBook XSL Stylesheets V1.73.2">
-<link rel="start" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
+<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
+<link rel="home" href="../../../index.html" title="Chapter&#160;1.&#160;Phoenix 3.0">
 <link rel="up" href="../primitives.html" title="Primitives">
 <link rel="prev" href="../primitives.html" title="Primitives">
 <link rel="next" href="references.html" title="References">
@@ -16,7 +16,7 @@
 <div class="spirit-nav">
 <a accesskey="p" href="../primitives.html"><img src="../../../images/prev.png" alt="Prev"></a><a accesskey="u" href="../primitives.html"><img src="../../../images/up.png" alt="Up"></a><a accesskey="h" href="../../../index.html"><img src="../../../images/home.png" alt="Home"></a><a accesskey="n" href="references.html"><img src="../../../images/next.png" alt="Next"></a>
 </div>
-<div class="section" lang="en">
+<div class="section">
 <div class="titlepage"><div><div><h4 class="title">
 <a name="phoenix.starter_kit.primitives.values"></a><a class="link" href="values.html" title="Values">Values</a>
 </h4></div></div></div>
@@ -33,7 +33,7 @@
           World"</span></code>.
         </p>
 <a name="phoenix.starter_kit.primitives.values.lazy_evaluation"></a><h6>
-<a name="id2773500"></a>
+<a name="id3193586"></a>
           <a class="link" href="values.html#phoenix.starter_kit.primitives.values.lazy_evaluation">Lazy
           Evaluation</a>
         </h6>
@@ -51,7 +51,7 @@
           (See values.cpp)
         </p>
 <div class="sidebar">
-<p class="title"><b></b></p>
+<div class="titlepage"></div>
 <p>
           <span class="inlinemediaobject"><img src="../../../images/tip.png" alt="tip"></span> Learn more about values <a class="link" href="../../../">here.</a>
         </p>
@@ -66,7 +66,7 @@
           anything and defers the evaluation for later.
         </p>
 <a name="phoenix.starter_kit.primitives.values.callbacks"></a><h6>
-<a name="id2823640"></a>
+<a name="id3193850"></a>
           <a class="link" href="values.html#phoenix.starter_kit.primitives.values.callbacks">Callbacks</a>
         </h6>
 <p>

Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/doc/reference.qbk
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/doc/reference.qbk (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/doc/reference.qbk 2011-01-12 11:03:15 EST (Wed, 12 Jan 2011)
@@ -51,18 +51,18 @@
 
     cast := ( "static_cast_" | "dynamic_cast_" | "reinterpret_cast_" | "const_cast_" ) "<" T ">(" expression ")"
 
- construction := ( ( "construct" | "new" ) "<" T ">(" [ expression ( "," expression )* ] ")" ) |
+ construction := ( ( "construct" | "new_" ) "<" T ">(" [ expression ( "," expression )* ] ")" ) |
                         ( "delete_(" expression ")" )
 
     bind := "bind(" ( expression | function_pointer ) ( "," expression )* ")"
 
     scope := let | lambda
 
- local_var_def := local_var_name "=" expression
+ local_var_def := local_var "=" expression
 
- let := "let(" [ local_var_def ( "," local_var_def )* ] ")[" phoenix "]"
+ let := "let(" [ local_var_def ( "," local_var_def )* ] ")[" ( phoenix | local_var )* "]"
 
- lambda := "lambda" [ "(" [ local_var_def ( "," local_var_def )* ] ")" ] "[" phoenix "]"
+ lambda := "lambda" [ "(" [ local_var_def ( "," local_var_def )* ] ")" ] "[" ( phoenix | local_var )* "]"
 
     loops := for_loop | while_loop | do_while_loop
 
@@ -79,7 +79,7 @@
     throw := "throw_(" [ expression ] ")"
 
     try_catch := "try_[" phoenix "]"
- ( ".catch_<" exception ">()[" phoenix "]" )*
+ ( ".catch_<" E ">()[" phoenix "]" )*
                         [ ".catch_all[" phoenix "]" ]
 
     switch := "switch_(" expression ")[" (
@@ -138,7 +138,7 @@
 
     multiplicative_op := member_pointer_op (
                             ( "*" member_pointer_op )* |
- ( "/" member_pointer_op )* |
+ ( "/" member_pointer_op )*
                         )
 
     member_pointer_op := unary_op ( "->*" unary_op )*


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