[zypp-commit] r6244 - in /trunk/libzypp: tests/parser/inifile/iniparser_test.cc zypp/parser/IniParser.cc

Author: dmacvicar Date: Fri Jul 27 13:30:36 2007 New Revision: 6244 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6244&view=rev Log: - ini parser without boost::regexp patch by dmueller (#152447) Modified: trunk/libzypp/tests/parser/inifile/iniparser_test.cc trunk/libzypp/zypp/parser/IniParser.cc Modified: trunk/libzypp/tests/parser/inifile/iniparser_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/parser/inifile/iniparser_test.cc?rev=6244&r1=6243&r2=6244&view=diff ============================================================================== --- trunk/libzypp/tests/parser/inifile/iniparser_test.cc (original) +++ trunk/libzypp/tests/parser/inifile/iniparser_test.cc Fri Jul 27 13:30:36 2007 @@ -30,6 +30,8 @@ virtual void consume( const std::string §ion, const std::string &key, const std::string &value ) { MIL << "'" << section << "'" << " | " << "'" << key << "'" << " | " << "'" << value << "'" << endl; + if (section == "base" && key == "gpgcheck") + BOOST_CHECK_EQUAL(value, "1"); } }; @@ -39,6 +41,7 @@ virtual void consume( const std::string §ion ) { MIL << section << endl; + BOOST_CHECK(section == "base" || section == "equal"); } virtual void consume( const std::string §ion, const std::string &key, const std::string &value ) Modified: trunk/libzypp/zypp/parser/IniParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniParser.cc?rev=6244&r1=6243&r2=6244&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/IniParser.cc (original) +++ trunk/libzypp/zypp/parser/IniParser.cc Fri Jul 27 13:30:36 2007 @@ -12,8 +12,6 @@ #include <iostream> #include <sstream> -#include - #include "zypp/base/Logger.h" #include "zypp/base/String.h" #include "zypp/base/IOStream.h" @@ -68,9 +66,6 @@ // void IniParser::parse( const InputStream & input_r, const ProgressData::ReceiverFnc & progress ) { - boost::regex rxSection("^\\[(.+)\\]$"); - boost::regex rxKeyValue("^([^=]*[^=[:space:]])[[:space:]]*=[[:space:]]*(.+)$"); - MIL << "Start parsing " << input_r << endl; _inputname = input_r.name(); beginParse(); @@ -83,31 +78,25 @@ for ( ; line; line.next() ) { std::string trimmed = str::trim(*line); - const char *where = trimmed.c_str(); /* Skip leading spaces */ - if (*where==';' || *where=='#' || *where==0) + + if (trimmed.empty() || trimmed[0] == ';' || trimmed[0] == '#') continue ; /* Comment lines */ - else + + if (trimmed[0] == '[') + { + std::string section = trimmed.substr(1, trimmed.find(']')-1); + consume(section); + section.swap(_current_section); + continue; + } + + std::string::size_type pos = trimmed.find('='); + + if (pos != std::string::npos) { - if (*where=='[' ) - { - boost::smatch what; - if(boost::regex_match(trimmed, what, rxSection, boost::match_extra)) - { - //DBG << what << endl; - std::string section = what[1]; - consume(section); - section.swap(_current_section); - } - } - else - { - boost::smatch what; - if(boost::regex_match(trimmed, what, rxKeyValue, boost::match_extra)) - { - //DBG << what << endl; - consume( _current_section, what[1], what[2] ); - } - } + std::string key = str::rtrim(trimmed.substr(0, pos)); + std::string value = str::ltrim(trimmed.substr(pos+1)); + consume( _current_section, key, value); } // set progress and allow cancel -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org