Optimize size of code generated from ConfigFromString and ConfigToString classes

Author: danielkrupinski

Source/Config/ConfigFromString.h

@@ -49,33 +49,49 @@ class ConfigFromString {
 
     void boolean(const char8_t* key, auto&& valueSetter, auto&& /* valueGetter */) noexcept
     {
+        if (bool value; parseBool(key, value))
+            valueSetter(value);
+    }
+
+    void uint(const char8_t* key, auto&& valueSetter, auto&& /* valueGetter */) noexcept
+    {
+        if (std::uint64_t value; parseUint(key, value))
+            valueSetter(value);
+    }
+
+private:
+    [[nodiscard]] bool parseBool(const char8_t* key, bool& value) noexcept
+    {
+        bool parsed = false;
         if (shouldReadMe()) {
             const auto previousReadIndex = readIndex;
-            if (bool parsedBool{}; readUntilStartOfValue(key) && parseBool(parsedBool)) {
-                valueSetter(parsedBool);
+            if (readUntilStartOfValue(key) && parseBool(value)) {
+                parsed = true;
                 markElementReadAtCurrentNestingLevel();
             } else {
                 readIndex = previousReadIndex;
             }
         }
         increaseIndexInNestingLevel();
+        return parsed;
     }
 
-    void uint(const char8_t* key, auto&& valueSetter, auto&& /* valueGetter */) noexcept
+    [[nodiscard]] bool parseUint(const char8_t* key, std::uint64_t& value) noexcept
     {
+        bool parsed = false;
         if (shouldReadMe()) {
             const auto previousReadIndex = readIndex;
-            if (std::uint64_t parsedUint{}; readUntilStartOfValue(key) && parseUint(parsedUint)) {
-                valueSetter(parsedUint);
+            if (readUntilStartOfValue(key) && parseUint(value)) {
+                parsed = true;
                 markElementReadAtCurrentNestingLevel();
             } else {
                 readIndex = previousReadIndex;
             }
         }
         increaseIndexInNestingLevel();
+        return parsed;
     }
 
-private:
     void markConversionComplete() noexcept
     {
         assert(conversionState.nestingLevel == 1);

Source/Config/ConfigToString.h

@@ -57,30 +57,40 @@ class ConfigToString {
     }
 
     void boolean(const char8_t* key, auto&& /* valueSetter */, auto&& valueGetter) noexcept
+    {
+        writeBool(key, valueGetter());
+    }
+
+    void uint(const char8_t* key, auto&& /* valueSetter */, auto&& valueGetter) noexcept
+    {
+        writeUint(key, valueGetter());
+    }
+
+private:
+    void writeBool(const char8_t* key, bool value) noexcept
     {
         if (shouldWriteMe()) {
             const auto previousWriteIndex = writeIndex;
-            if (writeCommaAfterPreviousElement() && writeKey(key) && writeBool(valueGetter()))
+            if (writeCommaAfterPreviousElement() && writeKey(key) && writeBool(value))
                 increaseConversionIndexInNestingLevel();
             else
                 writeIndex = previousWriteIndex;
         }
         increaseIndexInNestingLevel();
     }
 
-    void uint(const char8_t* key, auto&& /* valueSetter */, auto&& valueGetter) noexcept
+    void writeUint(const char8_t* key, std::uint64_t value) noexcept
     {
         if (shouldWriteMe()) {
             const auto previousWriteIndex = writeIndex;
-            if (writeCommaAfterPreviousElement() && writeKey(key) && writeUint(valueGetter()))
+            if (writeCommaAfterPreviousElement() && writeKey(key) && writeUint(value))
                 increaseConversionIndexInNestingLevel();
             else
                 writeIndex = previousWriteIndex;
         }
         increaseIndexInNestingLevel();
     }
 
-private:
     [[nodiscard]] bool writeKey(const char8_t* key) noexcept
     {
         return writeChar(u8'"') && writeString(key) && writeString(u8"\":");
@@ -125,7 +135,7 @@ class ConfigToString {
         ++indexInNestingLevel[nestingLevel];
     }
 
-    void increaseConversionIndexInNestingLevel()const noexcept
+    void increaseConversionIndexInNestingLevel() const noexcept
     {
         assert(conversionState.indexInNestingLevel[conversionState.nestingLevel] < config_params::kMaxObjectIndex);
         ++conversionState.indexInNestingLevel[conversionState.nestingLevel];