Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r49738 - trunk/boost/spirit/home/support/detail/lexer/parser
From: jamin.hanson_at_[hidden]
Date: 2008-11-14 09:58:43


Author: ben_hanson
Date: 2008-11-14 09:58:43 EST (Fri, 14 Nov 2008)
New Revision: 49738
URL: http://svn.boost.org/trac/boost/changeset/49738

Log:
Block support for icase and dot_not_newline
Text files modified:
   trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp | 13 ++++++-------
   1 files changed, 6 insertions(+), 7 deletions(-)

Modified: trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp (original)
+++ trunk/boost/spirit/home/support/detail/lexer/parser/parser.hpp 2008-11-14 09:58:43 EST (Fri, 14 Nov 2008)
@@ -1,5 +1,5 @@
 // parser.hpp
-// Copyright (c) 2007 Ben Hanson (http://www.benhanson.net/)
+// Copyright (c) 2007-2008 Ben Hanson (http://www.benhanson.net/)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -52,14 +52,13 @@
 */
     static node *parse (const CharT *start_, const CharT * const end_,
         const std::size_t id_, const std::size_t dfa_state_,
- const bool case_sensitive_, const bool dot_not_newline_,
- const std::locale &locale_, node_ptr_vector &node_ptr_vector_,
- const macro_map &macromap_, typename tokeniser::token_map &map_,
+ const regex_flags flags_, const std::locale &locale_,
+ node_ptr_vector &node_ptr_vector_, const macro_map &macromap_,
+ typename tokeniser::token_map &map_,
         bool &seen_BOL_assertion_, bool &seen_EOL_assertion_)
     {
         node *root_ = 0;
- state state_ (start_, end_, case_sensitive_, locale_,
- dot_not_newline_);
+ state state_ (start_, end_, flags_, locale_);
         token lhs_token_;
         token rhs_token_;
         token_stack token_stack_;
@@ -91,7 +90,7 @@
                 ss_ << "A syntax error occurred: '" <<
                     lhs_token_.precedence_string () <<
                     "' against '" << rhs_token_.precedence_string () <<
- "' at index " << state_._index << ".";
+ "' at index " << state_.index () << ".";
                 throw runtime_error (ss_.str ().c_str ());
                 break;
             }


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