OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trim_right replaced by trim

Browse Source 
Augment trim_right with the dual trim_left and their composition trim
which strips all spaces from either side before the RawKeyword stage
starts.
This commit is contained in:
Jørgen Kvalsvik
2016-04-04 22:45:03 +02:00
parent 4b4d2c02c0
commit 033223720a
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -487,16 +487,28 @@ bool Parser::parseState(std::shared_ptr<ParserState> parserState) const {
return line;
}
static inline std::string& trim_right( std::string& str ) {
/* because cctype functions can be macros, manually find the
* position to erase from. Written using isspace for performance.
*/
template< typename Itr >
static inline Itr trim_left( Itr begin, Itr end ) {
size_t i = str.size();
for( ; i >= 1; --i )
if( !isspace( str[ i - 1 ] ) ) break;
const auto ws = []( char ch ) { return std::isspace( ch ); };
return std::find_if_not( begin, end, ws );
}
return str.erase( i );
template< typename Itr >
static inline Itr trim_right( Itr begin, Itr end ) {
const auto ws = []( char ch ) { return std::isspace( ch ); };
std::reverse_iterator< Itr > rbegin( end );
std::reverse_iterator< Itr > rend( begin );
return std::find_if_not( rbegin, rend, ws ).base();
}
static inline std::string& trim( std::string& str ) {
auto fst = trim_left( str.begin(), str.end() );
auto lst = trim_right( fst, str.end() );
return str.assign( fst, lst );
}
bool Parser::tryParseKeyword(std::shared_ptr<ParserState> parserState) const {
@@ -510,11 +522,9 @@ bool Parser::parseState(std::shared_ptr<ParserState> parserState) const {
std::string line;
while (std::getline(*parserState->inputstream, line)) {
if (line.find("--") != std::string::npos)
line = strip_comments( line );
line = trim_right( line ); // Removing garbage (eg. \r)
line = doSpecialHandlingForTitleKeyword(line, parserState);
line = strip_comments( line );
line = trim( line ); // Removing garbage (eg. \r)
doSpecialHandlingForTitleKeyword(line, parserState);
std::string keywordString;
parserState->lineNR++;