diff options
Diffstat (limited to 'boost/spirit/home/lex')
| -rw-r--r-- | boost/spirit/home/lex/lexer/lexertl/generate_static.hpp | 10 | ||||
| -rw-r--r-- | boost/spirit/home/lex/lexer/lexertl/token.hpp | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp b/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp index 72b8014611..6a07ffde0a 100644 --- a/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp +++ b/boost/spirit/home/lex/lexer/lexertl/generate_static.hpp @@ -415,7 +415,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl { os_ << " std::size_t index = *curr_++\n"; } - os_ << " bol = (index == '\n') ? true : false;\n"; + os_ << " bol = (index == '\\n') ? true : false;\n"; os_ << " std::size_t const state_ = ptr_[\n"; os_ << " lookup_[static_cast<std::size_t>(index)]];\n"; @@ -442,7 +442,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl { os_ << " std::size_t index = *curr_++\n"; } - os_ << " bol = (index == '\n') ? true : false;\n"; + os_ << " bol = (index == '\\n') ? true : false;\n"; os_ << " std::size_t const state_ = ptr_[\n"; os_ << " lookup_[static_cast<std::size_t>(index)]];\n"; @@ -469,7 +469,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl { os_ << " std::size_t index = *curr_++\n"; } - os_ << " bol = (index == '\n') ? true : false;\n"; + os_ << " bol = (index == '\\n') ? true : false;\n"; os_ << " std::size_t const state_ = ptr_[\n"; os_ << " lookup_[static_cast<std::size_t>(index)]];\n"; @@ -577,7 +577,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl if (sm_.data()._seen_BOL_assertion) { - os_ << " bol_ = (*start_token_ == '\n') ? true : false;\n"; + os_ << " bol_ = (*start_token_ == '\\n') ? true : false;\n"; } os_ << " id_ = npos;\n"; @@ -749,7 +749,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl } if (iter_->eol_index != boost::lexer::npos) { - os_ << "\n if (ch_ == '\n') goto state" << dfa_ + os_ << "\n if (ch_ == '\\n') goto state" << dfa_ << '_' << iter_->eol_index << ";\n"; } os_ << " ++curr_;\n"; diff --git a/boost/spirit/home/lex/lexer/lexertl/token.hpp b/boost/spirit/home/lex/lexer/lexertl/token.hpp index 9f4bdb3872..f795bcacac 100644 --- a/boost/spirit/home/lex/lexer/lexertl/token.hpp +++ b/boost/spirit/home/lex/lexer/lexertl/token.hpp @@ -33,6 +33,7 @@ #include <boost/mpl/vector.hpp> #include <boost/mpl/if.hpp> #include <boost/mpl/or.hpp> +#include <boost/type_traits/integral_promotion.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/range/iterator_range.hpp> #include <boost/static_assert.hpp> @@ -155,10 +156,10 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl // this default conversion operator is needed to allow the direct // usage of tokens in conjunction with the primitive parsers defined // in Qi - operator id_type() const { return id_; } + operator id_type() const { return static_cast<id_type>(id_); } // Retrieve or set the token id of this token instance. - id_type id() const { return id_; } + id_type id() const { return static_cast<id_type>(id_); } void id(id_type newid) { id_ = newid; } std::size_t state() const { return 0; } // always '0' (INITIAL state) @@ -187,7 +188,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl #endif protected: - id_type id_; // token id, 0 if nothing has been matched + typename boost::integral_promotion<id_type>::type id_; // token id, 0 if nothing has been matched }; #if defined(BOOST_SPIRIT_DEBUG) |