Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r69228 - in sandbox/local: . boost/local boost/local/aux_ boost/local/aux_/function_macros libs/local/doc libs/local/doc/html libs/local/doc/html/boost_local libs/local/doc/qbk libs/local/example
From: lorcaminiti_at_[hidden]
Date: 2011-02-23 22:48:19

Next message: lorcaminiti_at_[hidden]: "[Boost-commit] svn:boost r69229 - sandbox/local/libs/local/example"
Previous message: DDeakins_at_[hidden]: "[Boost-commit] svn:boost r69227 - in trunk/boost/chrono: . detail detail/inlined/win"

Author: lcaminiti
Date: 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
New Revision: 69228
URL: http://svn.boost.org/trac/boost/changeset/69228

Log:
Reworked all examples. Impl exits and blocks.
Removed:
   sandbox/local/libs/local/example/same_line.cpp
Text files modified:
   sandbox/local/TODO.txt | 2
   sandbox/local/boost/local/aux_/function_macros/params.hpp | 4
   sandbox/local/boost/local/aux_/symbol.hpp | 4
   sandbox/local/boost/local/function.hpp | 32 ++-
   sandbox/local/libs/local/doc/html/BOOST_IDENTITY_TYPE.html | 8
   sandbox/local/libs/local/doc/html/BOOST_IDENTITY_VALUE.html | 2
   sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html | 8
   sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html | 8
   sandbox/local/libs/local/doc/html/boost_local/Advanced.html | 162 ++++++++-----------
   sandbox/local/libs/local/doc/html/boost_local/Grammar.html | 12
   sandbox/local/libs/local/doc/html/boost_local/Rationale.html | 8
   sandbox/local/libs/local/doc/html/boost_local/Starting.html | 10
   sandbox/local/libs/local/doc/html/boost_local/Tutorial.html | 124 ++++++--------
   sandbox/local/libs/local/doc/html/index.html | 327 +++++++++++++++++++++++++--------------
   sandbox/local/libs/local/doc/html/reference.html | 45 ----
   sandbox/local/libs/local/doc/html/standalone_HTML.manifest | 15 -
   sandbox/local/libs/local/doc/jamfile.jam | 6
   sandbox/local/libs/local/doc/qbk/introduction.qbk | 30 +++
   sandbox/local/libs/local/doc/qbk/local.qbk | 2
   sandbox/local/libs/local/example/add.cpp | 26 +-
   sandbox/local/libs/local/example/add_num.cpp | 9
   sandbox/local/libs/local/example/add_num_sum.cpp | 7
   sandbox/local/libs/local/example/add_optimizers.cpp | 11
   sandbox/local/libs/local/example/add_this.cpp | 8
   sandbox/local/libs/local/example/block.cpp | 2
   sandbox/local/libs/local/example/doit.cpp | 17 -
   sandbox/local/libs/local/example/exit.cpp | 9
   sandbox/local/libs/local/example/find_if.cpp | 11
   sandbox/local/libs/local/example/print_map.cpp | 18 -
   sandbox/local/libs/local/example/transform.cpp | 17 -
   30 files changed, 483 insertions(+), 461 deletions(-)

Modified: sandbox/local/TODO.txt
==============================================================================
--- sandbox/local/TODO.txt (original)
+++ sandbox/local/TODO.txt 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -9,6 +9,8 @@

* Rename function_ref to function (because it now has a default constructor so it's not a reference anymore).

+* Document that PARAMS cannot appear on same line because they use __LINE__ to generate unique IDs (there's no way around this because this macro doesn't know the function name).
+

* Double check all local function syntax elements (from Grammar) -- auto, register, etc.

Modified: sandbox/local/boost/local/aux_/function_macros/params.hpp
==============================================================================
--- sandbox/local/boost/local/aux_/function_macros/params.hpp (original)
+++ sandbox/local/boost/local/aux_/function_macros/params.hpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -47,10 +47,10 @@
// typename_keyword: `typename` in type depended context (i.e., templates),
// `EMPTY()` otherwise.
#define BOOST_LOCAL_AUX_FUNCTION_PARAMS( \
- parenthesized_params, typename_keyword) \
+ parenthesized_params, id, typename_keyword) \
BOOST_LOCAL_AUX_FUNCTION_PARAMS_( \
BOOST_LOCAL_AUX_PP_SIGN_PARSE_PARAMS(parenthesized_params), \
- __LINE__, typename_keyword)
+ id, typename_keyword)

#endif // #include guard

Modified: sandbox/local/boost/local/aux_/symbol.hpp
==============================================================================
--- sandbox/local/boost/local/aux_/symbol.hpp (original)
+++ sandbox/local/boost/local/aux_/symbol.hpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -71,8 +71,8 @@
#define BOOST_LOCAL_AUX_SYMBOL_BODY_FUNCTION_NAME \
BOOST_LOCAL_AUX_INTERNAL_SYMBOL(body)

-#define BOOST_LOCAL_AUX_SYMBOL_BLOCK_FUNCTION_NAME \
- BOOST_LOCAL_AUX_INTERNAL_SYMBOL(block_function)
+#define BOOST_LOCAL_AUX_SYMBOL_BLOCK_FUNCTION_NAME(id) \
+ BOOST_LOCAL_AUX_INTERNAL_SYMBOL(BOOST_PP_CAT(block_function, id))

#define BOOST_LOCAL_AUX_SYMBOL_INIT_RECURSION_FUNCTION_NAME \
BOOST_LOCAL_AUX_INTERNAL_SYMBOL(init_recursion)

Modified: sandbox/local/boost/local/function.hpp
==============================================================================
--- sandbox/local/boost/local/function.hpp (original)
+++ sandbox/local/boost/local/function.hpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -10,7 +10,7 @@
#include "aux_/function_macros/params.hpp"
#include "aux_/function_macros/name.hpp"
#include <boost/preprocessor/facilities/empty.hpp>
-#include <boost/config.hpp> // Handle variadic macros.
+#include <boost/config.hpp> // For variadic macros.

// Params.

@@ -19,28 +19,30 @@
// params and nothing `` for no params.
#if defined(BOOST_NO_VARIADIC_MACROS)

-# define BOOST_LOCAL_FUNCTION_PARAMS(parenthesized_params) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(parenthesized_params, BOOST_PP_EMPTY())
+#define BOOST_LOCAL_FUNCTION_PARAMS(parameter_list) \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(parameter_list, __LINE__, BOOST_PP_EMPTY())

-# define BOOST_LOCAL_FUNCTION_PARAMS_TPL(parenthesized_params) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(parenthesized_params, typename)
+#define BOOST_LOCAL_FUNCTION_PARAMS_TPL(parameter_list) \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(parameter_list, __LINE__, typename)

#else // BOOST_NO_VARIADIC_MACROS

-# include "aux_/preprocessor/va.hpp"
+#include "aux_/preprocessor/va.hpp"

-# define BOOST_LOCAL_FUNCTION_PARAMS(...) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
- (void) /* for empty seq */, __VA_ARGS__), BOOST_PP_EMPTY())
-
-# define BOOST_LOCAL_FUNCTION_PARAMS_TPL(...) \
- BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
- (void) /* for empty seq */, __VA_ARGS__), typename)
+#define BOOST_LOCAL_FUNCTION_PARAMS(...) \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ (void) /* for empty seq */, __VA_ARGS__), \
+ __LINE__, BOOST_PP_EMPTY())
+
+#define BOOST_LOCAL_FUNCTION_PARAMS_TPL(...) \
+ BOOST_LOCAL_AUX_FUNCTION_PARAMS(BOOST_LOCAL_AUX_PP_VA_TO_SEQ( \
+ (void) /* for empty seq */, __VA_ARGS__), \
+ __LINE__, typename)

#endif // BOOST_NO_VARIADIC_MACROS

-#define BOOST_LOCAL_FUNCTION_NAME(name) \
- BOOST_LOCAL_AUX_FUNCTION_NAME(name)
+#define BOOST_LOCAL_FUNCTION_NAME(local_function_name) \
+ BOOST_LOCAL_AUX_FUNCTION_NAME(local_function_name)

