Bumpy road complexity metrics

plugins/cpp/model/include/model/cppfunction.h

@@ -18,7 +18,10 @@ struct CppFunction : CppTypedEntity
   std::vector<odb::lazy_shared_ptr<CppVariable>> parameters;
   #pragma db on_delete(cascade)
   std::vector<odb::lazy_shared_ptr<CppVariable>> locals;
+
   unsigned int mccabe;
+  unsigned int bumpiness;
+  unsigned int statementCount;
 
   std::string toString() const
   {
@@ -82,6 +85,25 @@ struct CppFunctionMcCabe
   std::string filePath;
 };
 
+#pragma db view \
+  object(CppFunction) \
+  object(CppAstNode : CppFunction::astNodeId == CppAstNode::id) \
+  object(File : CppAstNode::location.file)
+struct CppFunctionBumpyRoad
+{
+  #pragma db column(CppEntity::astNodeId)
+  CppAstNodeId astNodeId;
+
+  #pragma db column(CppFunction::bumpiness)
+  unsigned int bumpiness;
+
+  #pragma db column(CppFunction::statementCount)
+  unsigned int statementCount;
+
+  #pragma db column(File::path)
+  std::string filePath;
+};
+
 }
 }
 

plugins/cpp/parser/CMakeLists.txt

@@ -44,7 +44,8 @@ add_library(cppparser SHARED
   src/ppmacrocallback.cpp
   src/relationcollector.cpp
   src/doccommentformatter.cpp
-  src/diagnosticmessagehandler.cpp)
+  src/diagnosticmessagehandler.cpp
+  src/nestedscope.cpp)
 
 target_link_libraries(cppparser
   cppmodel