fix several bugs

ggeorgiev · Jun 13, 2016 · b5256f6 · b5256f6
1 parent f3d50eb
commit b5256f6
Show file tree

Hide file tree

Showing 24 changed files with 37 additions and 28 deletions.
diff --git a/src/3rdparty/boost.dbs b/src/3rdparty/boost.dbs
@@ -6,6 +6,7 @@ cxx_library /boost_template
         @directory=../../boost/include:
 
         boost/asio.hpp
+        boost/asio/io_service.hpp
         boost/crc.hpp
         boost/functional/hash.hpp
         boost/functional/hash/hash.hpp
@@ -26,6 +27,7 @@ cxx_library /boost_template
         @visibility=protected
         @directory=../../boost/include:
 
+        boost/asio/impl/io_service.ipp
         boost/variant/detail/apply_visitor_unary.hpp
         boost/variant/detail/hash_variant.hpp
     ;

diff --git a/src/config.dbs b/src/config.dbs
@@ -1,5 +1,6 @@
 verbose: 
     -crc 
+    -inspect
     -sys 
     -db 
     -parse 

diff --git a/src/db/database.cpp b/src/db/database.cpp
@@ -10,6 +10,7 @@
 #include <rocksdb/options.h>
 #include <rocksdb/slice.h>
 #include <rocksdb/status.h>
+#include "fmt/format.h"
 #include <functional>
 
 namespace db

