Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance codebase line/branch coverage #17

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Enhance codebase line/branch coverage #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions include/boost/token_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include <boost/assert.hpp>
#include <boost/type_traits/is_pointer.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/move/utility_core.hpp>
#include <boost/mpl/if.hpp>
#include <boost/throw_exception.hpp>
#if !defined(BOOST_NO_CWCTYPE)
Expand Down Expand Up @@ -88,7 +89,8 @@ namespace boost{
// character (backslash \), can be assigned to other characters.

struct escaped_list_error : public std::runtime_error{
escaped_list_error(const std::string& what_arg):std::runtime_error(what_arg) { }
explicit escaped_list_error(const char* what_arg) BOOST_NOEXCEPT_OR_NOTHROW
: std::runtime_error(what_arg) { }
};


Expand Down Expand Up @@ -127,7 +129,7 @@ namespace boost{
template <typename iterator, typename Token>
void do_escape(iterator& next,iterator end,Token& tok) {
if (++next == end)
BOOST_THROW_EXCEPTION(escaped_list_error(std::string("cannot end with escape")));
BOOST_THROW_EXCEPTION(escaped_list_error("cannot end with escape"));
if (Traits::eq(*next,'n')) {
tok+='\n';
return;
Expand All @@ -145,7 +147,7 @@ namespace boost{
return;
}
else
BOOST_THROW_EXCEPTION(escaped_list_error(std::string("unknown escape sequence")));
BOOST_THROW_EXCEPTION(escaped_list_error("unknown escape sequence"));
}

public:
Expand All @@ -155,7 +157,7 @@ namespace boost{
: escape_(1,e), c_(1,c), quote_(1,q), last_(false) { }

escaped_list_separator(string_type e, string_type c, string_type q)
: escape_(e), c_(c), quote_(q), last_(false) { }
: escape_(boost::move(e)), c_(boost::move(c)), quote_(boost::move(q)), last_(false) { }

void reset() {last_=false;}

Expand Down Expand Up @@ -216,11 +218,11 @@ namespace boost{
template<typename traits, int N>
struct traits_extension_details : public traits {
typedef typename traits::char_type char_type;
static bool isspace(char_type c)
static bool isspace(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
return std::iswspace(c) != 0;
}
static bool ispunct(char_type c)
static bool ispunct(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
return std::iswpunct(c) != 0;
}
Expand All @@ -229,11 +231,11 @@ namespace boost{
template<typename traits>
struct traits_extension_details<traits, 1> : public traits {
typedef typename traits::char_type char_type;
static bool isspace(char_type c)
static bool isspace(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
return std::isspace(c) != 0;
}
static bool ispunct(char_type c)
static bool ispunct(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
return std::ispunct(c) != 0;
}
Expand All @@ -246,7 +248,7 @@ namespace boost{
template<typename traits>
struct traits_extension : public traits {
typedef typename traits::char_type char_type;
static bool isspace(char_type c)
static bool isspace(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
#if !defined(BOOST_NO_CWCTYPE)
return traits_extension_details<traits, sizeof(char_type)>::isspace(c);
Expand All @@ -255,7 +257,7 @@ namespace boost{
#endif
}

static bool ispunct(char_type c)
static bool ispunct(char_type c) BOOST_NOEXCEPT_OR_NOTHROW
{
#if !defined(BOOST_NO_CWCTYPE)
return traits_extension_details<traits, sizeof(char_type)>::ispunct(c);
Expand Down Expand Up @@ -284,19 +286,19 @@ namespace boost{
}

template<class Token, class Value>
static void plus_equal(Token &, const Value &) { }
static void plus_equal(Token &, const Value &) BOOST_NOEXCEPT_OR_NOTHROW { }

// If we are doing an assign, there is no need for the
// the clear.
//
template<class Token>
static void clear(Token &) { }
static void clear(Token &) BOOST_NOEXCEPT_OR_NOTHROW { }
};

template <>
struct assign_or_plus_equal<std::input_iterator_tag> {
template<class Iterator, class Token>
static void assign(Iterator , Iterator , Token &) { }
static void assign(Iterator , Iterator , Token &) BOOST_NOEXCEPT_OR_NOTHROW { }
template<class Token, class Value>
static void plus_equal(Token &t, const Value &v) {
t += v;
Expand Down Expand Up @@ -357,7 +359,7 @@ namespace boost{
return_partial_last_(return_partial_last) { }

offset_separator()
: offsets_(1,1), current_offset_(),
: offsets_(1,1), current_offset_(0),
wrap_offsets_(true), return_partial_last_(true) { }

void reset() {
Expand Down Expand Up @@ -435,16 +437,13 @@ namespace boost{
char_separator(const Char* dropped_delims,
const Char* kept_delims = 0,
empty_token_policy empty_tokens = drop_empty_tokens)
: m_dropped_delims(dropped_delims),
: m_kept_delims(kept_delims, (kept_delims ? Traits::length(kept_delims) : 0)),
m_dropped_delims(dropped_delims),
m_use_ispunct(false),
m_use_isspace(false),
m_empty_tokens(empty_tokens),
m_output_done(false)
{
// Borland workaround
if (kept_delims)
m_kept_delims = kept_delims;
}
{ }

// use ispunct() for kept delimiters and isspace for dropped.
explicit
Expand Down Expand Up @@ -536,7 +535,7 @@ namespace boost{
empty_token_policy m_empty_tokens;
bool m_output_done;

bool is_kept(Char E) const
bool is_kept(Char E) const BOOST_NOEXCEPT_OR_NOTHROW
{
if (m_kept_delims.length())
return m_kept_delims.find(E) != string_type::npos;
Expand All @@ -545,7 +544,7 @@ namespace boost{
} else
return false;
}
bool is_dropped(Char E) const
bool is_dropped(Char E) const BOOST_NOEXCEPT_OR_NOTHROW
{
if (m_dropped_delims.length())
return m_dropped_delims.find(E) != string_type::npos;
Expand Down Expand Up @@ -609,8 +608,8 @@ namespace boost{
explicit char_delimiters_separator(bool return_delims = false,
const Char* returnable = 0,
const Char* nonreturnable = 0)
: returnable_(returnable ? returnable : string_type().c_str()),
nonreturnable_(nonreturnable ? nonreturnable:string_type().c_str()),
: returnable_(returnable, (returnable ? Traits::length(returnable) : 0)),
nonreturnable_(nonreturnable, (returnable ? Traits::length(nonreturnable) : 0)),
return_delims_(return_delims), no_ispunct_(returnable!=0),
no_isspace_(nonreturnable!=0) { }

Expand All @@ -633,7 +632,7 @@ namespace boost{

// if we are to return delims and we are one a returnable one
// move past it and stop
if (is_ret(*next) && return_delims_) {
if (is_ret(*next)) {
tok+=*next;
++next;
}
Expand Down
1 change: 0 additions & 1 deletion include/boost/token_iterator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ namespace boost
}

void initialize(){
if(valid_) return;
f_.reset();
valid_ = (begin_ != end_)?
f_(begin_,end_,tok_):false;
Expand Down
Loading