namespace boost { namespace local {

Modified: sandbox/local/libs/local/doc/html/BOOST_IDENTITY_TYPE.html
==============================================================================
--- sandbox/local/libs/local/doc/html/BOOST_IDENTITY_TYPE.html (original)
+++ sandbox/local/libs/local/doc/html/BOOST_IDENTITY_TYPE.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="Boost.Local 0.1.1">
<link rel="up" href="reference.html#header.boost.utility.identity_hpp" title="Header <boost/utility/identity.hpp>">
-<link rel="prev" href="boost/local/function_ref.html" title="Struct template function_ref">
+<link rel="prev" href="BOOST_LOCAL_FUNCTION_NAME.html" title="Macro BOOST_LOCAL_FUNCTION_NAME">
<link rel="next" href="BOOST_IDENTITY_VALUE.html" title="Macro BOOST_IDENTITY_VALUE">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="boost/local/function_ref.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.utility.identity_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_IDENTITY_VALUE.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_LOCAL_FUNCTION_NAME.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.utility.identity_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_IDENTITY_VALUE.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="refentry">
<a name="BOOST_IDENTITY_TYPE"></a><div class="titlepage"></div>
@@ -33,7 +33,7 @@

BOOST_IDENTITY_TYPE(parenthesized_type)</pre></div>
<div class="refsect1">
-<a name="id891489"></a><h2>Description</h2>
+<a name="id889882"></a><h2>Description</h2>
This macro expands to an expression that can be passed as a single macro parameter even if it contains commas and that evaluates to the specified type at compile-time (see the <a class="link" href="boost_local/Advanced.html" title="Advanced">Advanced</a> section).
For example <code class="computeroutput">BOOST_IDENTITY_TYPE((std::map<int, double>))</code> can be passed as a single macro parameter when instead <code class="computeroutput">std::map<int, double></code> cannot (because it contains a comma not wrapped by round parenthesis so it will be interpreted as two separate macro parameters by the preprocessor).
Parameters: 
@@ -62,7 +62,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="boost/local/function_ref.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.utility.identity_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_IDENTITY_VALUE.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_LOCAL_FUNCTION_NAME.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.utility.identity_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_IDENTITY_VALUE.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/local/libs/local/doc/html/BOOST_IDENTITY_VALUE.html
==============================================================================
--- sandbox/local/libs/local/doc/html/BOOST_IDENTITY_VALUE.html (original)
+++ sandbox/local/libs/local/doc/html/BOOST_IDENTITY_VALUE.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -33,7 +33,7 @@

BOOST_IDENTITY_VALUE(parenthesized_value)</pre></div>
<div class="refsect1">
-<a name="id891630"></a><h2>Description</h2>
+<a name="id890022"></a><h2>Description</h2>
This macro expands to an expression that can be passed as a single macro parameter even if it contains commas and that evaluates to the specified value at run-time (see the <a class="link" href="boost_local/Advanced.html" title="Advanced">Advanced</a> section).
For example <code class="computeroutput">BOOST_IDENTITY_VALUE((key_size<int, double>::value))</code> can be passed as a single macro parameter when instead <code class="computeroutput">key_size<int, double>::value</code> cannot (because it contains a comma not wrapped by round parenthesis so it will be interpreted as two separate macro parameters by the preprocessor).
Parameters:

Modified: sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html
==============================================================================
--- sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html (original)
+++ sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.76.1">
<link rel="home" href="index.html" title="Boost.Local 0.1.1">
<link rel="up" href="reference.html#header.boost.local.config_hpp" title="Header <boost/local/config.hpp>">
-<link rel="prev" href="BOOST_LOCAL_BLOCK_END.html" title="Macro BOOST_LOCAL_BLOCK_END">
+<link rel="prev" href="reference.html" title="Reference">
<link rel="next" href="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html" title="Macro BOOST_LOCAL_CONFIG_THIS_PARAM_NAME">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="BOOST_LOCAL_BLOCK_END.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="reference.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="refentry">
<a name="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX"></a><div class="titlepage"></div>
@@ -33,7 +33,7 @@

BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX</pre></div>
<div class="refsect1">
-<a name="id888420"></a><h2>Description</h2>
+<a name="id888173"></a><h2>Description</h2>
Note: If programmers leave this macro undefined, its default value is <code class="computeroutput">5</code>.
This only refers to the number of local function parameters and not to the number of bound variables in scope (the limit on the number of bound variables is instead the maximum size allowed for a Boost.Preprocessor sequences).
Warning: Increasing this number will increase compilation time.
@@ -50,7 +50,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="BOOST_LOCAL_BLOCK_END.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="reference.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html
==============================================================================
--- sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html (original)
+++ sandbox/local/libs/local/doc/html/BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Boost.Local 0.1.1">
<link rel="up" href="reference.html#header.boost.local.config_hpp" title="Header <boost/local/config.hpp>">
<link rel="prev" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html" title="Macro BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX">
-<link rel="next" href="BOOST_LOCAL_EXIT.html" title="Macro BOOST_LOCAL_EXIT">
+<link rel="next" href="boost/local/function.html" title="Struct template function">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,7 +20,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_EXIT.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/local/function.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="refentry">
<a name="BOOST_LOCAL_CONFIG_THIS_PARAM_NAME"></a><div class="titlepage"></div>
@@ -33,7 +33,7 @@

BOOST_LOCAL_CONFIG_THIS_PARAM_NAME</pre></div>
<div class="refsect1">
-<a name="id888519"></a><h2>Description</h2>
+<a name="id888272"></a><h2>Description</h2>
Note: If programmers leave this macro undefined, the default symbol used is <code class="computeroutput">this_</code>.
Warning: Programmers should not define this macro unless it is absolutely necessary (e.g., to avoid name clashes with another library which cannot be changed). Changing the symbol <code class="computeroutput">this_</code> effectively changes the public API of this library.
See: <a class="link" href="boost_local/Starting.html" title="Starting">Starting</a> section. 
@@ -49,7 +49,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_EXIT.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="reference.html#header.boost.local.config_hpp"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="boost/local/function.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/local/libs/local/doc/html/boost_local/Advanced.html
==============================================================================
--- sandbox/local/libs/local/doc/html/boost_local/Advanced.html (original)
+++ sandbox/local/libs/local/doc/html/boost_local/Advanced.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -194,7 +194,7 @@
 )
</pre>

- Consider the following complete example: [<a name="id875947" href="#ftn.id875947" class="footnote">15</a>]
+ Consider the following complete example: [<a name="id876719" href="#ftn.id876719" class="footnote">15</a>]
 


@@ -213,24 +213,20 @@
typedef int const& sign_t;

int main() {
- BOOST_LOCAL_FUNCTION(
- (void) (print)(
+ void BOOST_LOCAL_FUNCTION_NAME(
 // Identity macors handle commas.
- (BOOST_IDENTITY_TYPE((const std::map<std::string, size_t>&)))(m)
- (const size_t&)(factor)(default)
- (BOOST_IDENTITY_VALUE((key_size<std::string, size_t>::value)))
- (const std::string&)(separator)(default)(cat(":", " "))
+ (BOOST_IDENTITY_TYPE((const std::map<std::string, size_t>))& m)
+ (const size_t& factor)(default // Or just use `(default (...))`.
+ BOOST_IDENITY_VALUE((key_size<std::string, size_t>::value)))
+ (const std::string& separator)(default cat(":", " "))
 // Also, identity macors handle leading symbols.
- (BOOST_IDENTITY_TYPE((::sign_t)))(sign)(default)
- (BOOST_IDENTITY_VALUE((-1)))
- )
- ) {
+ (BOOST_IDENTITY_TYPE((::sign_t)) sign)(default -1) ) {
 for (std::map<std::string, size_t>::const_iterator i = m.begin();
 i != m.end(); ++i) {
 std::cout << i->first << separator <<
 sign * int(i->second) * int(factor) << std::endl;
 }
- } BOOST_LOCAL_FUNCTION_END(print)
+ } BOOST_LOCAL_FUNCTION_NAME(print)

 std::map<std::string, size_t> sizes;
 sizes["a"] = 1; sizes["ab"] = 2; sizes["abc"] = 3;
@@ -264,30 +260,24 @@
#include <vector>

int main () {
- std::vector<int> v;
- v.resize(3);
- v[0] = 1; v[1] = 4; v[2] = 7;
- std::ostringstream factorials;
+ std::ostringstream output;

- BOOST_LOCAL_FUNCTION(
- (int) (factorial)(
- (int)(n)
- (bool)(recursion)(default)(false)
- (bind)((&factorials))
- )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (int n) (bool recursion)(default false)
+ (bind& output) ) {
 int result = 0;

 if (n < 2 ) result = 1;
 else result = n * factorial(n - 1, true); // Recursive call.

- if (!recursion) factorials << result << " ";
+ if (!recursion) output << result << " ";
 return result;
- } BOOST_LOCAL_FUNCTION_END(factorial)
+ } BOOST_LOCAL_FUNCTION_NAME(factorial)

+ std::vector<int> v(3);
+ v[0] = 1; v[1] = 4; v[2] = 7;
 std::for_each(v.begin(), v.end(), factorial);
- std::cout << factorials.str() << std::endl;

+ std::cout << output.str() << std::endl;
 return 0;
}
</pre>
@@ -295,9 +285,9 @@
 

