Merge branch 'develop'

Author: strandfield

README.md

@@ -4,7 +4,11 @@
 `cppscanner` is a standalone command-line utility to create snapshots of C++ programs.
 It is based on clang's [LibTooling](https://clang.llvm.org/docs/LibTooling.html).
 
-Snapshots are saved as a SQLite database, making them easily usable in other programs.
+Snapshots are saved as SQLite databases, making them easily usable in other programs.<br/>
+The companion project [cppbrowser](https://github.com/strandfield/cppbrowser) provides navigation
+of snapshots in a Web browser.
+
+[Browse the source code](https://code.strandfield.dev/snapshots/cppscanner/0.5.0)
 
 ## Compiling the project
 

modules/cppscanner/base/version.h

@@ -7,9 +7,9 @@
 
 #define CPPSCANNER_VERSION_MAJOR 0
 #define CPPSCANNER_VERSION_MINOR 5
-#define CPPSCANNER_VERSION_PATCH 0
+#define CPPSCANNER_VERSION_PATCH 1
 
-#define CPPSCANNER_VERSION_STRING "0.5.0"
+#define CPPSCANNER_VERSION_STRING "0.5.1"
 
 namespace cppscanner
 {

modules/cppscanner/database/database.cpp

@@ -13,7 +13,7 @@
 namespace cppscanner
 {
 
-Database::Database(Database&& other) :
+Database::Database(Database&& other) noexcept :
   m_database(other.m_database)
 {
   other.m_database = nullptr;
@@ -83,7 +83,7 @@ void Database::close()
   m_database = nullptr;
 }
 
-Database& Database::operator=(Database&& other)
+Database& Database::operator=(Database&& other) noexcept
 {
   m_database = other.m_database;
   other.m_database = nullptr;

modules/cppscanner/database/database.h

@@ -27,7 +27,7 @@ class Database
 public:
   Database() = default;
   Database(const Database&) = delete;
-  Database(Database&& other);
+  Database(Database&& other) noexcept;
   ~Database();
 
   sqlite3* sqliteHandle() const;
@@ -41,7 +41,7 @@ class Database
   void close();
 
   Database& operator=(const Database&) = delete;
-  Database& operator=(Database&& other);
+  Database& operator=(Database&& other) noexcept;
 
 private:
   sqlite3* m_database = nullptr;

modules/cppscanner/database/sql.h

@@ -53,7 +53,7 @@ class Statement
   explicit Statement(Database& db);
   Statement(Database& db, const char* query);
   Statement(const Statement&) = delete;
-  Statement(Statement&& other);
+  Statement(Statement&& other) noexcept;
   ~Statement();
 
   Database& database() const;
@@ -100,7 +100,7 @@ inline Statement::Statement(Database& db, const char* query)
   prepare(query);
 }
 
-inline Statement::Statement(Statement&& other) :
+inline Statement::Statement(Statement&& other) noexcept :
   m_database(other.m_database),
   m_statement(other.m_statement)
 {

modules/cppscanner/scannerInvocation/scannerinvocation.cpp

@@ -19,11 +19,6 @@ namespace cppscanner
 namespace
 {
 
-bool isOption(const std::string& arg)
-{
-  return !arg.empty() && arg.front() == '-';
-}
-
 // test if arg is "-j<number>"
 bool isJobsArg(const std::string& arg)
 {
@@ -460,7 +455,7 @@ constexpr const char* RUN_DESCRIPTION = R"(Description:
 
 constexpr const char* RUN_EXAMPLES = R"(Example:
   Compile a single file with C++17 enabled:
-    cppscanner -i source.cpp -o snapshot.db -- -std=c++17)";
+    cppscanner run -i source.cpp -o snapshot.db -- -std=c++17)";
 
 constexpr const char* MERGE_DESCRIPTION = R"(Description:
   Merge two or more snapshots into one.)";

modules/cppscanner/snapshot/merge.cpp

@@ -289,76 +289,92 @@ void SnapshotMerger::runMerge()
   {
     Snapshot::Properties properties;
 
-    properties["cppscanner.version"] = cppscanner::versioncstr();
-    properties["cppscanner.os"] = cppscanner::system_name();
-
-    bool a_new_home = false;
-
-    // look at home value for each project
+    // process properties as found in the snapshots
     {
-      std::optional<std::string> common_home;
-      ValueUpdater updater{ common_home };
+      std::set<std::string> property_names;
 
       for (InputSnapshot& snapshot : m_snapshots)
       {
-        updater.update(snapshot.properties.at("project.home"));
+        for (const auto& p : snapshot.properties)
+        {
+          property_names.insert(p.first);
+        }
       }
 
-      if (updater.valid())
-      {
-        home = common_home.value();
-      }
-      else
+      for (const std::string& key : property_names)
       {
-        a_new_home = true;
-        // TODO: print warning ?
+        std::optional<std::string> value;
+        ValueUpdater updater{ value };
+
+        for (InputSnapshot& snapshot : m_snapshots)
+        {
+          updater.update(getProperty(snapshot.properties, key));
+        }
+
+        if (updater.valid())
+        {
+          properties[key] = *value;
+        }
       }
     }
 
-    if (m_project_home_path.has_value())
+    // compute the "home" property
     {
-      std::string final_home = Snapshot::normalizedPath(m_project_home_path->generic_u8string());
-      a_new_home = a_new_home || final_home != home;
-      home = std::move(final_home);
-    }
+      bool a_new_home = false;
 
-    if (home.empty())
-    {
-      // this is bad.
-      // TODO: abort merge ?
-    }
+      // look at home value for each project
+      {
+        std::optional<std::string> common_home;
+        ValueUpdater updater{ common_home };
 
-    if (a_new_home)
-    {
-      // TODO: voir si on peut trouver une autre façon de rapporter l'info
-      std::cout << "Input snapshots do not have a common project.home property, or a new one was specified." << "\n";
-      std::cout << "Some data may be erased." << std::endl;
-    }
+        for (InputSnapshot& snapshot : m_snapshots)
+        {
+          updater.update(snapshot.properties.at("project.home"));
+        }
 
-    properties["project.home"] = home;
+        if (updater.valid())
+        {
+          home = common_home.value();
+        }
+        else
+        {
+          a_new_home = true;
+          // TODO: print warning ?
+        }
+      }
 
-    const std::vector<std::string> extraProps{ "scanner.indexLocalSymbols", "scanner.indexExternalFiles", "scanner.root" };
-    for (const std::string& key : extraProps)
-    {
-      std::optional<std::string> value;
-      ValueUpdater updater{ value };
+      if (m_project_home_path.has_value())
+      {
+        std::string final_home = Snapshot::normalizedPath(m_project_home_path->generic_u8string());
+        a_new_home = a_new_home || final_home != home;
+        home = std::move(final_home);
+      }
 
-      for (InputSnapshot& snapshot : m_snapshots)
+      if (home.empty())
       {
-        updater.update(getProperty(snapshot.properties, key));
+        // this is bad.
+        // TODO: abort merge ?
       }
 
-      if (updater.valid())
+      if (a_new_home)
       {
-        properties[key] = *value;
+        // TODO: voir si on peut trouver une autre façon de rapporter l'info
+        std::cout << "Input snapshots do not have a common project.home property, or a new one was specified." << "\n";
+        std::cout << "Some data may be erased." << std::endl;
       }
-    }
 
+      properties["project.home"] = home;
+    }
+    
+    // write extra properties
     for (const auto& p : m_extra_properties)
     {
       properties[p.first] = p.second;
     }
 
+    properties["cppscanner.version"] = cppscanner::versioncstr();
+    properties["cppscanner.os"] = cppscanner::system_name();
+
     writer().beginTransaction();
     writer().insert(properties);
     writer().endTransaction();

modules/cppscanner/snapshot/snapshotwriter.cpp

@@ -85,7 +85,7 @@ static const char* SQL_CREATE_STATEMENTS = R"(
 BEGIN TRANSACTION;
 
 CREATE TABLE "info" (
-  "key" TEXT NOT NULL,
+  "key" TEXT NOT NULL UNIQUE,
   "value" TEXT NOT NULL
 );
 

tests/selftest.cpp

@@ -1,6 +1,7 @@
 
 #include "helpers.h"
 
+#include "cppscanner/base/config.h"
 #include "cppscanner/scannerInvocation/scannerinvocation.h"
 #include "cppscanner/index/symbol.h"
 #include "cppscanner/database/sql.h"
@@ -44,6 +45,10 @@ TEST_CASE("Self parsing test", "[scanner][self]")
 
   SnapshotReader s{ snapshot_name };
 
+  Snapshot::Properties props = s.readProperties();
+  REQUIRE(props[PROPERTY_PROJECT_NAME] == "cppscanner");
+  REQUIRE(props[PROPERTY_PROJECT_VERSION] == cppscanner::versioncstr());
+
   // verify the presence of some classes
   {
     SymbolRecord ns = s.getSymbolByName("cppscanner");