Merge pull request #16 from SSARCandy/feat/disallow-duplicate-keys

Throw error when encounters duplicate key

Author: hhschu

ini/INIReader.h

@@ -279,16 +279,13 @@ inline int INIReader::ParseError() const {
             break;
         case -1:
             throw std::runtime_error("ini file not found.");
-            break;
         case -2:
             throw std::runtime_error("memory alloc error");
-            break;
         default:
             throw std::runtime_error("parse error on line no: " +
                                      std::to_string(_error));
-            break;
     }
-    return _error;
+    return 0;
 }
 
 inline const std::set<std::string> INIReader::Sections() const {
@@ -408,9 +405,11 @@ inline const bool INIReader::BoolConverter(std::string s) const {
 inline int INIReader::ValueHandler(void* user, const char* section,
                                    const char* name, const char* value) {
     INIReader* reader = (INIReader*)user;
-    if (reader->_values[section][name].size() > 0)
-        reader->_values[section][name] += "\n";
-    reader->_values[section][name] += value;
+    if (reader->_values[section][name].size() > 0) {
+        throw std::runtime_error("duplicate key '" + std::string(name) +
+                                 "' in section '" + section + "'.");
+    }
+    reader->_values[section][name] = value;
     return 1;
 }
 }

test/fixtures/config.ini

@@ -1,7 +1,7 @@
 [section1]
 
 any=1
-any2=true
+any2:true
 not_int = hello
 not_int_arr = a b c d e
 

test/fixtures/duplicate_keys.ini

@@ -0,0 +1,4 @@
+[bad_section]
+foo = hello
+bar = 42
+foo = world

test/tests.cpp

@@ -108,3 +108,8 @@ TEST(INIReader, read_big_file) {
         EXPECT_EQ(v, i);
     }
 }
+
+TEST(INIReader, dulicate_keys) {
+    EXPECT_THROW(INIReader{"./fixtures/duplicate_keys.ini"},
+                 std::runtime_error);
+}