From 47208f27b19f8fd129ad6464de02b7b9a51599f1 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 2 Mar 2016 10:24:48 -0500 Subject: [PATCH] Diagnostics: Implemented ::dump stubs in all objects --- src/Database.cpp | 3 ++- src/Extensions.cpp | 11 +++++++++++ src/Extensions.h | 1 + src/Rules.cpp | 1 + src/init.cpp | 8 ++++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/Database.cpp b/src/Database.cpp index 9669928f..0f2bdbcd 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -50,8 +50,9 @@ void Database::initialize (const std::string& location) std::string Database::dump () const { std::stringstream out; + out << "Database\n"; for (const auto& file : _data_files) - out << "# Data file: " << file << "\n"; + out << " Data: " << file << "\n"; return out.str (); } diff --git a/src/Extensions.cpp b/src/Extensions.cpp index df5d2daf..5fec7394 100644 --- a/src/Extensions.cpp +++ b/src/Extensions.cpp @@ -26,12 +26,23 @@ #include #include +#include //////////////////////////////////////////////////////////////////////////////// void Extensions::initialize () { } +//////////////////////////////////////////////////////////////////////////////// +std::string Extensions::dump () const +{ + std::stringstream out; + + out << "Extensions\n"; + + return out.str (); +} + //////////////////////////////////////////////////////////////////////////////// std::vector & Extensions::buildExtensionArgs (std::vector & args) const { diff --git a/src/Extensions.h b/src/Extensions.h index d78ff431..c35cc38c 100644 --- a/src/Extensions.h +++ b/src/Extensions.h @@ -35,6 +35,7 @@ class Extensions public: Extensions () = default; void initialize (); + std::string dump () const; private: std::vector & buildExtensionArgs (std::vector &) const; diff --git a/src/Rules.cpp b/src/Rules.cpp index 8210fdea..69b7c785 100644 --- a/src/Rules.cpp +++ b/src/Rules.cpp @@ -32,6 +32,7 @@ std::string Rules::dump () const { std::stringstream out; + out << "Rules\n"; return out.str (); } diff --git a/src/init.cpp b/src/init.cpp index d9eca0b4..038daf3a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -55,6 +55,12 @@ void initializeData (Configuration& configuration, Database& database) { // TODO Load configuration ~/.timewrc || $TIMEWRC. // TODO Init database (no data read). + + std::cout << "# Configuration\n"; + for (const auto& name : configuration.all ()) + std::cout << "# " << name << "=" << configuration[name] << "\n"; + + std::cout << "# " << database.dump (); } //////////////////////////////////////////////////////////////////////////////// @@ -74,11 +80,13 @@ void initializeRules (Configuration& configuration, Rules& rules) ruleParser.initialize (ruleGrammar); */ + std::cout << "# " << rules.dump (); } //////////////////////////////////////////////////////////////////////////////// void initializeExtensions (Configuration& configuration, Extensions& extensions) { + std::cout << "# " << extensions.dump (); } ////////////////////////////////////////////////////////////////////////////////