Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r76136 - trunk/tools/bcp
From: john_at_[hidden]
Date: 2011-12-24 12:21:10


Author: johnmaddock
Date: 2011-12-24 12:21:09 EST (Sat, 24 Dec 2011)
New Revision: 76136
URL: http://svn.boost.org/trac/boost/changeset/76136

Log:
Fix regular expression scanner to handle Boost.PP macros defined over multiple lines.
Fixes #6211.
Text files modified:
   trunk/tools/bcp/add_path.cpp | 2 +-
   1 files changed, 1 insertions(+), 1 deletions(-)

Modified: trunk/tools/bcp/add_path.cpp
==============================================================================
--- trunk/tools/bcp/add_path.cpp (original)
+++ trunk/tools/bcp/add_path.cpp 2011-12-24 12:21:09 EST (Sat, 24 Dec 2011)
@@ -335,7 +335,7 @@
    // Now we need to scan for Boost.Preprocessor includes that
    // are included via preprocessor iteration:
    //
- static const boost::regex ppfiles("^[[:blank:]]*#[[:blank:]]*define[[:blank:]]+(?:BOOST_PP_FILENAME|BOOST_PP_ITERATION_PARAMS|BOOST_PP_INDIRECT_SELF)[^\\n]+?[\"<]([^\">]+)[\">]");
+ static const boost::regex ppfiles("^[[:blank:]]*#[[:blank:]]*define[[:blank:]]+(?:BOOST_PP_FILENAME|BOOST_PP_ITERATION_PARAMS|BOOST_PP_INDIRECT_SELF)(?:[^\\n]|\\\\\\n)+?[\"<]([^\">]+)[\">]");
    i = boost::regex_token_iterator<const char*>(view.begin(), view.end(), ppfiles, 1);
    while(i != j)
    {


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