 The original local function name as specified in the parenthesized signature
- passed to <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>
+ passed to <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>
 must always be used for recursive calls even when the function is renamed
- using <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>
+ using <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>
 (see renamed local functions later in this section).
 
</div>
@@ -391,14 +381,9 @@
#include <iostream>

int main() {
- BOOST_LOCAL_FUNCTION(
- (inline) (int) (add)( // Inlined local function.
- (auto)(int)(x) // Auto parameter.
- (register)(int)(y) // Register parameter.
- )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (auto int x) (register int y) ) {
 return x + y;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 std::cout << add(3, 5) << std::endl;

@@ -426,22 +411,22 @@
 Local functions are never copied by value. You can only obtain a reference
 to a local function therefore you need to make sure that the local function survives the scope of its reference
 otherwise the reference will be invalid and its use will generate a run-time
- error (as usual with C++ references). [<a name="id880468" href="#ftn.id880468" class="footnote">16</a>]
+ error (as usual with C++ references). [<a name="id881035" href="#ftn.id881035" class="footnote">16</a>]
 </td></tr>
</table></div>

 For this purpose, it is possible to assign a <code class="computeroutput">boost::function</code>
 functor to a local function (see also Boost.Function).
- However, it is in general preferable to use the <code class="computeroutput">boost::local::<a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>
+ However, it is in general preferable to use the <code class="computeroutput">boost::local::function_ref</code>
 functor instead because its API also supports default parameters.
 

- The <code class="computeroutput">boost::local::<a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code> template
+ The <code class="computeroutput">boost::local::function_ref</code> template
 takes two parameters (see the Reference
 section):
 
<pre class="programlisting">template<typename F, size_t defaults = 0>
-class <code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code> { ... };
+class <code class="computeroutput">function_ref</code> { ... };
</pre>

 Where:
@@ -451,8 +436,8 @@
 specifies the function signature using the same syntax as Boost.Function's
 preferred syntax. For example:
 </li></ul></div>
-<pre class="programlisting"><code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>< int() > // Returns `int` and takes no parameter.
-<code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>< int(double, char) > // Returns `int`and takes two parameters: a `double` followed by a `char`.
+<pre class="programlisting"><code class="computeroutput">function_ref</code>< int() > // Returns `int` and takes no parameter.
+<code class="computeroutput">function_ref</code>< int(double, char) > // Returns `int`and takes two parameters: a `double` followed by a `char`.
</pre>
<div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 The template parameter <code class="computeroutput">defaults</code>
@@ -466,9 +451,9 @@
 This template parameter is optional and it is <code class="computeroutput">0</code>
 by default. For example:
 </li></ul></div>
-<pre class="programlisting"><code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>< int(double, char) > // No default: All parameters must be specified.
-<code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>< int(double, char), 1 > // 1 default: The last `char` parameter is optional.
-<code class="computeroutput"><a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code>< int(double, char), 2 > // 2 defaults: All parameters are optional.
+<pre class="programlisting"><code class="computeroutput">function_ref</code>< int(double, char) > // No default: All parameters must be specified.
+<code class="computeroutput">function_ref</code>< int(double, char), 1 > // 1 default: The last `char` parameter is optional.
+<code class="computeroutput">function_ref</code>< int(double, char), 2 > // 2 defaults: All parameters are optional.
</pre>

 For example:
@@ -476,14 +461,13 @@



-<pre class="programlisting">#include <boost/local/function_ref.hpp>
-#include <boost/local/function.hpp>
+<pre class="programlisting">#include <boost/local/function.hpp>
#include <boost/function.hpp>
#include <iostream>

-// Using `function_ref` allows to use the same functor for all calls
-// (regardless of which set of default parameters is specified).
-void doit(boost::local::function_ref< int (int, int), 2 > l) {
+// Using `function` allows to use the same functor for all calls (regardless of
+// which set of default parameters is specified).
+void doit(boost::local::function< int (int, int), 2 > l) {
 std::cout << l(1, 2) << std::endl;
 std::cout << l(1) << std::endl;
 std::cout << l() << std::endl;
@@ -502,15 +486,13 @@
 {
 int i = 2;

- BOOST_LOCAL_FUNCTION(
- (int) (linear)( (int)(x)(default)(1) (int)(y)(default)(2)
- (bind)( (i) ) )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (int x)(default 1) (int y)(default 2)
+ (bind i) ) {
 return x + i * y;
- } BOOST_LOCAL_FUNCTION_END(linear)
+ } BOOST_LOCAL_FUNCTION_NAME(linear)

 // Assign local functions variables.
- boost::local::function_ref< int (int, int), 2 > l = linear;
+ boost::local::function< int (int, int), 2 > l = linear;
 l(1, 2); l(1); l(); // All calls because of default parameters.
 l2 = linear;
 l2(1, 2); // Only one call operation (without default parameters).
@@ -539,33 +521,33 @@
 Local Functions</a>
</h3></div></div></div>

- Local functions can be renamed using the <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>
- macro instead of <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>:
+ Local functions can be renamed using the <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>
+ macro instead of <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>:
 
-<pre class="programlisting"><code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>(new-local-function-name)
+<pre class="programlisting"><code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>(new-local-function-name)
</pre>

 Where the new-local-function-name no longer has to match
 the local function name as originally specified in the parenthesized signature
- passed to <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>.
- For example: [<a name="id883170" href="#ftn.id883170" class="footnote">17</a>]
+ passed to <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>.
+ For example: [<a name="id883549" href="#ftn.id883549" class="footnote">17</a>]
 
<pre class="programlisting">{
- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>(
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>(
 (void) (l)( (int)(x) )
 ) {
 ... // Body uses original name `l`.
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>(m) // Renamed to `m`.
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>(m) // Renamed to `m`.

 ... // Enclosing scope uses new name `m`.
}
</pre>

- Note that the local function is renamed only after the call to <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>.
+ Note that the local function is renamed only after the call to <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>.
 Therefore, within the local function body the original local function name
- as specified by <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>
+ as specified by <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>
 must be used (e.g., to recursively call the local function). However, within
- the enclosing scope only the new local function name as specified by <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>
+ the enclosing scope only the new local function name as specified by <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>
 is available.
 

@@ -605,7 +587,7 @@

 
<a name="boost_local.Advanced.renaming_local_functions.motivation"></a><h6>
-<a name="id884117"></a>
+<a name="id884469"></a>
 <a class="link" href="Advanced.html#boost_local.Advanced.renaming_local_functions.motivation">Motivation</a>
 </h6>

@@ -672,70 +654,70 @@
 to usual features of C++ functions.
 
<a name="boost_local.Advanced.limitations__overloading__nesting__operators__etc.overloading"></a><h6>
-<a name="id885108"></a>
+<a name="id885459"></a>
 <a class="link" href="Advanced.html#boost_local.Advanced.limitations__overloading__nesting__operators__etc.overloading">Overloading</a>
 </h6>

 It is not possible to overload local functions. Declaring multiple local
 functions with the same name within the same enclosing scope generates a
 compile-time error (even if the different declarations specify different
- parameters). [<a name="id885128" href="#ftn.id885128" class="footnote">18</a>]
+ parameters). [<a name="id885479" href="#ftn.id885479" class="footnote">18</a>]
 

 For example, the following code will not
 compile:
 
<pre class="programlisting">void f() {
- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>(
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>(
 (void) (l)( (const int&)(i) )
 ) {
 std::cout << i << std::endl;
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(l)
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(l)

- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>(
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>(
 (void) (l)( (const double&)(d) )
 ) {
 std::cout << d << std::endl;
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(l) // Error: Cannot overload.
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(l) // Error: Cannot overload.

 ...
}
</pre>
<a name="boost_local.Advanced.limitations__overloading__nesting__operators__etc.nesting"></a><h6>
-<a name="id885592"></a>
+<a name="id885921"></a>
 <a class="link" href="Advanced.html#boost_local.Advanced.limitations__overloading__nesting__operators__etc.nesting">Nesting</a>
 </h6>

 It is not possible to nest local functions, local blocks, or local exits
- within each other. Nesting will generate a compile-time error. [<a name="id885614" href="#ftn.id885614" class="footnote">19</a>]
+ within each other. Nesting will generate a compile-time error. [<a name="id885943" href="#ftn.id885943" class="footnote">19</a>]
 

 For example, the following code will not
 compile:
 
<pre class="programlisting">void f() {
- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>(
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>(
 (int) (l)( (int)(i) )
 ) {
- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>( // Error: Cannot nest.
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>( // Error: Cannot nest.
 (int) (m)( (int)(j) )
 ) {
 return j * 10;
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(m)
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(m)

 return m(i) * 10;
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(l)
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(l)

 ...
}
</pre>
<a name="boost_local.Advanced.limitations__overloading__nesting__operators__etc.operators"></a><h6>
-<a name="id886036"></a>
+<a name="id886343"></a>
 <a class="link" href="Advanced.html#boost_local.Advanced.limitations__overloading__nesting__operators__etc.operators">Operators</a>
 </h6>

 Local functions cannot be operators. Naming a local function <code class="computeroutput">operator...</code>
- will generate a compile-time error. [<a name="id886073" href="#ftn.id886073" class="footnote">20</a>]
+ will generate a compile-time error. [<a name="id886380" href="#ftn.id886380" class="footnote">20</a>]
 

 For example, the following code will not
@@ -747,17 +729,17 @@
 double y;
 };

- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>( // Error: Cannot be `operator==`.
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>( // Error: Cannot be `operator==`.
 (bool) (operator==)( (const point&)(p) (const point&)(q) )
 ) {
 return p.x == q.x && p.y == q.y;
- ) <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(operator==)
+ ) <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(operator==)

 ...
}
</pre>
<a name="boost_local.Advanced.limitations__overloading__nesting__operators__etc.etc"></a><h6>
-<a name="id886479"></a>
+<a name="id886775"></a>
 <a class="link" href="Advanced.html#boost_local.Advanced.limitations__overloading__nesting__operators__etc.etc">Etc</a>
 </h6>

@@ -1062,39 +1044,39 @@
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id875947" href="#id875947" class="para">15</a>] 
+<div class="footnote">[<a id="ftn.id876719" href="#id876719" class="para">15</a>] 
 We recognize that the use of the identity macros adds
 extra parenthesis to the already significant number of parenthesis required
 by the parenthesized syntax. However, parenthesized signatures usually
 do not contain unwrapped commas "<code class="computeroutput">,</code>"
 (unless template metaprogramming is being used).
 </div>
-<div class="footnote">[<a id="ftn.id880468" href="#id880468" class="para">16</a>] 
- The suffix <code class="computeroutput">ref</code> of <code class="computeroutput">boost::local::<a class="link" href="../boost/local/function_ref.html" title="Struct template function_ref">function_ref</a></code> is meant
+<div class="footnote">[<a id="ftn.id881035" href="#id881035" class="para">16</a>] 
+ The suffix <code class="computeroutput">ref</code> of <code class="computeroutput">boost::local::function_ref</code> is meant
 to help programmers remember that they are dealing with references to
 (and not copies of) local functions.
 </div>
-<div class="footnote">[<a id="ftn.id883170" href="#id883170" class="para">17</a>] 
+<div class="footnote">[<a id="ftn.id883549" href="#id883549" class="para">17</a>] 
 Rationale. Local functions are often named
 <code class="computeroutput">l</code> in the casual examples
 of this documentation because the name of the author starts with the letter
 "<code class="computeroutput">l</code>". <img src="../../images/smiley.png" alt="smiley">
 </div>
-<div class="footnote">[<a id="ftn.id885128" href="#id885128" class="para">18</a>] 
+<div class="footnote">[<a id="ftn.id885479" href="#id885479" class="para">18</a>] 
 Rationale. This is because a local function
 is a functor object declared as a local variable within the enclosing scope.
 Therefore, declaring two local functions with the same name within the
 same enclosing scope declares two local variables with the same name within
 the same scope and that is not allowed in C++.
 </div>
-<div class="footnote">[<a id="ftn.id885614" href="#id885614" class="para">19</a>] 
+<div class="footnote">[<a id="ftn.id885943" href="#id885943" class="para">19</a>] 
 Rationale. This is because within a nested
 code block only global or static variables can be accessed while Boost.ScopeExit
 variable <a href="http://lists.boost.org/Archives/boost/2006/11/113658.php" target="_top">binding
 mechanism</a> requires to access local variables that hold the bound
 variables.
 </div>
-<div class="footnote">[<a id="ftn.id886073" href="#id886073" class="para">20</a>] 
+<div class="footnote">[<a id="ftn.id886380" href="#id886380" class="para">20</a>] 
 Rationale. This is the because a local
 function name must be a valid local variable name (the local variable to
 hold the local functor object) and operators cannot be used as local variable

Modified: sandbox/local/libs/local/doc/html/boost_local/Grammar.html
==============================================================================
--- sandbox/local/libs/local/doc/html/boost_local/Grammar.html (original)
+++ sandbox/local/libs/local/doc/html/boost_local/Grammar.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -70,9 +70,9 @@
 Macros using the parenthesized syntax (see the Reference
 section):
 
-<pre class="programlisting"><code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>( parenthesized-signature )
-<code class="computeroutput"><a class="link" href="../BOOST_LOCAL_BLOCK.html" title="Macro BOOST_LOCAL_BLOCK">BOOST_LOCAL_BLOCK</a></code>( parenthesized-binding )
-<code class="computeroutput"><a class="link" href="../BOOST_LOCAL_EXIT.html" title="Macro BOOST_LOCAL_EXIT">BOOST_LOCAL_EXIT</a></code>( parenthesized-binding )
+<pre class="programlisting"><code class="computeroutput">BOOST_LOCAL_FUNCTION</code>( parenthesized-signature )
+<code class="computeroutput">BOOST_LOCAL_BLOCK</code>( parenthesized-binding )
+<code class="computeroutput">BOOST_LOCAL_EXIT</code>( parenthesized-binding )
</pre>

 Additional "keywords":
@@ -132,7 +132,7 @@
 (default)(parameter-default) // Default value for this optional parameter.
</pre>

- Binding variables in scope: [<a name="id892436" href="#ftn.id892436" class="footnote">21</a>] [<a name="id892741" href="#ftn.id892741" class="footnote">22</a>]
+ Binding variables in scope: [<a name="id890813" href="#ftn.id890813" class="footnote">21</a>] [<a name="id891118" href="#ftn.id891118" class="footnote">22</a>]
 
<pre class="programlisting">bindings:
 const-bindings // Only constant binding.
@@ -151,7 +151,7 @@
</pre>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id892436" href="#id892436" class="para">21</a>] 
+<div class="footnote">[<a id="ftn.id890813" href="#id890813" class="para">21</a>] 
 Rationale. The alternative syntax <code class="computeroutput">(bind)((const& x)...)</code>
 would have been preferred because <code class="computeroutput">const</code>
 appears before the reference as usual in C++ and because a single <code class="computeroutput">bind</code> sequence is used for both plain and
@@ -172,7 +172,7 @@
 symbol <code class="computeroutput">&</code> never appears in
 the back).
 </div>
-<div class="footnote">[<a id="ftn.id892741" href="#id892741" class="para">22</a>] 
+<div class="footnote">[<a id="ftn.id891118" href="#id891118" class="para">22</a>] 
 Rationale. Binding is used within the function
 parameter list because this syntax seemed natural given that the bound variables
 are used by the function body as if they were function parameters (only their

Modified: sandbox/local/libs/local/doc/html/boost_local/Rationale.html
==============================================================================
--- sandbox/local/libs/local/doc/html/boost_local/Rationale.html (original)
+++ sandbox/local/libs/local/doc/html/boost_local/Rationale.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -1018,7 +1018,7 @@
 Default parameter values are not part of the type so it is not possible
 to program a metafunction that counts the number of default parameter
 values at compile-time but such information is also needed by the local
- functions in order to properly support default parameters. [<a name="id900828" href="#ftn.id900828" class="footnote">23</a>]
+ functions in order to properly support default parameters. [<a name="id899064" href="#ftn.id899064" class="footnote">23</a>]
 </li>
</ol></div>

@@ -1037,7 +1037,7 @@
 Note that the <code class="computeroutput">=</code> symbol needs
 to be replaced with the alphanumeric keyword <code class="computeroutput">default</code>
 because parenthesized syntax elements cannot start with a non alphanumeric
- symbol like <code class="computeroutput">=</code>. [<a name="id901227" href="#ftn.id901227" class="footnote">24</a>]
+ symbol like <code class="computeroutput">=</code>. [<a name="id899464" href="#ftn.id899464" class="footnote">24</a>]
 

 For C99, some or all the parenthesis can be replaced by commas.
@@ -1215,7 +1215,7 @@
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id900828" href="#id900828" class="para">23</a>] 
+<div class="footnote">[<a id="ftn.id899064" href="#id899064" class="para">23</a>] 
 Specifically, the number of default parameter value is needed at
 compile-time to instantiate the proper <code class="computeroutput">function_ref<typename
 F,
@@ -1224,7 +1224,7 @@
 functor is needed to implement the trick that allows local functions
 to be passed as template parameters (see http://lists.boost.org/Archives/boost/2010/09/170888.php).
 </div>
-<div class="footnote">[<a id="ftn.id901227" href="#id901227" class="para">24</a>] 
+<div class="footnote">[<a id="ftn.id899464" href="#id899464" class="para">24</a>] 
 This is because the parenthesized syntax needs to check if its token
 matches a keyword like <code class="computeroutput">void</code>,
 <code class="computeroutput">inline</code>, etc. This checking

Modified: sandbox/local/libs/local/doc/html/boost_local/Starting.html
==============================================================================
--- sandbox/local/libs/local/doc/html/boost_local/Starting.html (original)
+++ sandbox/local/libs/local/doc/html/boost_local/Starting.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -175,9 +175,9 @@
 The header files of this library are divided as follow:
 
<pre class="programlisting"><code class="computeroutput"><a class="link" href="../reference.html#header.boost.local.function_hpp" title="Header <boost/local/function.hpp>">boost/local/function.hpp</a></code> local functions
-<code class="computeroutput"><a class="link" href="../reference.html#header.boost.local.block_hpp" title="Header <boost/local/block.hpp>">boost/local/block.hpp</a></code> local blocks
-<code class="computeroutput"><a class="link" href="../reference.html#header.boost.local.exit_hpp" title="Header <boost/local/exit.hpp>">boost/local/exit.hpp</a></code> local exits
-<code class="computeroutput"><a class="link" href="../reference.html#header.boost.local.function_ref_hpp" title="Header <boost/local/function_ref.hpp>">boost/local/function_ref.hpp</a></code> references to local functions
+<code class="computeroutput">boost/local/block.hpp</code> local blocks
+<code class="computeroutput">boost/local/exit.hpp</code> local exits
+<code class="computeroutput">boost/local/function_ref.hpp</code> references to local functions
</pre>
</div>
<div class="section">
@@ -186,7 +186,7 @@
</h3></div></div></div>

 The following symbols are part of the library private API, they are not documented,
- and they should not be directly used by programmers: [<a name="id864005" href="#ftn.id864005" class="footnote">1</a>]
+ and they should not be directly used by programmers: [<a name="id865071" href="#ftn.id865071" class="footnote">1</a>]
 
<div class="itemizedlist"><ul class="itemizedlist" type="disc">
<li class="listitem">
@@ -226,7 +226,7 @@
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id864005" href="#id864005" class="para">1</a>] 
+<div class="footnote">[<a id="ftn.id865071" href="#id865071" class="para">1</a>] 
 Rationale. This library concatenates symbols
 specified by the programmers (e.g., the local function name) with other
 symbols (e.g., special prefixes or preprocessor line numbers) to make internal

Modified: sandbox/local/libs/local/doc/html/boost_local/Tutorial.html
==============================================================================
--- sandbox/local/libs/local/doc/html/boost_local/Tutorial.html (original)
+++ sandbox/local/libs/local/doc/html/boost_local/Tutorial.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -67,17 +67,17 @@
 are:
 

- 1. Wrap all the signature syntactic elements within parenthesis <code class="computeroutput">()</code>. [<a name="id864328" href="#ftn.id864328" class="footnote">2</a>]
+ 1. Wrap all the signature syntactic elements within parenthesis <code class="computeroutput">()</code>. [<a name="id865394" href="#ftn.id865394" class="footnote">2</a>]
 

 2. If a token does not start with an alphanumeric symbol (i.e., <code class="computeroutput">a-z</code>,
 <code class="computeroutput">A-Z</code>, or <code class="computeroutput">0-9</code>), replace
 the token with its alphanumeric equivalent (as indicated in the <a class="link" href="Grammar.html" title="Appendix: Grammar">Grammar</a>
- section). [<a name="id864455" href="#ftn.id864455" class="footnote">3</a>]
+ section). [<a name="id865521" href="#ftn.id865521" class="footnote">3</a>]
 

 3. Empty parenthesis <code class="computeroutput">()</code> are
- not allowed. [<a name="id864491" href="#ftn.id864491" class="footnote">4</a>]
+ not allowed. [<a name="id865557" href="#ftn.id865557" class="footnote">4</a>]
 

 4. Spaces and newlines do not matter and they can be used anywhere.
@@ -162,11 +162,11 @@
 (see the <a class="link" href="Grammar.html" title="Appendix: Grammar">Grammar</a> section). When
 syntactic errors can be detected by the parsing macros, they are raised
 at compile-time using error messages of the form <code class="computeroutput">ERROR_</code>description_text.
- [<a name="id865437" href="#ftn.id865437" class="footnote">5</a>]
+ [<a name="id866504" href="#ftn.id866504" class="footnote">5</a>]
 </td></tr>
</table></div>
<a name="boost_local.Tutorial.parenthesized_syntax.functions_with_no_parameters"></a><h6>
-<a name="id865476"></a>
+<a name="id866543"></a>
 <a class="link" href="Tutorial.html#boost_local.Tutorial.parenthesized_syntax.functions_with_no_parameters">Functions
 With No Parameters</a>
 </h6>
@@ -233,11 +233,11 @@
<pre class="programlisting">{ // Some declarative context.
 ...

- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>(
+ <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>(
 parenthesized-signature
 ) {
 local-function-body
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>(local-function-name)
+ } <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>(local-function-name)

 ...
}
@@ -254,7 +254,7 @@
 </li>
<li class="listitem">
 The local function signature is expressed using the parenthesized syntax
- and passed to the <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>
+ and passed to the <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>
 macro.
 </li>
<li class="listitem">
@@ -262,14 +262,14 @@
 ... }</code>
 using the usual C++ syntax. The body is specified outside any of the
 macros so eventual compiler error messages and line numbers retain their
- usual meaning. [<a name="id865969" href="#ftn.id865969" class="footnote">6</a>]
+ usual meaning. [<a name="id867024" href="#ftn.id867024" class="footnote">6</a>]
 </li>
<li class="listitem">
- The macro <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>
+ The macro <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>
 is used to end the local function definition and it must repeat the local
- function name. [<a name="id866003" href="#ftn.id866003" class="footnote">7</a>] The compiler will generate an error if the name specified
+ function name. [<a name="id867054" href="#ftn.id867054" class="footnote">7</a>] The compiler will generate an error if the name specified
 by this macro does not match the one from the local function signature
- (see <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a></code>
+ (see <code class="computeroutput">BOOST_LOCAL_FUNCTION_END_RENAME</code>
 to remove this constraint).
 </li>
</ul></div>
@@ -290,10 +290,10 @@
 is explained later in this section).
 

- Then we pass the parenthesized signature to the <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>
+ Then we pass the parenthesized signature to the <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>
 macro, we implement a simple body that prints the number, and we pass the
 local function name <code class="computeroutput">add</code> to
- the <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>
+ the <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>
 macro:
 

@@ -303,14 +303,11 @@
#include <iostream>

int main() {
- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) ) {
 std::clog << num << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 add(100.0);
-
 return 0;
}
</pre>
@@ -333,7 +330,7 @@
 be bound by reference, by constant reference, by value, or by constant value.
 The types of bound variables are automatically deduced by this library using
 <a href="http://www.boost.org/doc/libs/release/doc/html/typeof.html" target="_top">Boost.Typeof</a>.
- [<a name="id866621" href="#ftn.id866621" class="footnote">8</a>]
+ [<a name="id867618" href="#ftn.id867618" class="footnote">8</a>]
 
<div class="important"><table border="0" summary="Important">
<tr>
@@ -420,28 +417,25 @@
int main() {
 double sum = 0.0;

- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) (bind)((&sum)) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) (bind& sum) ) {
 sum += num;
 std::clog << "Summed: " << sum << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 add(100.0);
-
 return 0;
}
</pre>

 
<a name="boost_local.Tutorial.binding.constant_binding"></a><h6>
-<a name="id867555"></a>
+<a name="id868521"></a>
 <a class="link" href="Tutorial.html#boost_local.Tutorial.binding.constant_binding">Constant Binding</a>
 </h6>

 Constant binding allows to bind variables in scope by constant reference
 or constant value (constant binding is not supported by <a href="http://en.wikipedia.org/wiki/C%2B%2B0x#Lambda_functions_and_expressions" target="_top">C++0x
- lambda</a> functions). [<a name="id867580" href="#ftn.id867580" class="footnote">9</a>]
+ lambda</a> functions). [<a name="id868545" href="#ftn.id868545" class="footnote">9</a>]
 

 The parenthesized syntax uses the "keywords" <code class="computeroutput">const
@@ -501,22 +495,20 @@
 double sum = 0.0;
 int factor = 10;

- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) (const bind)((factor)) (bind)((&sum)) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) (const bind factor)
+ (bind& sum) ) {
 sum += factor * num;
 std::clog << "Summed: " << sum << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 add(100.0);
-
 return 0;
}
</pre>

 
<a name="boost_local.Tutorial.binding.binding_the_object__code__phrase_role__keyword__this__phrase___code_"></a><h6>
-<a name="id868895"></a>
+<a name="id869810"></a>
 <a class="link" href="Tutorial.html#boost_local.Tutorial.binding.binding_the_object__code__phrase_role__keyword__this__phrase___code_">Binding
 the Object <code class="computeroutput">this</code></a>
 </h6>
@@ -565,10 +557,10 @@
 to a local function, the local function body must
 use the special symbol <code class="computeroutput">this_</code>
 (instead of <code class="computeroutput">this</code>) to access
- the bound object. [<a name="id869250" href="#ftn.id869250" class="footnote">10</a>] Using <code class="computeroutput">this</code> within
+ the bound object. [<a name="id870165" href="#ftn.id870165" class="footnote">10</a>] Using <code class="computeroutput">this</code> within
 the local function body will generate a compile-time error so programmers
 cannot mistakenly confuse the use of <code class="computeroutput">this_</code>
- with <code class="computeroutput">this</code>. [<a name="id869349" href="#ftn.id869349" class="footnote">11</a>]
+ with <code class="computeroutput">this</code>. [<a name="id870268" href="#ftn.id870268" class="footnote">11</a>]
 </td></tr>
</table></div>

@@ -591,13 +583,11 @@
 adder(): sum_(0.0) {}

 double sum(const std::vector<double>& nums, const int& factor = 10) {
-
- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) (const bind)((factor)) (bind)((this)) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) (const bind factor)
+ (bind this) ) {
 this_->sum_ += factor * num; // Use `this_` instead of `this`.
 std::clog << "Summed: " << this_->sum_ << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 std::for_each(nums.begin(), nums.end(), add);
 return sum_;
@@ -632,9 +622,9 @@
<pre class="programlisting">{ // Some declarative context.
 ...

- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_BLOCK.html" title="Macro BOOST_LOCAL_BLOCK">BOOST_LOCAL_BLOCK</a></code>( parenthesized-binding ) {
+ <code class="computeroutput">BOOST_LOCAL_BLOCK</code>( parenthesized-binding ) {
 block-body
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_BLOCK_END.html" title="Macro BOOST_LOCAL_BLOCK_END">BOOST_LOCAL_BLOCK_END</a></code>
+ } <code class="computeroutput">BOOST_LOCAL_BLOCK_END</code>

 ...
}
@@ -681,7 +671,7 @@
 A <code class="computeroutput">return;</code>
 instruction from within a local block jumps to the end of the local block
 body and it does not return the enclosing scope.
- [<a name="id870874" href="#ftn.id870874" class="footnote">12</a>]
+ [<a name="id871709" href="#ftn.id871709" class="footnote">12</a>]
 </td></tr>
</table></div>

@@ -723,9 +713,9 @@
<pre class="programlisting">{ // Some declarative context.
 ...

- <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_EXIT.html" title="Macro BOOST_LOCAL_EXIT">BOOST_LOCAL_EXIT</a></code>( parenthesized-binding ) {
+ <code class="computeroutput">BOOST_LOCAL_EXIT</code>( parenthesized-binding ) {
 exit-body
- } <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_EXIT_END.html" title="Macro BOOST_LOCAL_EXIT_END">BOOST_LOCAL_EXIT_END</a></code>
+ } <code class="computeroutput">BOOST_LOCAL_EXIT_END</code>

 ...
}
@@ -782,7 +772,7 @@

 Local exits are very similar to the functionality already provided by Boost.ScopeExit
 with the addition that they also support constant binding and the binding
- of the object <code class="computeroutput">this</code>. [<a name="id872167" href="#ftn.id872167" class="footnote">13</a>]
+ of the object <code class="computeroutput">this</code>. [<a name="id872989" href="#ftn.id872989" class="footnote">13</a>]
 
</div>
<div class="section">
@@ -793,11 +783,11 @@
 When local functions, local blocks, and local exits are programmed within
 templates, they need to be declared using the following special macros ending
 with the <code class="computeroutput">TPL</code> postfix (see
- the Reference section): [<a name="id872518" href="#ftn.id872518" class="footnote">14</a>]
+ the Reference section): [<a name="id873317" href="#ftn.id873317" class="footnote">14</a>]
 
-<pre class="programlisting"><code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_TPL.html" title="Macro BOOST_LOCAL_FUNCTION_TPL">BOOST_LOCAL_FUNCTION_TPL</a></code>( parenthesized-signature )
-<code class="computeroutput"><a class="link" href="../BOOST_LOCAL_BLOCK_TPL.html" title="Macro BOOST_LOCAL_BLOCK_TPL">BOOST_LOCAL_BLOCK_TPL</a></code>( parenthesized-binding )
-<code class="computeroutput"><a class="link" href="../BOOST_LOCAL_EXIT_TPL.html" title="Macro BOOST_LOCAL_EXIT_TPL">BOOST_LOCAL_EXIT_TPL</a></code>( parenthesized-binding )
+<pre class="programlisting"><code class="computeroutput">BOOST_LOCAL_FUNCTION_TPL</code>( parenthesized-signature )
+<code class="computeroutput">BOOST_LOCAL_BLOCK_TPL</code>( parenthesized-binding )
+<code class="computeroutput">BOOST_LOCAL_EXIT_TPL</code>( parenthesized-binding )
</pre>

 These macros have the exact same API as their equivalents without the <code class="computeroutput">TPL</code> postfix that we have seen so far. The
@@ -856,7 +846,7 @@
</div>
<div class="footnotes">
 <hr width="100" align="left">
-<div class="footnote">[<a id="ftn.id864328" href="#id864328" class="para">2</a>] 
+<div class="footnote">[<a id="ftn.id865394" href="#id865394" class="para">2</a>] 
 The parenthesized syntax owes its name to the indeed large number of
 parenthesis <code class="computeroutput">()</code> that are
 required to wrap its elements. Programmers might notice some similarities
@@ -867,17 +857,17 @@
 sequences and Boost.Preprocessor
 sequences are formed by wrapping tokens within round parenthesis <code class="computeroutput">()</code>.
 </div>
-<div class="footnote">[<a id="ftn.id864455" href="#id864455" class="para">3</a>] 
+<div class="footnote">[<a id="ftn.id865521" href="#id865521" class="para">3</a>] 
 Rationale. This constraint comes form
 the fact that the C++ preprocessor can only concatenate <code class="literal">##</code>
 alphanumeric symbols.
 </div>
-<div class="footnote">[<a id="ftn.id864491" href="#id864491" class="para">4</a>] 
+<div class="footnote">[<a id="ftn.id865557" href="#id865557" class="para">4</a>] 
 Rationale. This constraint comes from
 the fact that the ISO C++ standard preprocessor forbids empty macro parameters
 (this is different for C99 and other more recent preprocessors).
 </div>
-<div class="footnote">[<a id="ftn.id865437" href="#id865437" class="para">5</a>] 
+<div class="footnote">[<a id="ftn.id866504" href="#id866504" class="para">5</a>] 
 While there are fundamental limitations to the amount of parenthesized
 syntax error checking that can be done using the preprocessor (e.g.,
 there is no way to gracefully detect and report a missing parenthesis
@@ -888,26 +878,26 @@
 messages they experience because of parenthesized syntax errors so to
 help this development effort.
 </div>
-<div class="footnote">[<a id="ftn.id865969" href="#id865969" class="para">6</a>] 
+<div class="footnote">[<a id="ftn.id867024" href="#id867024" class="para">6</a>] 
 Rationale. If the local function body
 were instead passed as a macro parameter, it would be expanded on a
 single line of code (because macros always expand as a single line
 of code). Therefore, eventual compiler error line numbers would all
 have the same value and would no longer be useful to pinpoint the error.
 </div>
-<div class="footnote">[<a id="ftn.id866003" href="#id866003" class="para">7</a>] 
+<div class="footnote">[<a id="ftn.id867054" href="#id867054" class="para">7</a>] 
 Rationale. The local function name
- must be passed to the ending macro <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a></code>
+ must be passed to the ending macro <code class="computeroutput">BOOST_LOCAL_FUNCTION_END</code>
 so this macro can declare a local variable with the local function
 name to hold the local functor object. At the same time, the local
- function name must also be passed to the declaration macro <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a></code>
+ function name must also be passed to the declaration macro <code class="computeroutput">BOOST_LOCAL_FUNCTION</code>
 to allow the local function to recursively call itself. The local function
 declaration and ending macros are kept as two separate macros so that
 the local function body does not have to be passed as a macro parameter
 (otherwise, the compiler error line numbers will all appear on the
 same line and they will no longer be useful to pinpoint the errors).
 </div>
-<div class="footnote">[<a id="ftn.id866621" href="#id866621" class="para">8</a>] 
+<div class="footnote">[<a id="ftn.id867618" href="#id867618" class="para">8</a>] 
 Rationale. By binding a variable in scope,
 the local function declaration is specifying that such a variable should
 be accessible within the local function body regardless of its type. Semantically,
@@ -920,7 +910,7 @@
 This is especially useful for maintenance so if a bound variable type is
 changed, the local function declaration does not have to change.
 </div>
-<div class="footnote">[<a id="ftn.id867580" href="#id867580" class="para">9</a>] 
+<div class="footnote">[<a id="ftn.id868545" href="#id868545" class="para">9</a>] 
 An historical note: Constant binding of variables in scope was the main
 use case that originally motivated the authors in developing this library.
 The authors needed to locally create a chuck of code to assert some correctness
@@ -928,14 +918,14 @@
 variables they were using (see the Contract++
 library). This was achieved by binding by constant reference the variables
 needed by the assertions and then by programming the local function body
- to check the assertions (or more conveniently by using <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_BLOCK.html" title="Macro BOOST_LOCAL_BLOCK">BOOST_LOCAL_BLOCK</a></code>). This way
+ to check the assertions (or more conveniently by using <code class="computeroutput">BOOST_LOCAL_BLOCK</code>). This way
 if any of the assertions mistakenly changes a bound variable (for example
 confusing the operator <code class="computeroutput">==</code>
 with <code class="computeroutput">=</code>), the compiler correctly
 generates an error because the bound variable is of <code class="computeroutput">const</code>
 type within the local function body.
 </div>
-<div class="footnote">[<a id="ftn.id869250" href="#id869250" class="para">10</a>] 
+<div class="footnote">[<a id="ftn.id870165" href="#id870165" class="para">10</a>] 
 Rationale. This limitation comes from
 the fact that <code class="computeroutput">this</code> is a
 reserved C++ keyword so it cannot be used as the name of the internal
@@ -949,11 +939,11 @@
 behaviour of <code class="computeroutput">static_cast</code></a>
 (which might not work on all platforms at the cost of portability).
 </div>
-<div class="footnote">[<a id="ftn.id869349" href="#id869349" class="para">11</a>] 
+<div class="footnote">[<a id="ftn.id870268" href="#id870268" class="para">11</a>] 
 Rationale. This is because the body
 function is implemented as static function of the local functor class.
 </div>
-<div class="footnote">[<a id="ftn.id870874" href="#id870874" class="para">12</a>] 
+<div class="footnote">[<a id="ftn.id871709" href="#id871709" class="para">12</a>] 
 Rationale. Programmers might expect
 <code class="computeroutput">return;</code>
 to exit the enclosing function instead of the local block (or local exit),
@@ -971,11 +961,11 @@
 <code class="computeroutput">BOOST_LOCAL_RETURN;</code>)
 to exit local blocks (and local exits).
 </div>
-<div class="footnote">[<a id="ftn.id872167" href="#id872167" class="para">13</a>] 
+<div class="footnote">[<a id="ftn.id872989" href="#id872989" class="para">13</a>] 
 Rationale. This library could be merged
 together with Boost.ScopeExit
 into a new library named Boost.Scope (from the meaning of the word "scope"
- in computer programming). This would be justified by the fact that <code class="computeroutput"><a class="link" href="../BOOST_LOCAL_EXIT.html" title="Macro BOOST_LOCAL_EXIT">BOOST_LOCAL_EXIT</a></code> simply extends
+ in computer programming). This would be justified by the fact that <code class="computeroutput">BOOST_LOCAL_EXIT</code> simply extends
 the functionality already provided by <code class="computeroutput">BOOST_SCOPE_EXIT</code>.
 The headers will be <code class="computeroutput">"boost/scope/function.hpp"</code>,
 <code class="computeroutput">"boost/scope/block.hpp"</code>,
@@ -998,7 +988,7 @@
 local functions are not known under the name of "scope functions"
 (they are indeed known by the name of "local functions" or "nested functions").
 </div>
-<div class="footnote">[<a id="ftn.id872518" href="#id872518" class="para">14</a>] 
+<div class="footnote">[<a id="ftn.id873317" href="#id873317" class="para">14</a>] 
 Rationale. Within templates, this library
 needs to use <code class="computeroutput">typename</code> to explicitly
 indicate that some expressions evaluate to a type. Because C++ does not

Modified: sandbox/local/libs/local/doc/html/index.html
==============================================================================
--- sandbox/local/libs/local/doc/html/index.html (original)
+++ sandbox/local/libs/local/doc/html/index.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -27,7 +27,7 @@
</h3></div></div></div>
<div>Copyright © 2009 -2011 Lorenzo Caminiti</div>
<div><div class="legalnotice">
-<a name="id809057"></a>
+<a name="id807671"></a>
 Use, modification, and distribution is subject to the Boost Software License,
 Version 1.0 (see accompanying file LICENSE_1_0.txt or a copy at http://www.boost.org/LICENSE_1_0.txt).
 
@@ -113,7 +113,7 @@
 </li>
</ul></div>
<a name="boost_local.Introduction.an_example"></a><h6>
-<a name="id809432"></a>
+<a name="id808985"></a>
 <a class="link" href="index.html#boost_local.Introduction.an_example">An Example</a>
 </h6>

@@ -137,13 +137,82 @@
 mistakenly changing any of the variables in scope).
 </li>
</ul></div>
+<div class="informaltable"><table class="table">
+<colgroup>
+<col>
+<col>
+<col>
+</colgroup>
+<thead><tr>
+<th>
+ 
+ Notes
+ 
+ </th>
+<th>
+ 
+ Variadic Macro Syntax (C99 and later compilers)
+ 
+ </th>
+<th>
+ 
+ Sequencing Macro Syntax (all C++ compilers)
+ 
+ </th>
+</tr></thead>
+<tbody><tr>
+<td>
+ 
+
+
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting"> 1.
+
+
+
+
+
+
+
+
+
+
+
+ 2.
+ 3.
+ 4.
+
+ 5.
+ 6.
+
+
+
+ 7.
+ 8.
+
+ 9.
+
+
+10.
+
+11.
+12.
+
+13.
+
+
+
+</pre>

-
+ 
+ </td>
+<td>
+ 
+

-<pre class="programlisting"><a class="co" name="boost_local0co" href="index.html#boost_local0"><img src="../../../../doc/src/images/callouts/1.png" alt="1" border="0"></a>
-#include <boost/local/function.hpp>
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#include <boost/local/function.hpp>
#include <boost/local/block.hpp>
#include <boost/local/exit.hpp>
+
#include <algorithm>
#include <iostream>
#include <cassert>
@@ -152,134 +221,158 @@
 double sum = 0.0;
 int factor = 10;

- BOOST_LOCAL_FUNCTION( <a class="co" name="boost_local1co" href="index.html#boost_local1"><img src="../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a>
- (void) (add)( (double)(num) (const bind)((factor)) <a class="co" name="boost_local2co" href="index.html#boost_local2"><img src="../../../../doc/src/images/callouts/3.png" alt="3" border="0"></a> (bind)((&sum)) <a class="co" name="boost_local3co" href="index.html#boost_local3"><img src="../../../../doc/src/images/callouts/4.png" alt="4" border="0"></a> <spa
n class="special">)
- ) { <a class="co" name="boost_local4co" href="index.html#boost_local4"><img src="../../../../doc/src/images/callouts/5.png" alt="5" border="0"></a>
+ void BOOST_LOCAL_FUNCTION_PARAMS(double num,
+ const bind factor, bind& sum) {
 sum += factor * num;
 std::clog << "Summed: " << sum << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add) <a class="co" name="boost_local5co" href="index.html#boost_local5"><img src="../../../../doc/src/images/callouts/6.png" alt="6" border="0"></a>
- add(100.0); <a class="co" name="boost_local6co" href="index.html#boost_local6"><img src="../../../../doc/src/images/callouts/7.png" alt="7" border="0"></a>
+ } BOOST_LOCAL_FUNCTION_NAME(add)
+ add(100.0);

 size_t size = 2;
 double* nums = new double[size];
- BOOST_LOCAL_EXIT( (const bind)((&size)) (bind)((nums)) ) { <a class="co" name="boost_local7co" href="index.html#boost_local7"><img src="../../../../doc/src/images/callouts/8.png" alt="8" border="0"></a>
- if (size && nums) delete[] nums; <a class="co" name="boost_local8co" href="index.html#boost_local8"><img src="../../../../doc/src/images/callouts/9.png" alt="9" border="0"></a>
+ BOOST_LOCAL_EXIT(const bind& size, bind nums) {
+ if (size && nums) delete[] nums;
 std::clog << "Freed array: " << nums << std::endl;
- } BOOST_LOCAL_EXIT_END <a class="co" name="boost_local9co" href="index.html#boost_local9"><img src="../../../../doc/src/images/callouts/10.png" alt="10" border="0"></a>
+ } BOOST_LOCAL_EXIT_END

 nums[0] = 90.5; nums[1] = 7.0;
- std::for_each(nums, nums + size, add); <a class="co" name="boost_local10co" href="index.html#boost_local10"><img src="../../../../doc/src/images/callouts/11.png" alt="11" border="0"></a>
+ std::for_each(nums, nums + size, add); // `add` as template parameter
+
+ BOOST_LOCAL_BLOCK(const bind& sum) {
+ assert(sum == 1975.0); // so far `sum` is 10*100+10*90.5+10*7=1975
+ std::clog << "Asserted summation: " << sum << std::endl;
+ } BOOST_LOCAL_BLOCK_END
+
+ return 0;
+}
+</pre>
+
+ 
+ </td>
+<td>
+ 
+
+
+<pre xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" class="table-programlisting">#include <boost/local/function.hpp>
+#include <boost/local/block.hpp>
+#include <boost/local/exit.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <cassert>

- BOOST_LOCAL_BLOCK( (const bind)((&sum)) ) { <a class="co" name="boost_local11co" href="index.html#boost_local11"><img src="../../../../doc/src/images/callouts/12.png" alt="12" border="0"></a>
- // So far: sum = 10 * 100.0 + 10 * 90.5 + 10 * 7.0 = 1975.0
- assert(sum == 1975.0); <a class="co" name="boost_local12co" href="index.html#boost_local12"><img src="../../../../doc/src/images/callouts/13.png" alt="13" border="0"></a>
- std::clog << "Asserted summation: " << sum << std::endl;
- } BOOST_LOCAL_BLOCK_END <a class="co" name="boost_local13co" href="index.html#boost_local13"><img src="../../../../doc/src/images/callouts/14.png" alt="14" border="0"></a>
+int main() {
+ double sum = 0.0;
+ int factor = 10;
+
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num)
+ (const bind factor) (bind& sum) ) {
+ sum += factor * num;
+ std::clog << "Summed: " << sum << std::endl;
+ } BOOST_LOCAL_FUNCTION_NAME(add)
+ add(100.0);
+
+ size_t size = 2;
+ double* nums = new double[size];
+ BOOST_LOCAL_EXIT( (const bind& size) (bind nums) ) {
+ if (size && nums) delete[] nums;
+ std::clog << "Freed array: " << nums << std::endl;
+ } BOOST_LOCAL_EXIT_END
+
+ nums[0] = 90.5; nums[1] = 7.0;
+ std::for_each(nums, nums + size, add); // `add` as template parameter
+
+ BOOST_LOCAL_BLOCK( (const bind& sum) ) {
+ assert(sum == 1975.0); // so far `sum` is 10*100+10*90.5+10*7=1975
+ std::clog << "Asserted summation: " << sum << std::endl;
+ } BOOST_LOCAL_BLOCK_END

 return 0;
}
</pre>

