Output correct file format version if version is 4

Author: TimHeldmann

tools/cgcollector2/src/CallGraphCollectionAction.cpp

@@ -4,9 +4,9 @@
  * https://github.com/tudasc/metacg/LICENSE.txt
  */
 
-
 #include "CallGraphCollectionAction.h"
 #include "CallGraphNodeGenerator.h"
+#include "MCGBaseInfo.h"
 #include "Plugin.h"
 #include "SharedDefs.h"
 #include "metadata/Internal/ASTNodeMetadata.h"
@@ -32,8 +32,8 @@ void CallGraphCollectorConsumer::HandleTranslationUnit(clang::ASTContext& Contex
   mcgm.resetManager();
   mcgm.addToManagedGraphs("newGraph", std::make_unique<metacg::Callgraph>());
   auto callgraph = mcgm.getCallgraph();
-  CallGraphNodeGenerator graphGenerator(callgraph, captureCtorsDtors, captureNewDeleteCalls, captureImplicits, inferCtorsDtors,
-                                        standalone, level);
+  CallGraphNodeGenerator graphGenerator(callgraph, captureCtorsDtors, captureNewDeleteCalls, captureImplicits,
+                                        inferCtorsDtors, standalone, level);
 
   graphGenerator.TraverseDecl(Context.getTranslationUnitDecl());
 
@@ -63,25 +63,29 @@ void CallGraphCollectorConsumer::HandleTranslationUnit(clang::ASTContext& Contex
 
   std::unique_ptr<metacg::io::MCGWriter> mcgWriter;
 
-  switch (mcgVersion){
-    case 1: SPDLOG_WARN("This tool can not generate output files in the V1 format, using V2 instead");
-      __attribute__ ((fallthrough));
+  switch (mcgVersion) {
+    case 1:
+      SPDLOG_WARN("This tool can not generate output files in the V1 format, using V2 instead");
+      __attribute__((fallthrough));
     case 2:
-      mcgWriter = std::make_unique<metacg::io::VersionTwoMCGWriter>(metacg::getVersionTwoFileInfo({std::string("CGCollector2"), MetaCG_VERSION_MAJOR,
-                                                                                                   MetaCG_VERSION_MINOR, MetaCG_GIT_SHA}));
+      mcgWriter = std::make_unique<metacg::io::VersionTwoMCGWriter>(metacg::MCGFileInfo(
+          {2, 0},
+          {std::string("CGCollector2"), MetaCG_VERSION_MAJOR, MetaCG_VERSION_MINOR, MetaCG_GIT_SHA}));
       break;
-    case 3: SPDLOG_WARN("V3 format was removed and is currently not supported, using V4 instead");
-      __attribute__ ((fallthrough));
-    case 4: mcgWriter = std::make_unique<metacg::io::VersionFourMCGWriter>(metacg::getVersionTwoFileInfo({std::string("CGCollector2"), MetaCG_VERSION_MAJOR,
-                                                                                                    MetaCG_VERSION_MINOR, MetaCG_GIT_SHA}));
+    case 3:
+      SPDLOG_WARN("V3 format was removed and is currently not supported, using V4 instead");
+      __attribute__((fallthrough));
+    case 4:
+      mcgWriter = std::make_unique<metacg::io::VersionFourMCGWriter>(metacg::MCGFileInfo(
+          {4, 0},
+          {std::string("CGCollector2"), MetaCG_VERSION_MAJOR, MetaCG_VERSION_MINOR, MetaCG_GIT_SHA}));
       break;
     default:
       assert(false && "The selected output format is not recognized");
-      SPDLOG_WARN("The selected output format {} is not recognized. Using default format (V2) instead",mcgVersion);
+      SPDLOG_WARN("The selected output format {} is not recognized. Using default format (V2) instead", mcgVersion);
       mcgWriter = std::make_unique<metacg::io::VersionTwoMCGWriter>();
   }
 
-
   metacg::io::JsonSink js;
   mcgWriter->write(callgraph, js);
   auto& sm = Context.getSourceManager();