Clean up the IndexConfig API

Author: Andrew Clarke

src/Index.h

@@ -33,15 +33,18 @@ class Index {
     ~Index();
 
     struct IndexConfig {
-        bool numeric = false;
-        bool unique = false;
-        bool sparse = false;
-        bool indexLineOffsets = false;
-        IndexConfig(bool n, bool u, bool s, bool i) :
-                numeric{n}, unique{u}, sparse{s}, indexLineOffsets{i} {};
+        bool numeric;
+        bool unique;
+        bool sparse;
+        bool indexLineOffsets;
 
         IndexConfig() :
                 numeric{false}, unique{false}, sparse{false}, indexLineOffsets{false} {};
+        
+        IndexConfig withNumeric(bool b) { numeric = b; return *this; };
+        IndexConfig withUnique(bool b) { unique = b; return *this; };
+        IndexConfig withSparse(bool b) { sparse = b; return *this; };
+        IndexConfig withIndexLineOffsets(bool b) { indexLineOffsets = b; return *this; };
     };
 
     // Retrieve a single line by line number, calling the supplied LineSink with

tests/IndexTest.cpp

@@ -51,7 +51,7 @@ TEST_CASE("indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("^Line ([0-9]+)"));
         builder
-                .addIndexer("default", "blah", Index::IndexConfig{ true, true, false, false }, move(indexer))
+                .addIndexer("default", "blah", Index::IndexConfig().withNumeric(true).withUnique(true), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -88,7 +88,7 @@ TEST_CASE("indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("Mod ([0-9]+)"));
         CHECK_THROWS(
-                builder.addIndexer("default", "blah", Index::IndexConfig{ true, true, false, false },
+                builder.addIndexer("default", "blah", Index::IndexConfig().withNumeric(true).withUnique(true),
                                    move(indexer))
                         .indexEvery(256 * 1024)
                         .build());
@@ -98,7 +98,7 @@ TEST_CASE("indexes files", "[Index]") {
         Index::Builder builder(log, File(fopen(testFile.c_str(), "rb")),
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("Mod ([0-9]+)"));
-        builder.addIndexer("default", "blah", Index::IndexConfig{ true, false, false, false }, move(indexer))
+        builder.addIndexer("default", "blah", Index::IndexConfig().withNumeric(true), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -131,7 +131,7 @@ TEST_CASE("indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("Hex ([0-9a-f]+)"));
         builder
-                .addIndexer("default", "blah", Index::IndexConfig{ false, true, false, false }, move(indexer))
+                .addIndexer("default", "blah", Index::IndexConfig().withUnique(true), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -158,7 +158,7 @@ TEST_CASE("indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("\\w+"));
         builder
-                .addIndexer("default", "blah", Index::IndexConfig{ false, false, false, false }, move(indexer))
+                .addIndexer("default", "blah", Index::IndexConfig(), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -183,7 +183,7 @@ TEST_CASE("indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         builder.skipFirst(2);
         unique_ptr<LineIndexer> indexer(new FieldIndexer(' ', 2));
-        builder.addIndexer("default", "blah", Index::IndexConfig{ true, false, false, false }, move(indexer))
+        builder.addIndexer("default", "blah", Index::IndexConfig().withNumeric(true), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -231,7 +231,7 @@ TEST_CASE("sparsely indexes files", "[Index]") {
                                testFile, testFile + ".zindex");
         unique_ptr<LineIndexer> indexer(new RegExpIndexer("Line ([^-]+) "));
         builder
-                .addIndexer("default", "blah", Index::IndexConfig{ false, false, false, false }, move(indexer))
+                .addIndexer("default", "blah", Index::IndexConfig(), move(indexer))
                 .indexEvery(256 * 1024)
                 .build();
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),
@@ -267,7 +267,7 @@ TEST_CASE("metadata tests", "[Index]") {
                            testFile + ".zindex");
     unique_ptr<LineIndexer> indexer(new RegExpIndexer("\\w+"));
     builder
-            .addIndexer("default", "blah", Index::IndexConfig{ false, false, false, false }, move(indexer))
+            .addIndexer("default", "blah", Index::IndexConfig(), move(indexer))
             .build();
     SECTION("loads metadata") {
         Index index = Index::load(log, File(fopen(testFile.c_str(), "rb")),