+ 
+ </td>
+</tr></tbody>
+</table></div>
+
+ Where the notes refer to the following comments:
 
-<div class="calloutlist"><table border="0" summary="Callout list">
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local0"></a> </td>
-<td valign="top" align="left">
+<div class="orderedlist"><ol class="orderedlist" type="1">
+<li class="listitem">
 Include the header files for this library local functions, local blocks,
 and local exits.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local1"></a> </td>
-<td valign="top" align="left">
- The local function declaration macro.
- This macro takes one parameter specifying the local function signature
- using the parenthesized syntax. This syntax resembles
- the usual C++ function declaration syntax but it wraps all tokens within
- parenthesis (see the <a class="link" href="boost_local/Tutorial.html" title="Tutorial">Tutorial</a>
- section). The parenthesized syntax for local functions introduces the new
- "keyword" <code class="computeroutput">bind</code>
- which is used in place of a parameter type to indicate that the following
- sequence of parameters bind to variables in scope.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local2"></a> </td>
-<td valign="top" align="left">
- The variable <code class="computeroutput">factor</code> is
- bound by constant value so it cannot be mistakenly modified by the local
- function body.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local3"></a> </td>
-<td valign="top" align="left">
- The variable <code class="computeroutput">sum</code> is instead
- bound by non-constant reference because the local function needs to change
- its value to report the summation result to the enclosing scope.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local4"></a> </td>
-<td valign="top" align="left">
- The local function body is programmed using the usual C++ syntax.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local5"></a> </td>
-<td valign="top" align="left">
- The macro ending the local function definition (note how the local function
- name needs to be repeated here).
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local6"></a> </td>
-<td valign="top" align="left">
+ </li>
+<li class="listitem">
+ The local function parameter macro takes
+ a Boost.Preprocessor
+ sequence of tokens listing each parameter type and name wrapped within
+ round parenthesis <code class="literal">(parameter-type parameter-name)...</code>
+ (default parameter values can also specified using a special syntax, see
+ the <a class="link" href="boost_local/Tutorial.html" title="Tutorial">Tutorial</a> section). On C99
+ and later preprocessors which support variadic macros, the same parameter
+ macro also allows to specify the parameters separated by commas instead
+ that wrapped within parenthesis <code class="literal">parameter-type parameter-name,...</code>
+ so to provide a syntax more similar to the normal C++ syntax for function
+ parameter lists. The local function result type is specified just before
+ the parameter macro.
+ </li>
+<li class="listitem">
+ This library macros introduce the special "keyword" <code class="computeroutput">bind</code> which can be used instead of the
+ parameter type to bind variables in scope. Variables can be bound by value,
+ reference, constant value, and constant reference plus the object <code class="computeroutput">this</code> can be bound from within a non-static
+ member function scope (see the <a class="link" href="boost_local/Tutorial.html" title="Tutorial">Tutorial</a>
+ section). For example, the variable <code class="computeroutput">factor</code>
+ is bound by constant value so it cannot be mistakenly modified by the local
+ function body. The variable <code class="computeroutput">sum</code>
+ is instead bound by non-constant reference because the local function needs
+ to change its value to report the summation result to the enclosing scope.
+ </li>
+<li class="listitem">
+ The local function body is programmed outside the macros and using normal
+ C++ syntax. Eventual compiler error messages and line numbers retain their
+ usual meaning. Exceptions specifications can be programmed outside the
+ macro and just before the body code block <code class="computeroutput">{...}</code>
+ as usual (see the <a class="link" href="boost_local/Tutorial.html" title="Tutorial">Tutorial</a>
+ section).
+ </li>
+<li class="listitem">
+ The macro ending the local function definition specifies the local function
+ name.
+ </li>
+<li class="listitem">
 The local function macros declare a functor object local to the enclosing
