configuration: add 'ignore-config-errors' switch

This commit is contained in:
Andrzej Rybczak
2015-05-02 21:16:11 +02:00
parent 77c702100f
commit a40508179a
6 changed files with 14 additions and 9 deletions

View File

@@ -35,7 +35,7 @@
#include "utility/option_parser.h"
bool option_parser::run(std::istream &is)
bool option_parser::run(std::istream &is, bool ignore_errors)
{
// quoted value. leftmost and rightmost quotation marks are the delimiters.
boost::regex quoted("(\\w+)\\h*=\\h*\"(.*)\"[^\"]*");
@@ -56,13 +56,15 @@ bool option_parser::run(std::istream &is)
it->second.parse(match[2]);
} catch (std::exception &e) {
std::cerr << "Error while processing option \"" << option << "\": " << e.what() << "\n";
return false;
if (!ignore_errors)
return false;
}
}
else
{
std::cerr << "Unknown option: " << option << "\n";
return false;
if (!ignore_errors)
return false;
}
}
}
@@ -74,7 +76,8 @@ bool option_parser::run(std::istream &is)
p.second.run_default();
} catch (std::exception &e) {
std::cerr << "Error while finalizing option \"" << p.first << "\": " << e.what() << "\n";
return false;
if (ignore_errors)
return false;
}
}
}

View File

@@ -129,7 +129,7 @@ struct option_parser
m_parsers[option] = std::forward<WorkerT>(w);
}
bool run(std::istream &is);
bool run(std::istream &is, bool ignore_errors);
private:
std::unordered_map<std::string, worker> m_parsers;