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

Jump to bottom

replace boost lexical cast with stl string #195

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

replace boost lexical cast with stl string #195

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa6d63c
replace boost lexical cast with stl string
wellsmt May 5, 2021
9167e36
add macro for strinto ushort conversion
wellsmt May 6, 2021
1945834
add guard around boost lexical cast
wellsmt May 7, 2021
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
24 changes: 19 additions & 5 deletions include/boost/date_time/date_parsing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
#include <iterator>
#include <algorithm>
#include <boost/tokenizer.hpp>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I forgot about this one as well -- probably this will be next on my radar.

#include <boost/lexical_cast.hpp>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So here we should ifdef the include so that if we're supporting pre-11 c++ we will just keep using lexical cast probably the cleanest solution is to move it to the compiler_config.hpp to do the macro check. I looked and can't specific feature macro for these functions so I think I'd go with

BOOST_NO_CXX11

boost.config is already included so you should have direct access to this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent!
...clarifying question...
Is the goal to totally eliminate the dependency on boost/lexical_cast? If so then we could use cstdlib for < c++11 and string for >= c++11.
Or is the goal simply to modernize the code? If so we can use the macro approach you mentioned for < c++11 and leave the dependency on boost::lexical_cast.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine sticking with lexical_cast for 03 compiles and just modernizing for 11 and beyond. It seems likely I'll eventually drop 03 support.

#ifdef BOOST_NO_CXX11
#include <boost/lexical_cast.hpp>
#endif
#include <boost/date_time/compiler_config.hpp>
#include <boost/date_time/parse_format_base.hpp>
#include <boost/date_time/period.hpp>
Expand All @@ -29,6 +31,16 @@
namespace boost {
namespace date_time {

inline unsigned short string_to_ushort(std::string const& s)
{
#ifdef BOOST_NO_CXX11
return boost::lexical_cast<unsigned short>(s);
#else
// TODO: lexical cast has some side effect on <s> that makes the std::stoul work here
boost::lexical_cast<unsigned short>(s);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JeffGarland This line should be removed, but i was curious how it would run in CI. In my local environment, the tests pass when the lexical_cast is called on s, but fail when it is not called. There is some side effect of boost::lexical_cast on s that I don't understand in the current date_time uninttests. In particular this test i have been looking at here fails without doing this cast.

return std::stoul(s);
#endif
}
//! A function to replace the std::transform( , , ,tolower) construct
/*! This function simply takes a string, and changes all the characters
* in that string to lowercase (according to the default system locale).
Expand Down Expand Up @@ -61,7 +73,7 @@ namespace date_time {
inline unsigned short
month_str_to_ushort(std::string const& s) {
if((s.at(0) >= '0') && (s.at(0) <= '9')) {
return boost::lexical_cast<unsigned short>(s);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so my suggestion is we write the function

#ifdef BOOST_NO_CXX11
inline unsigned short string_to_ushort(...)
{
  --> current lexical cast
}
#else     
inline unsigned short string_to_ushort(...)
{
  --> current stoul code
}
#endif

This can live here or if it's used elsewhere I'd move it to compiler_config.hpp since its a work around

return string_to_ushort(s);
}
else {
std::string str = convert_to_lower(s);
Expand Down Expand Up @@ -160,7 +172,7 @@ namespace date_time {
switch(spec_str.at(pos)) {
case 'y':
{
year = boost::lexical_cast<unsigned short>(*beg);
year = string_to_ushort(*beg);
break;
}
case 'm':
Expand All @@ -170,7 +182,7 @@ namespace date_time {
}
case 'd':
{
day = boost::lexical_cast<unsigned short>(*beg);
day = string_to_ushort(*beg);
break;
}
default: break;
Expand All @@ -185,6 +197,7 @@ namespace date_time {
parse_undelimited_date(const std::string& s) {
int offsets[] = {4,2,2};
int pos = 0;

//typename date_type::ymd_type ymd((year_type::min)(),1,1);
unsigned short y = 0, m = 0, d = 0;

Expand All @@ -200,7 +213,8 @@ namespace date_time {
std::basic_string<char> > tokenizer_type;
tokenizer_type tok(s, osf);
for(typename tokenizer_type::iterator ti=tok.begin(); ti!=tok.end();++ti) {
unsigned short i = boost::lexical_cast<unsigned short>(*ti);
unsigned i = string_to_ushort(*ti);

switch(pos) {
case 0: y = i; break;
case 1: m = i; break;
Expand Down