- scope named <code class="computeroutput">add</code>. As indicated
- by the local function parenthesized signature, the functor <code class="computeroutput">add</code> has <code class="computeroutput">void</code>
+ scope named <code class="computeroutput">add</code>. The functor
+ <code class="computeroutput">add</code> has <code class="computeroutput">void</code>
 result type, it can be called by specifying one parameter of type <code class="computeroutput">double</code>, and it has access to the variables
- in scope <code class="computeroutput">factor</code> and <code class="computeroutput">sum</code>.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local7"></a> </td>
-<td valign="top" align="left">
+ in scope <code class="computeroutput">factor</code> (by constant
+ value) and <code class="computeroutput">sum</code> (by reference).
+ </li>
+<li class="listitem">
 The local exit declaration macro only
- specifies the variables in scope to bind (eventually as constants).
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local8"></a> </td>
-<td valign="top" align="left">
+ specifies the variables in scope to bind (by reference or value and eventually
+ as constants). Exceptions specifications can be programmed outside the
+ macro and just before the body code block <code class="computeroutput">{...}</code>
+ as usual (see the <a class="link" href="boost_local/Tutorial.html" title="Tutorial">Tutorial</a>
+ section).
+ </li>
+<li class="listitem">
 The local exit code will be automatically executed when the enclosing scope
 is exited.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local9"></a> </td>