diff --git a/src/doim/gtest/set_manager-utest.cpp b/src/doim/gtest/set_manager-utest.cpp
@@ -61,10 +61,8 @@ TEST(SetManagerTest, find)
 
 TEST(SetManagerTest, combine)
 {
-    auto tags1 =
-        doim::TagSet::make(doim::TagSet{doim::gTaskTag, doim::gRunTag, doim::gDoneTag});
-    auto tags2 =
-        doim::TagSet::make(doim::TagSet{doim::gCrcTag, doim::gRunTag, doim::gDoneTag});
+    auto tags1 = doim::TagSet::unique({doim::gTaskTag, doim::gRunTag, doim::gDoneTag});
+    auto tags2 = doim::TagSet::unique({doim::gCrcTag, doim::gRunTag, doim::gDoneTag});
 
     auto comb1 = tags1->combine(tags2);
     auto comb2 = tags2->combine(tags1);

diff --git a/src/doim/gtest/tag/tag_expression-utest.cpp b/src/doim/gtest/tag/tag_expression-utest.cpp
@@ -8,12 +8,10 @@
 
 TEST(TagExpressionTest, patternMatch)
 {
-    doim::TagSetSPtr pattern = doim::TagSet::unique(doim::TagSet::make(doim::TagSet{}));
+    doim::TagSetSPtr pattern = doim::TagSet::unique({});
 
-    doim::TagSetSPtr pattern1 =
-        doim::TagSet::unique(doim::TagSet::make(doim::TagSet{doim::gCrcTag}));
-    doim::TagSetSPtr pattern2 = doim::TagSet::unique(
-        doim::TagSet::make(doim::TagSet{doim::gCrcTag, doim::gDbTag}));
+    doim::TagSetSPtr pattern1 = doim::TagSet::unique({doim::gCrcTag});
+    doim::TagSetSPtr pattern2 = doim::TagSet::unique({doim::gCrcTag, doim::gDbTag});
 
     doim::TagSetSPtr tags = pattern;
     doim::TagSetSPtr tags1 = pattern1;

diff --git a/src/doim/tag/tag.cpp b/src/doim/tag/tag.cpp
@@ -7,7 +7,7 @@
 namespace doim
 {
 TagSPtr gCrcTag = Tag::global("crc", gCrcTag);
-TagSPtr gDependTag = Tag::global("depend", gDependTag);
+TagSPtr gInspectTag = Tag::global("inspect", gInspectTag);
 
 TagSPtr gDbTag = Tag::global("db", gDbTag);
 TagSPtr gParseTag = Tag::global("parse", gParseTag);

diff --git a/src/doim/tag/tag.h b/src/doim/tag/tag.h
@@ -6,9 +6,11 @@
 #include "doim/element.hpp"
 #include "doim/set.hpp"
 #include <boost/hana/for_each.hpp>
+#include <functional>
 #include <memory>
 #include <str>
 #include <tuple>
+#include <unordered>
 
 namespace doim
 {
@@ -32,7 +34,7 @@ class Tag : public Element<Tag, string>
 };
 
 extern TagSPtr gCrcTag;
-extern TagSPtr gDependTag;
+extern TagSPtr gInspectTag;
 
 extern TagSPtr gDbTag;
 extern TagSPtr gParseTag;

diff --git a/src/engine/cxx_engine.cpp b/src/engine/cxx_engine.cpp
@@ -17,6 +17,7 @@
 #include "doim/cxx/cxx_header.h"
 #include "doim/cxx/cxx_include_directory.h"
 #include "doim/cxx/cxx_program.h"
+#include "doim/db/db_value.hpp"
 #include "doim/fs/fs_file.h"
 #include "doim/protobuf/protobuf_file.h"
 #include "doim/sys/sys_command.h"
@@ -26,8 +27,10 @@
 #include "err/err.h"
 #include "err/err_assert.h"
 #include "im/initialization_manager.hpp"
+#include "log/log.h"
 #include "math/crc.hpp"
 #include "rtti/class_rtti.hpp"
+#include <boost/hana/for_each.hpp>
 #include <algorithm>
 #include <functional>
 #include <str>

diff --git a/src/rpc/client/client.cpp b/src/rpc/client/client.cpp
@@ -2,6 +2,7 @@
 //
 
 #include "rpc/client/client.h"
+#include <boost/asio.hpp>
 #include <cstdlib>
 #include <iostream>
 #include <thread>

diff --git a/src/rpc/client/client.h b/src/rpc/client/client.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include <boost/asio.hpp>
+#include <boost/asio/io_service.hpp>
 
 namespace rpc
 {

diff --git a/src/rpc/server/server.cpp b/src/rpc/server/server.cpp
@@ -1,14 +1,12 @@
 //  Copyright © 2016 George Georgiev. All rights reserved.
 //
 
-#include <boost/asio.hpp>
+#include <boost/asio.hpp> // IWYU pragma: keep
 #include <cstdlib>
-#include <deque>
 #include <iostream>
 #include <list>
 #include <memory>
-#include <set>
-#include <utility>
+#include <type_traits>
 
 using boost::asio::ip::tcp;
 

diff --git a/src/task/cxx/cxx_object_file_crc_task.cpp b/src/task/cxx/cxx_object_file_crc_task.cpp
@@ -22,8 +22,8 @@ bool CxxObjectFileCrcTask::check() const
     return cxxObjectFile() != nullptr && cxxObjectFile()->isUnique();
 }
 
-static doim::TagSetSPtr gTags =
-    doim::TagSet::global({&doim::gCrcTag, &doim::gCxxTag, &doim::gObjTag}, gTags);
+static doim::TagSetSPtr gTags = doim::TagSet::global(
+    {&doim::gCrcTag, &doim::gInspectTag, &doim::gCxxTag, &doim::gObjTag}, gTags);
 
 doim::TagSetSPtr CxxObjectFileCrcTask::tags() const
 {

diff --git a/src/task/cxx/cxx_program_crc_task.cpp b/src/task/cxx/cxx_program_crc_task.cpp
@@ -23,8 +23,8 @@ bool CxxProgramCrcTask::check() const
     return cxxProgram() != nullptr && cxxProgram()->isUnique();
 }
 
-static doim::TagSetSPtr gTags =
-    doim::TagSet::global({&doim::gCrcTag, &doim::gCxxTag, &doim::gProgramTag}, gTags);
+static doim::TagSetSPtr gTags = doim::TagSet::global(
+    {&doim::gCrcTag, &doim::gInspectTag, &doim::gCxxTag, &doim::gProgramTag}, gTags);
 
 doim::TagSetSPtr CxxProgramCrcTask::tags() const
 {

diff --git a/src/task/cxx/cxx_source_crc_task.cpp b/src/task/cxx/cxx_source_crc_task.cpp
@@ -35,7 +35,7 @@ bool CxxSourceCrcTask::check() const
 }
 
 static doim::TagSetSPtr gTags =
-    doim::TagSet::global({&doim::gCrcTag, &doim::gCxxTag}, gTags);
+    doim::TagSet::global({&doim::gCrcTag, &doim::gInspectTag, &doim::gCxxTag}, gTags);
 
 doim::TagSetSPtr CxxSourceCrcTask::tags() const
 {

diff --git a/src/task/cxx/cxx_source_headers_task.cpp b/src/task/cxx/cxx_source_headers_task.cpp
@@ -25,7 +25,7 @@ bool CxxSourceHeadersTask::check() const
 }
 
 static doim::TagSetSPtr gTags =
-    doim::TagSet::global({&doim::gDependTag, &doim::gCxxTag}, gTags);
+    doim::TagSet::global({&doim::gInspectTag, &doim::gCxxTag}, gTags);
 
 doim::TagSetSPtr CxxSourceHeadersTask::tags() const
 {

diff --git a/src/task/db/db_put_task.cpp b/src/task/db/db_put_task.cpp
@@ -4,7 +4,6 @@
 #include "task/db/db_put_task.h"
 
 #include "db/database.h"
-#include "err/err_assert.h"
 #include <str>
 
 namespace task

diff --git a/src/task/db/db_put_task.h b/src/task/db/db_put_task.h
@@ -9,6 +9,7 @@
 #include "doim/tag/tag.h"
 #include "err/err.h"
 #include <fmt/format.h>
+#include <boost/hana/for_each.hpp>
 #include <memory>
 #include <str>
 #include <tuple>

diff --git a/src/task/gtest/cxx/cxx_file_crc_task-utest.cpp b/src/task/gtest/cxx/cxx_file_crc_task-utest.cpp
@@ -12,6 +12,7 @@
 #include "err/gtest/err.h"
 #include "gtest/framework.h"
 #include "gtest/test_resource.h"
+#include <fmt/format.h>
 #include <memory>
 #include <ostream>
 

diff --git a/src/task/gtest/cxx/cxx_header_crc_task-utest.cpp b/src/task/gtest/cxx/cxx_header_crc_task-utest.cpp
@@ -10,6 +10,7 @@
 #include "err/gtest/err.h"
 #include "gtest/framework.h"
 #include "gtest/test_resource.h"
+#include "fmt/format.h"
 #include <memory>
 #include <ostream>
 

diff --git a/src/task/protobuf/protobuf_file_crc_task.cpp b/src/task/protobuf/protobuf_file_crc_task.cpp
@@ -18,7 +18,8 @@ bool ProtobufFileCrcTask::check() const
 }
 
 static doim::TagSetSPtr gTags =
-    doim::TagSet::global({&doim::gCrcTag, &doim::gProtobufTag}, gTags);
+    doim::TagSet::global({&doim::gCrcTag, &doim::gInspectTag, &doim::gProtobufTag},
+                         gTags);
 
 doim::TagSetSPtr ProtobufFileCrcTask::tags() const
 {

diff --git a/src/task/sys/execute_command_task.cpp b/src/task/sys/execute_command_task.cpp
@@ -18,7 +18,7 @@ namespace task
 bool ExecuteCommandTask::check() const
 {
     return command() != nullptr && command()->isUnique() &&
-           targetDirectory() != nullptr && targetDirectory()->isUnique();
+           (targetDirectory() == nullptr || targetDirectory()->isUnique());
 }
 
 static doim::TagSetSPtr gTags = doim::TagSet::global({&doim::gSysTag}, gTags);

diff --git a/src/task/sys/parse_stdout_task.cpp b/src/task/sys/parse_stdout_task.cpp
@@ -35,7 +35,7 @@ ParseStdoutTask::ParseStdoutTask(const doim::SysCommandSPtr& command,
 bool ParseStdoutTask::check() const
 {
     return command() != nullptr && command()->isUnique() &&
-           targetDirectory() != nullptr && targetDirectory()->isUnique();
+           (targetDirectory() == nullptr || targetDirectory()->isUnique());
 }
 
 static doim::TagSetSPtr gTags = doim::TagSet::global({}, gTags);

diff --git a/src/task/sys/parse_stdout_task.h b/src/task/sys/parse_stdout_task.h
@@ -7,9 +7,11 @@
 #include "task/element_manager.hpp"
 #include "doim/fs/fs_directory.h"
 #include "doim/sys/sys_command.h"
+#include "doim/tag/tag.h"
 #include "err/err.h"
 #include "rtti/class_rtti.hpp"
 #include <fmt/format.h>
+#include <boost/hana/for_each.hpp>
 #include <functional>
 #include <shared_ptr>
 #include <str>

diff --git a/xcode/dbs-build.xcodeproj/xcshareddata/xcschemes/dbs-test-self-build.xcscheme b/xcode/dbs-build.xcodeproj/xcshareddata/xcschemes/dbs-test-self-build.xcscheme
@@ -67,11 +67,11 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "build"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "iwyu"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "dbs"