Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r63608 - in trunk/tools/quickbook: . test
From: daniel_james_at_[hidden]
Date: 2010-07-04 12:53:55


Author: danieljames
Date: 2010-07-04 12:53:54 EDT (Sun, 04 Jul 2010)
New Revision: 63608
URL: http://svn.boost.org/trac/boost/changeset/63608

Log:
Only store template name after correct match.

Fixes a bug where a failed template expansion would leave the template
name in template_info.
Text files modified:
   trunk/tools/quickbook/phrase.hpp | 6 +++---
   trunk/tools/quickbook/test/templates.quickbook | 3 ++-
   2 files changed, 5 insertions(+), 4 deletions(-)

Modified: trunk/tools/quickbook/phrase.hpp
==============================================================================
--- trunk/tools/quickbook/phrase.hpp (original)
+++ trunk/tools/quickbook/phrase.hpp 2010-07-04 12:53:54 EDT (Sun, 04 Jul 2010)
@@ -135,10 +135,10 @@
>> !template_args
                     ) | (
                         (actions.templates.scope
- >> eps_p
+ >> eps_p(hard_space)
                         ) [push_back_a(actions.template_info)]
- >> !(hard_space
- >> template_args)
+ >> space
+ >> !template_args
                     ) )
>> eps_p(']')
                     ;

Modified: trunk/tools/quickbook/test/templates.quickbook
==============================================================================
--- trunk/tools/quickbook/test/templates.quickbook (original)
+++ trunk/tools/quickbook/test/templates.quickbook 2010-07-04 12:53:54 EDT (Sun, 04 Jul 2010)
@@ -105,5 +105,6 @@
 [template foo 1]
 [fool]
 
-[endsect]
+[template blah 10]
 
+[endsect]


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