-<td valign="top" align="left">
- A local exit is anonymous so its ending macro takes no argument.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local10"></a> </td>
-<td valign="top" align="left">
+ </li>
+<li class="listitem">
+ Local exits are anonymous so their ending macro takes no argument.
+ </li>
+<li class="listitem">
 The local function <code class="computeroutput">add</code>
- can also be passed as a template parameter to the STL <code class="computeroutput">std::for_each</code>
- algorithm.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local11"></a> </td>
-<td valign="top" align="left">
+ can also be passed as a template parameter (for example, to the STL <code class="computeroutput">std::for_each</code> algorithm).
+ </li>
+<li class="listitem">
 The local block declaration macro only
- specifies the variables in scope to bind (eventually as constants).
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local12"></a> </td>
-<td valign="top" align="left">
+ specifies the variables in scope to bind (by reference or value and eventually
+ as constants).
+ </li>
+<li class="listitem">
 The local block code is executed "in place" where it is programmed
 like a usual C++ block of code <code class="computeroutput">{
 ... }</code>.
@@ -288,19 +381,15 @@
 instead of the equality operator <code class="computeroutput">==</code>
 because the variable <code class="computeroutput">sum</code>
 is bound by constant reference so it cannot be modified.
- </td>
-</tr>
-<tr>
-<td width="5%" valign="top" align="left"><a name="boost_local13"></a> </td>
-<td valign="top" align="left">
- A local block is anonymous so its ending macro takes no argument.
- </td>
-</tr>
-</table></div>
+ </li>
+<li class="listitem">
+ Local blocks are anonymous so their ending macro takes no argument.
+ </li>
+</ol></div>
</div>
</div>
<table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left">Last revised: February 10, 2011 at 15:15:01 GMT</td>
+<td align="left">Last revised: February 22, 2011 at 22:21:50 GMT</td>
<td align="right"><div class="copyright-footer"></div></td>
</tr></table>
<hr>

Modified: sandbox/local/libs/local/doc/html/reference.html
==============================================================================
--- sandbox/local/libs/local/doc/html/reference.html (original)
+++ sandbox/local/libs/local/doc/html/reference.html 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Boost.Local 0.1.1">
<link rel="up" href="index.html" title="Boost.Local 0.1.1">
<link rel="prev" href="boost_local/Advanced.html" title="Advanced">
-<link rel="next" href="BOOST_LOCAL_BLOCK.html" title="Macro BOOST_LOCAL_BLOCK">
+<link rel="next" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html" title="Macro BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX">
</head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
<table cellpadding="2" width="100%"><tr>
@@ -20,31 +20,18 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="boost_local/Advanced.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_BLOCK.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="boost_local/Advanced.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
<div class="section">
<div class="titlepage"><div><div><h2 class="title" style="clear: both">
<a name="reference"></a>Reference</h2></div></div></div>
<div class="toc"><dl>
-<dt>Header <boost/local/block.hpp></dt>
<dt>Header <boost/local/config.hpp></dt>
-<dt>Header <boost/local/exit.hpp></dt>
<dt>Header <boost/local/function.hpp></dt>
-<dt>Header <boost/local/function_ref.hpp></dt>
<dt>Header <boost/utility/identity.hpp></dt>
</dl></div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="header.boost.local.block_hpp"></a>Header <boost/local/block.hpp></h3></div></div></div>
-Local blocks allow to program code that is executed accessing some of the variables in scope as constants. 
-<pre class="synopsis">
-
-<a class="link" href="BOOST_LOCAL_BLOCK.html" title="Macro BOOST_LOCAL_BLOCK">BOOST_LOCAL_BLOCK</a>(parenthesized_binding)
-<a class="link" href="BOOST_LOCAL_BLOCK_TPL.html" title="Macro BOOST_LOCAL_BLOCK_TPL">BOOST_LOCAL_BLOCK_TPL</a>(parenthesized_binding)
-<a class="link" href="BOOST_LOCAL_BLOCK_END.html" title="Macro BOOST_LOCAL_BLOCK_END">BOOST_LOCAL_BLOCK_END</a></pre>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
<a name="header.boost.local.config_hpp"></a>Header <boost/local/config.hpp></h3></div></div></div>
Configuration macros allow to change the behaviour of this library at compile-time. 
<pre class="synopsis">
@@ -54,32 +41,16 @@
</div>
<div class="section">
<div class="titlepage"><div><div><h3 class="title">
-<a name="header.boost.local.exit_hpp"></a>Header <boost/local/exit.hpp></h3></div></div></div>
-Local exits allow to program code that is executed when the enclosing scope is exited. 
-<pre class="synopsis">
-
-<a class="link" href="BOOST_LOCAL_EXIT.html" title="Macro BOOST_LOCAL_EXIT">BOOST_LOCAL_EXIT</a>(parenthesized_binding)
-<a class="link" href="BOOST_LOCAL_EXIT_TPL.html" title="Macro BOOST_LOCAL_EXIT_TPL">BOOST_LOCAL_EXIT_TPL</a>(parenthesized_binding)
-<a class="link" href="BOOST_LOCAL_EXIT_END.html" title="Macro BOOST_LOCAL_EXIT_END">BOOST_LOCAL_EXIT_END</a></pre>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
<a name="header.boost.local.function_hpp"></a>Header <boost/local/function.hpp></h3></div></div></div>
-Local functions allow to program functions locally within the scope where they are needed. 
+Local function references can be passed as function and template parameters, they can be assigned to variables, etc. 
<pre class="synopsis">

