From dd895152f7833726871e8b6fc0e486dddce61de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 26 Jan 2017 21:01:19 +0100 Subject: [PATCH] Debug flag added --- Parsodus-completion.bash | 2 +- include/Parsodus/driver.h | 3 +- src/driver.cpp | 75 +++++++++++++++++++++++++++++++-------- src/main.cpp | 5 +-- 4 files changed, 66 insertions(+), 19 deletions(-) diff --git a/Parsodus-completion.bash b/Parsodus-completion.bash index b58b86c..b8a0aff 100644 --- a/Parsodus-completion.bash +++ b/Parsodus-completion.bash @@ -4,7 +4,7 @@ _Parsodus_completion () langs='c++ cpp cxx' local opts - opts='-h --help --version -d --outputdir -l --language -n --name' + opts='-h --help --version -d --outputdir -l --language -n --name --debug' # local prev COMPREPLY=() local cur diff --git a/include/Parsodus/driver.h b/include/Parsodus/driver.h index ace7822..fb5a5e3 100644 --- a/include/Parsodus/driver.h +++ b/include/Parsodus/driver.h @@ -23,7 +23,7 @@ namespace pds { * @param language The language to generate output for (backends is queried for this language) * @param parsername The name to give to the generated parser, this gets cleaned to only contains alphanumeric chars or underscore and start with a non-digit (AKA a valid identifier) */ - Driver(std::unique_ptr backends, std::istream& inputfile, std::string outputdir, std::string language, std::string parsername); + Driver(std::unique_ptr backends, std::istream& inputfile, std::string outputdir, std::string language, std::string parsername, bool debug=true); /** * Destructor @@ -43,6 +43,7 @@ namespace pds { std::string m_outputdir; std::string m_language; std::string m_parsername; + bool m_debug; }; /** diff --git a/src/driver.cpp b/src/driver.cpp index f780624..a30171f 100644 --- a/src/driver.cpp +++ b/src/driver.cpp @@ -1,12 +1,21 @@ #include "Parsodus/driver.h" #include "Parsodus/inputparser.h" #include "Parsodus/config.h" + +#include "g3log/g3log.hpp" +#include "g3log/logworker.hpp" + #include +#include #include - #if defined(_WIN32) +#include +#define isatty(x) _isatty(x) +#define fileno(x) _fileno(x) #include +#else +#include #endif namespace { @@ -21,35 +30,71 @@ namespace { } return s; } + + /** + * G3Log sink + */ + class Sink { + public: + Sink(std::unique_ptr&& infoOut) : m_infoOut(std::move(infoOut)) {} + void ReceiveLogMessage(g3::LogMessageMover logEntry) { + auto level = logEntry.get().level(); + + std::string prefix = ""; + std::string suffix = ""; + + if (isatty(fileno(stdin))) { + prefix = "\033[38;5;202;1m"; + suffix = "\033[0m"; + } + + if (level == WARNING.text) { + std::cerr << prefix << logEntry.get().message() << suffix; + } else if (level == INFO.text || level == DEBUG.text) { + if (m_infoOut) + *m_infoOut << logEntry.get().message(); + } + } + private: + std::unique_ptr m_infoOut; + }; } namespace pds { - Driver::Driver(std::unique_ptr backends, std::istream& inputfile, std::string outputdir, std::string language, std::string parsername): - m_backends(std::move(backends)), m_inputfile(inputfile), m_outputdir(outputdir), m_language(language), m_parsername(clean(parsername)) { + Driver::Driver(std::unique_ptr backends, std::istream& inputfile, std::string outputdir, std::string language, std::string parsername, bool debug): + m_backends(std::move(backends)), m_inputfile(inputfile), m_outputdir(outputdir), m_language(language), m_parsername(clean(parsername)), m_debug(debug) { } Driver::~Driver(){} int Driver::run() { + struct stat sb; + if(stat(m_outputdir.c_str(), &sb) != 0) { + int status; +#if defined(_WIN32) + status = _mkdir(m_outputdir.c_str()); +#else + status = mkdir(m_outputdir.c_str(), 0755); +#endif + if(status !=0 && errno != EEXIST){ + throw DriverException("The folder " + m_outputdir + " does not exist and we're unable to create it."); + } + } + + std::unique_ptr logworker{ g3::LogWorker::createLogWorker() }; + if (m_debug) + logworker->addSink(std::make_unique(std::make_unique(m_outputdir + "/debug.log")), &Sink::ReceiveLogMessage); + else + logworker->addSink(std::make_unique(nullptr), &Sink::ReceiveLogMessage); + g3::initializeLogging(logworker.get()); + if (!m_parsername.length()) throw DriverException("no valid parser name possible"); Config config = InputParser::parseInput(m_inputfile); Backend* back = m_backends->findBackend(m_language, config.parserType); if (!back) throw DriverException("Could not find a valid backend for language " + m_language + " and parser type: " + config.parserType); back->generateParser([this](std::string filename) -> std::unique_ptr { - struct stat sb; - if(stat(m_outputdir.c_str(), &sb) != 0) { - int status; - #if defined(_WIN32) - status = _mkdir(m_outputdir.c_str()); - #else - status = mkdir(m_outputdir.c_str(), 0755); - #endif - if(status !=0 && errno != EEXIST){ - throw DriverException("The folder " + m_outputdir + " does not exist and we're unable to create it."); - } - } return std::unique_ptr(new std::ofstream(m_outputdir + "/" + filename)); }, m_parsername, config); diff --git a/src/main.cpp b/src/main.cpp index a28e0d0..8e6eef8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,12 +10,13 @@ int main(int argc, char** argv) { /* Set and parse command line arguments */ - optparse::OptionParser parser = optparse::OptionParser().description("Parsodus").usage("Parsodus [-d ] [-l ] [-n ] "); + optparse::OptionParser parser = optparse::OptionParser().description("Parsodus").usage("Parsodus [-d ] [-l ] [-n ] [--debug] "); parser.add_help_option(true); parser.version("%prog 1.0"); parser.add_option("-d", "--outputdir").dest("outputdir").help("Output the generated files to this directory\n[default: .]").metavar("").set_default("."); parser.add_option("-l", "--lang", "--language").dest("language").help("The programming language to generate source files for\n[default: c++]").metavar("").set_default("c++"); parser.add_option("-n", "--name").dest("parsername").help("Use this name for the generated parser, the default is based on the input file name").metavar(""); + parser.add_option("--debug").dest("debug").action("store_true").set_default(false).help("Output debug logging"); optparse::Values options = parser.parse_args(argc, argv); std::vector args = parser.args(); @@ -68,7 +69,7 @@ int main(int argc, char** argv) { /* Create parserfile, if possible */ try { - pds::Driver driver(std::move(backendManager), infile, options["outputdir"], options["language"], parsername); + pds::Driver driver(std::move(backendManager), infile, options["outputdir"], options["language"], parsername, options.get("debug")); return driver.run(); } catch (std::exception &err) { std::cout << err.what() << std::endl;