tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backport i2tcl's error reporting functionality into "icinga2 repl" 

fixes #8078
This commit is contained in:
Gunnar Beutner 2014-12-13 21:16:55 +01:00
parent dd4c04aa9b
commit 83058d1123
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/cli/replcommand.cpp
View File

@ -57,10 +57,15 @@ void ReplCommand::InitParameters(boost::program_options::options_description& vi
int ReplCommand::Run(const po::variables_map& vm, const std::vector<std::string>& ap) const
{
ScriptFrame frame;
std::map<String, String> lines;
int next_line = 1;
while (std::cin.good()) {
std::cout << ConsoleColorTag(Console_ForegroundRed)
<< "=> "
String fileName = "<" + Convert::ToString(next_line) + ">";
next_line++;
std::cout << ConsoleColorTag(Console_ForegroundCyan)
<< fileName << ConsoleColorTag(Console_ForegroundRed) << " => "
<< ConsoleColorTag(Console_Normal);
std::string line;
@ -71,7 +76,9 @@ int ReplCommand::Run(const po::variables_map& vm, const std::vector<std::string>
try {
ConfigCompilerContext::GetInstance()->Reset();
expr = ConfigCompiler::CompileText("<console>", line);
lines[fileName] = line;
expr = ConfigCompiler::CompileText(fileName, line);
bool has_errors = false;
@ -94,9 +101,9 @@ int ReplCommand::Run(const po::variables_map& vm, const std::vector<std::string>
} catch (const ScriptError& ex) {
DebugInfo di = ex.GetDebugInfo();
std::cout << String(3 + di.FirstColumn, ' ');
std::cout << String(di.LastColumn - di.FirstColumn + 1, '^');
std::cout << "\n";
std::cout << di.Path << ": " << lines[di.Path] << "\n";
std::cout << String(di.Path.GetLength() + 2, ' ');
std::cout << String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n";
std::cout << ex.what() << "\n";
} catch (const std::exception& ex) {