-<a class="link" href="BOOST_LOCAL_FUNCTION.html" title="Macro BOOST_LOCAL_FUNCTION">BOOST_LOCAL_FUNCTION</a>(parenthesized_signature)
-<a class="link" href="BOOST_LOCAL_FUNCTION_TPL.html" title="Macro BOOST_LOCAL_FUNCTION_TPL">BOOST_LOCAL_FUNCTION_TPL</a>(parenthesized_signature)
-<a class="link" href="BOOST_LOCAL_FUNCTION_END.html" title="Macro BOOST_LOCAL_FUNCTION_END">BOOST_LOCAL_FUNCTION_END</a>(local_function_name)
-<a class="link" href="BOOST_LOCAL_FUNCTION_END_RENAME.html" title="Macro BOOST_LOCAL_FUNCTION_END_RENAME">BOOST_LOCAL_FUNCTION_END_RENAME</a>(new_local_function_name)</pre>
-</div>
-<div class="section">
-<div class="titlepage"><div><div><h3 class="title">
-<a name="header.boost.local.function_ref_hpp"></a>Header <boost/local/function_ref.hpp></h3></div></div></div>
-Local function references can be passed as function and template parameters, they can be assigned to variables, etc. 
+<a class="link" href="BOOST_LOCAL_FUNCTION_PARAMS.html" title="Macro BOOST_LOCAL_FUNCTION_PARAMS">BOOST_LOCAL_FUNCTION_PARAMS</a>(...)
+<a class="link" href="BOOST_LOCAL_FUNCTION_PARAMS_TPL.html" title="Macro BOOST_LOCAL_FUNCTION_PARAMS_TPL">BOOST_LOCAL_FUNCTION_PARAMS_TPL</a>(...)
+<a class="link" href="BOOST_LOCAL_FUNCTION_NAME.html" title="Macro BOOST_LOCAL_FUNCTION_NAME">BOOST_LOCAL_FUNCTION_NAME</a>(name)</pre>
<pre class="synopsis">namespace boost {
namespace local {
- template<typename F, size_t defaults = 0> struct <a class="link" href="boost/local/function_ref.html" title="Struct template function_ref">function_ref</a>;
+ template<typename F, size_t defaults = 0> struct <a class="link" href="boost/local/function.html" title="Struct template function">function</a>;
}
}</pre>
</div>
@@ -104,7 +75,7 @@
</tr></table>
<hr>
<div class="spirit-nav">
-<a accesskey="p" href="boost_local/Advanced.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_BLOCK.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
+<a accesskey="p" href="boost_local/Advanced.html"><img src="../../../../doc/src/images/prev.png" alt="Prev"></a><a accesskey="u" href="index.html"><img src="../../../../doc/src/images/up.png" alt="Up"></a><a accesskey="h" href="index.html"><img src="../../../../doc/src/images/home.png" alt="Home"></a><a accesskey="n" href="BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html"><img src="../../../../doc/src/images/next.png" alt="Next"></a>
</div>
</body>
</html>

Modified: sandbox/local/libs/local/doc/html/standalone_HTML.manifest
==============================================================================
--- sandbox/local/libs/local/doc/html/standalone_HTML.manifest (original)
+++ sandbox/local/libs/local/doc/html/standalone_HTML.manifest 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -3,19 +3,12 @@
boost_local/Tutorial.html
boost_local/Advanced.html
reference.html
-BOOST_LOCAL_BLOCK.html
-BOOST_LOCAL_BLOCK_TPL.html
-BOOST_LOCAL_BLOCK_END.html
BOOST_LOCAL_CONFIG_FUNCTION_ARITY_MAX.html
BOOST_LOCAL_CONFIG_THIS_PARAM_NAME.html
-BOOST_LOCAL_EXIT.html
-BOOST_LOCAL_EXIT_TPL.html
-BOOST_LOCAL_EXIT_END.html
-BOOST_LOCAL_FUNCTION.html
-BOOST_LOCAL_FUNCTION_TPL.html
-BOOST_LOCAL_FUNCTION_END.html
-BOOST_LOCAL_FUNCTION_END_RENAME.html
-boost/local/function_ref.html
+boost/local/function.html
+BOOST_LOCAL_FUNCTION_PARAMS.html
+BOOST_LOCAL_FUNCTION_PARAMS_TPL.html
+BOOST_LOCAL_FUNCTION_NAME.html
BOOST_IDENTITY_TYPE.html
BOOST_IDENTITY_VALUE.html
boost_local/Grammar.html

Modified: sandbox/local/libs/local/doc/jamfile.jam
==============================================================================
--- sandbox/local/libs/local/doc/jamfile.jam (original)
+++ sandbox/local/libs/local/doc/jamfile.jam 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -11,9 +11,9 @@
doxygen reference
     :
         ../../../boost/local/function.hpp
- ../../../boost/local/block.hpp
- ../../../boost/local/exit.hpp
- ../../../boost/local/function_ref.hpp
+ #../../../boost/local/block.hpp
+ #../../../boost/local/exit.hpp
+ ../../../boost/local/function.hpp
         ../../../boost/local/config.hpp
         ../../../boost/utility/identity.hpp
     :

Modified: sandbox/local/libs/local/doc/qbk/introduction.qbk
==============================================================================
--- sandbox/local/libs/local/doc/qbk/introduction.qbk (original)
+++ sandbox/local/libs/local/doc/qbk/introduction.qbk 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -34,7 +34,35 @@
* A local exit is used to automatically release the array's memory at scope exit.
* A local block is used to assert the correct final value of the summation in a constant-correct context (therefore preventing the assertion from mistakenly changing any of the variables in scope).

-[add_cpp]
+[table
+[ [Notes] [Variadic Macro Syntax (C99 and later compilers)] [Sequencing Macro Syntax (all C++ compilers)] ]
+[ [ [add_line_numbers_cpp] ] [ [add_va_cpp] ] [ [add_cpp] ] ]
+]
+
+Where the notes refer to the following comments:
+
+# Include the header files for this library local functions, local blocks, and local exits.
+# The *local function* parameter macro takes a __Boost_Preprocessor__ sequence of tokens listing each parameter type and name wrapped within round parenthesis [^(['parameter-type parameter-name])['...]] (default parameter values can also specified using a special syntax, see the __Tutorial__ section).
+On C99 and later preprocessors which support variadic macros, the same parameter macro also allows to specify the parameters separated by commas instead that wrapped within parenthesis [^['parameter-type parameter-name],['...]] so to provide a syntax more similar to the normal C++ syntax for function parameter lists.
+The local function result type is specified just before the parameter macro.
+# This library macros introduce the special "keyword" `bind` which can be used instead of the parameter type to bind variables in scope.
+Variables can be bound by value, reference, constant value, and constant reference plus the object `this` can be bound from within a non-static member function scope (see the __Tutorial__ section).
+For example, the variable `factor` is bound by constant value so it cannot be mistakenly modified by the local function body.
+The variable `sum` is instead bound by non-constant reference because the local function needs to change its value to report the summation result to the enclosing scope.
+# The local function body is programmed outside the macros and using normal C++ syntax.
+Eventual compiler error messages and line numbers retain their usual meaning.
+Exceptions specifications can be programmed outside the macro and just before the body code block `{...}` as usual (see the __Tutorial__ section).
+# The macro ending the local function definition specifies the local function name.
+# The local function macros declare a functor object local to the enclosing scope named `add`. The functor `add` has `void` result type, it can be called by specifying one parameter of type `double`, and it has access to the variables in scope `factor` (by constant value) and `sum` (by reference).
+# The *local exit* declaration macro only specifies the variables in scope to bind (by reference or value and eventually as constants).
+Exceptions specifications can be programmed outside the macro and just before the body code block `{...}` as usual (see the __Tutorial__ section).
+# The local exit code will be automatically executed when the enclosing scope is exited.
+# Local exits are anonymous so their ending macro takes no argument.
+# The local function `add` can also be passed as a template parameter (for example, to the STL `std::for_each` algorithm).
+# The *local block* declaration macro only specifies the variables in scope to bind (by reference or value and eventually as constants).
+# The local block code is executed "in place" where it is programmed like a usual C++ block of code `{ ... }`.
+In this example, the compiler will correctly generate an error if the assignment operator `=` is mistakenly used instead of the equality operator `==` because the variable `sum` is bound by constant reference so it cannot be modified.
+# Local blocks are anonymous so their ending macro takes no argument.

[endsect]

Modified: sandbox/local/libs/local/doc/qbk/local.qbk
==============================================================================
--- sandbox/local/libs/local/doc/qbk/local.qbk (original)
+++ sandbox/local/libs/local/doc/qbk/local.qbk 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -66,7 +66,9 @@
[def __BOOST_IDENTITY_VALUE__ [macroref BOOST_IDENTITY_VALUE]]
[def __function_ref__ [classref boost::local::function_ref function_ref]]

+[import ../../example/add_line_numbers.cpp]
[import ../../example/add.cpp]
+[import ../../example/add_va.cpp]
[import ../../example/add_num.cpp]
[import ../../example/add_num_sum.cpp]
[import ../../example/add_num_factor_sum.cpp]

Modified: sandbox/local/libs/local/example/add.cpp
==============================================================================
--- sandbox/local/libs/local/example/add.cpp (original)
+++ sandbox/local/libs/local/example/add.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -19,10 +19,10 @@
// function body.

//[ add_cpp
-/*< Include the header files for this library local functions, local blocks, and local exits. >*/
#include <boost/local/function.hpp>
#include <boost/local/block.hpp>
#include <boost/local/exit.hpp>
+
#include <algorithm>
#include <iostream>
#include <cassert>
@@ -31,29 +31,27 @@
 double sum = 0.0;
 int factor = 10;

- BOOST_LOCAL_FUNCTION( /*< The *local function* declaration macro. This macro takes one parameter specifying the local function signature using the /parenthesized syntax/. This syntax resembles the usual C++ function declaration syntax but it wraps all tokens within parenthesis (see the __Tutorial__ section). The parenthesized syntax for local functions introduces the new "keyword" `bind` which is used in place of a parameter type to indicate that the following sequence of parameters bind to variables in scope. >*/
- (void) (add)( (double)(num) (const bind)((factor)) /*< The variable `factor` is bound by constant value so it cannot be mistakenly modified by the local function body. >*/ (bind)((&sum)) /*< The variable `sum` is instead bound by non-constant reference because the local function needs to change its value to report the summation result to the enclosing scope. >*/ )
- ) { /*< The local function body is programmed using the usual C++ syntax. >*/
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num)
+ (const bind factor) (bind& sum) ) {
 sum += factor * num;
 std::clog << "Summed: " << sum << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add) /*< The macro ending the local function definition (note how the local function name needs to be repeated here). >*/
- add(100.0); /*< The local function macros declare a functor object local to the enclosing scope named `add`. As indicated by the local function parenthesized signature, the functor `add` has `void` result type, it can be called by specifying one parameter of type `double`, and it has access to the variables in scope `factor` and `sum`. >*/
+ } BOOST_LOCAL_FUNCTION_NAME(add)
+ add(100.0);

 size_t size = 2;
 double* nums = new double[size];
- BOOST_LOCAL_EXIT( (const bind)((&size)) (bind)((nums)) ) { /*< The *local exit* declaration macro only specifies the variables in scope to bind (eventually as constants). >*/
- if (size && nums) delete[] nums; /*< The local exit code will be automatically executed when the enclosing scope is exited. >*/
+ BOOST_LOCAL_EXIT( (const bind& size) (bind nums) ) {
+ if (size && nums) delete[] nums;
 std::clog << "Freed array: " << nums << std::endl;
- } BOOST_LOCAL_EXIT_END /*< A local exit is anonymous so its ending macro takes no argument. >*/
+ } BOOST_LOCAL_EXIT_END

 nums[0] = 90.5; nums[1] = 7.0;
- std::for_each(nums, nums + size, add); /*< The local function `add` can also be passed as a template parameter to the STL `std::for_each` algorithm. >*/
+ std::for_each(nums, nums + size, add); // `add` as template parameter

- BOOST_LOCAL_BLOCK( (const bind)((&sum)) ) { /*< The *local block* declaration macro only specifies the variables in scope to bind (eventually as constants). >*/
- // So far: sum = 10 * 100.0 + 10 * 90.5 + 10 * 7.0 = 1975.0
- assert(sum == 1975.0); /*< The local block code is executed "in place" where it is programmed like a usual C++ block of code `{ ... }`. In this example, the compiler will correctly generate an error if the assignment operator `=` is mistakenly used instead of the equality operator `==` because the variable `sum` is bound by constant reference so it cannot be modified. >*/
+ BOOST_LOCAL_BLOCK( (const bind& sum) ) {
+ assert(sum == 1975.0); // so far `sum` is 10*100+10*90.5+10*7=1975
 std::clog << "Asserted summation: " << sum << std::endl;
- } BOOST_LOCAL_BLOCK_END /*< A local block is anonymous so its ending macro takes no argument. >*/
+ } BOOST_LOCAL_BLOCK_END

 return 0;
}

Modified: sandbox/local/libs/local/example/add_num.cpp
==============================================================================
--- sandbox/local/libs/local/example/add_num.cpp (original)
+++ sandbox/local/libs/local/example/add_num.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -5,21 +5,18 @@
// (see accompanying file LICENSE_1_0.txt or a copy at
// http://www.boost.org/LICENSE_1_0.txt).

-// Simple parenthesized syntax example used by the documentation.
+// Simple example used by the documentation.

//[ add_num_cpp
#include <boost/local/function.hpp>
#include <iostream>

int main() {
- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) ) {
 std::clog << num << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 add(100.0);
-
 return 0;
}
//]

Modified: sandbox/local/libs/local/example/add_num_sum.cpp
==============================================================================
--- sandbox/local/libs/local/example/add_num_sum.cpp (original)
+++ sandbox/local/libs/local/example/add_num_sum.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -14,15 +14,12 @@
int main() {
 double sum = 0.0;

- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) (bind)((&sum)) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) (bind& sum) ) {
 sum += num;
 std::clog << "Summed: " << sum << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 add(100.0);
-
 return 0;
}
//]

Modified: sandbox/local/libs/local/example/add_optimizers.cpp
==============================================================================
--- sandbox/local/libs/local/example/add_optimizers.cpp (original)
+++ sandbox/local/libs/local/example/add_optimizers.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -5,21 +5,16 @@
// (see accompanying file LICENSE_1_0.txt or a copy at
// http://www.boost.org/LICENSE_1_0.txt).

-// Show how to use some optimizations (inlining, auto, register, etc).
+// Show how to use some optimizations (auto, register, etc).

//[add_optimizers_cpp
#include <boost/local/function.hpp>
#include <iostream>

int main() {
- BOOST_LOCAL_FUNCTION(
- (inline) (int) (add)( // Inlined local function.
- (auto)(int)(x) // Auto parameter.
- (register)(int)(y) // Register parameter.
- )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (auto int x) (register int y) ) {
return x + y;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

std::cout << add(3, 5) << std::endl;

Modified: sandbox/local/libs/local/example/add_this.cpp
==============================================================================
--- sandbox/local/libs/local/example/add_this.cpp (original)
+++ sandbox/local/libs/local/example/add_this.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -19,13 +19,11 @@
 adder(): sum_(0.0) {}

 double sum(const std::vector<double>& nums, const int& factor = 10) {
-
- BOOST_LOCAL_FUNCTION(
- (void) (add)( (double)(num) (const bind)((factor)) (bind)((this)) )
- ) {
+ void BOOST_LOCAL_FUNCTION_PARAMS( (double num) (const bind factor)
+ (bind this) ) {
 this_->sum_ += factor * num; // Use `this_` instead of `this`.
 std::clog << "Summed: " << this_->sum_ << std::endl;
- } BOOST_LOCAL_FUNCTION_END(add)
+ } BOOST_LOCAL_FUNCTION_NAME(add)

 std::for_each(nums.begin(), nums.end(), add);
 return sum_;

Modified: sandbox/local/libs/local/example/block.cpp
==============================================================================
--- sandbox/local/libs/local/example/block.cpp (original)
+++ sandbox/local/libs/local/example/block.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -15,7 +15,7 @@

     void f(int& x) { // Non-const member function so `this` is not const.
         // Non-const `this` but const `x`.
- BOOST_LOCAL_BLOCK( (const bind)((&x)) (bind)((this)) ) {
+ BOOST_LOCAL_BLOCK( (const bind& x) (bind this) ) {
             this_->x_ = x; // Non-const `this` cant be modified.
             assert(x == this_->x_); // Compiler error if `=` instead of `==`.

Modified: sandbox/local/libs/local/example/doit.cpp
==============================================================================
--- sandbox/local/libs/local/example/doit.cpp (original)
+++ sandbox/local/libs/local/example/doit.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -9,14 +9,13 @@
// Adapted from C++0x lambda papaer N2529 (added default parameters).

//[ doit_cpp
-#include <boost/local/function_ref.hpp>
#include <boost/local/function.hpp>
#include <boost/function.hpp>
#include <iostream>

-// Using `function_ref` allows to use the same functor for all calls
-// (regardless of which set of default parameters is specified).
-void doit(boost::local::function_ref< int (int, int), 2 > l) {
+// Using `function` allows to use the same functor for all calls (regardless of
+// which set of default parameters is specified).
+void doit(boost::local::function< int (int, int), 2 > l) {
 std::cout << l(1, 2) << std::endl;
 std::cout << l(1) << std::endl;
 std::cout << l() << std::endl;
@@ -35,15 +34,13 @@
 {
 int i = 2;

- BOOST_LOCAL_FUNCTION(
- (int) (linear)( (int)(x)(default)(1) (int)(y)(default)(2)
- (bind)( (i) ) )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (int x)(default 1) (int y)(default 2)
+ (bind i) ) {
 return x + i * y;
- } BOOST_LOCAL_FUNCTION_END(linear)
+ } BOOST_LOCAL_FUNCTION_NAME(linear)

 // Assign local functions variables.
- boost::local::function_ref< int (int, int), 2 > l = linear;
+ boost::local::function< int (int, int), 2 > l = linear;
 l(1, 2); l(1); l(); // All calls because of default parameters.
 l2 = linear;
 l2(1, 2); // Only one call operation (without default parameters).

Modified: sandbox/local/libs/local/example/exit.cpp
==============================================================================
--- sandbox/local/libs/local/example/exit.cpp (original)
+++ sandbox/local/libs/local/example/exit.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -66,9 +66,7 @@
 person& p = persons_.back();
 person::evolution_t checkpoint = p.evolution_;

- BOOST_LOCAL_EXIT(
- (const bind)( (checkpoint) (&p) ) (bind)( (this) )
- ) {
+ BOOST_LOCAL_EXIT( (const bind checkpoint) (const bind& p) (bind this) ) {
 if (checkpoint == p.evolution_) this_->persons_.pop_back();
 std::cout << "1st local exit" << std::endl;
 return; // Exit local scope (not enclosing function).
@@ -82,9 +80,8 @@
 // Assign new id to the person.
 world::id_t const prev_id = p.id_;
 p.id_ = next_id_++;
- BOOST_LOCAL_EXIT(
- (const bind)( (checkpoint) (prev_id) ) (bind)( (&p) (&next_id_) )
- ) {
+ BOOST_LOCAL_EXIT( (const bind checkpoint) (const bind prev_id)
+ (bind& p) (bind& next_id_) ) {
 if (checkpoint == p.evolution_) {
 next_id_ = p.id_;
 p.id_ = prev_id;

Modified: sandbox/local/libs/local/example/find_if.cpp
==============================================================================
--- sandbox/local/libs/local/example/find_if.cpp (original)
+++ sandbox/local/libs/local/example/find_if.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -30,14 +30,10 @@
 double min_salary = 100000.00;
 double u_limit = 1.1 * min_salary;

- BOOST_LOCAL_FUNCTION(
- (bool) (between)(
- (const employee&)(e)
- (const bind)( (&min_salary) (&u_limit) )
- )
- ) {
+ bool BOOST_LOCAL_FUNCTION_PARAMS( (const employee& e)
+ (const bind& min_salary) (const bind& u_limit) ) {
 return e.salary() >= min_salary && e.salary() < u_limit;
- } BOOST_LOCAL_FUNCTION_END(between)
+ } BOOST_LOCAL_FUNCTION_NAME(between)

 // Pass local function to an STL algorithm as a template paramter (this
 // cannot be done with plain member funcitons of local classes).
@@ -45,7 +41,6 @@
 employees.begin(), employees.end(), between);

 if (i != employees.end()) { std::cout << i->salary() << std::endl; }
-
 return 0;
}

Modified: sandbox/local/libs/local/example/print_map.cpp
==============================================================================
--- sandbox/local/libs/local/example/print_map.cpp (original)
+++ sandbox/local/libs/local/example/print_map.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -22,24 +22,20 @@
typedef int const& sign_t;

int main() {
- BOOST_LOCAL_FUNCTION(
- (void) (print)(
+ void BOOST_LOCAL_FUNCTION_NAME(
 // Identity macors handle commas.
- (BOOST_IDENTITY_TYPE((const std::map<std::string, size_t>&)))(m)
- (const size_t&)(factor)(default)
- (BOOST_IDENTITY_VALUE((key_size<std::string, size_t>::value)))
- (const std::string&)(separator)(default)(cat(":", " "))
+ (BOOST_IDENTITY_TYPE((const std::map<std::string, size_t>))& m)
+ (const size_t& factor)(default // Or just use `(default (...))`.
+ BOOST_IDENITY_VALUE((key_size<std::string, size_t>::value)))
+ (const std::string& separator)(default cat(":", " "))
 // Also, identity macors handle leading symbols.
- (BOOST_IDENTITY_TYPE((::sign_t)))(sign)(default)
- (BOOST_IDENTITY_VALUE((-1)))
- )
- ) {
+ (BOOST_IDENTITY_TYPE((::sign_t)) sign)(default -1) ) {
 for (std::map<std::string, size_t>::const_iterator i = m.begin();
 i != m.end(); ++i) {
 std::cout << i->first << separator <<
 sign * int(i->second) * int(factor) << std::endl;
 }
- } BOOST_LOCAL_FUNCTION_END(print)
+ } BOOST_LOCAL_FUNCTION_NAME(print)

 std::map<std::string, size_t> sizes;
 sizes["a"] = 1; sizes["ab"] = 2; sizes["abc"] = 3;

Deleted: sandbox/local/libs/local/example/same_line.cpp
==============================================================================
--- sandbox/local/libs/local/example/same_line.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
+++ (empty file)
@@ -1,21 +0,0 @@
-
-// Copyright (C) 2009-2011 Lorenzo Caminiti
-// Use, modification, and distribution is subject to the
-// Boost Software License, Version 1.0
-// (see accompanying file LICENSE_1_0.txt or a copy at
-// http://www.boost.org/LICENSE_1_0.txt).
-
-// Show that local functions can be defined on the same line of code.
-
-#include <boost/local/function.hpp>
-#include <iostream>
-
-int main() {
- BOOST_LOCAL_FUNCTION( (void) (l)( (int)(x) ) ) { std::cout << x << std::endl; } BOOST_LOCAL_FUNCTION_END(l) BOOST_LOCAL_FUNCTION( (void) (m)( (int)(x) ) ) { std::cout << x << std::endl; } BOOST_LOCAL_FUNCTION_END(m)
-
- l(1);
- m(2);
-
- return 0;
-}
-

Modified: sandbox/local/libs/local/example/transform.cpp
==============================================================================
--- sandbox/local/libs/local/example/transform.cpp (original)
+++ sandbox/local/libs/local/example/transform.cpp 2011-02-23 22:48:14 EST (Wed, 23 Feb 2011)
@@ -22,26 +22,19 @@
 w.resize(v.size());

 // w = ++v + 5 = 16 26 36 46 56
- BOOST_LOCAL_FUNCTION(
- (int) (inc)( (int)(i) (const bind)( (&offset) ) )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (int i) (const bind& offset) ) {
 // Compiler error if const `offset` modified here by mistake.
 return ++i + offset;
- } BOOST_LOCAL_FUNCTION_END(inc)
+ } BOOST_LOCAL_FUNCTION_NAME(inc)
 std::transform(v.begin(), v.end(), w.begin(), inc);

 offset = 0;

 // v = ++(v + w) + 0 = 27 47 67 87 107
- BOOST_LOCAL_FUNCTION(
- (int) (inc_sum)(
- (int)(i)
- (int)(j)
- (bind)( (inc) ) // Bind another local function.
- )
- ) {
+ int BOOST_LOCAL_FUNCTION_PARAMS( (int i) (int j)
+ (bind inc) ) { // Bind another local function.
 return inc(i + j); // Call the bound local function.
- } BOOST_LOCAL_FUNCTION_END(inc_sum)
+ } BOOST_LOCAL_FUNCTION_NAME(inc_sum)
 std::transform(v.begin(), v.end(), w.begin(), v.begin(), inc_sum);

 for (std::vector<int>::iterator i = v.begin(); i != v.end(); ++i)

Next message: lorcaminiti_at_[hidden]: "[Boost-commit] svn:boost r69229 - sandbox/local/libs/local/example"
Previous message: DDeakins_at_[hidden]: "[Boost-commit] svn:boost r69227 - in trunk/boost/chrono: . detail detail/inlined/win"

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