pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config): Avoid double value lookup

Browse Source
This commit is contained in:
Michael Carlberg 2016-12-15 20:57:03 +01:00
parent 5b544e9581
commit 140a3a6327
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/components/config.hpp
View File

@ -67,8 +67,8 @@ class config {
template <typename T> template <typename T>
T get(const string& section, const string& key, const T& default_value) const { T get(const string& section, const string& key, const T& default_value) const {
try { try {
T result{get<T>(section, key)};
string string_value{get<string>(section, key)}; string string_value{get<string>(section, key)};
T result{convert<T>(string{string_value})};
return dereference<T>(move(section), move(key), move(string_value), move(result)); return dereference<T>(move(section), move(key), move(string_value), move(result));
} catch (const key_error& err) { } catch (const key_error& err) {
return default_value; return default_value;
@ -93,7 +93,7 @@ class config {
while (true) { while (true) {
try { try {
string string_value{get<string>(section, key + "-" + to_string(results.size()))}; string string_value{get<string>(section, key + "-" + to_string(results.size()))};
T value{get<T>(section, key + "-" + to_string(results.size()))}; T value{convert<T>(string{string_value})};
if (!string_value.empty()) { if (!string_value.empty()) {
results.emplace_back(dereference<T>(section, key, move(string_value), move(value))); results.emplace_back(dereference<T>(section, key, move(string_value), move(value)));
@ -123,7 +123,7 @@ class config {
while (true) { while (true) {
try { try {
string string_value{get<string>(section, key + "-" + to_string(results.size()))}; string string_value{get<string>(section, key + "-" + to_string(results.size()))};
T value{get<T>(section, key + "-" + to_string(results.size()))}; T value{convert<T>(string{string_value})};
if (!string_value.empty()) { if (!string_value.empty()) {
results.emplace_back(dereference<T>(section, key, move(string_value), move(value))); results.emplace_back(dereference<T>(section, key, move(string_value), move(value)));
@ -220,8 +220,9 @@ class config {
section = string_util::replace(section, "self", current_section, 0, 4); section = string_util::replace(section, "self", current_section, 0, 4);
try { try {
T result{get<T>(section, key)}; string string_value{get<string>(section, key)};
return dereference<T>(string(section), move(key), get<string>(section, key), move(result)); T result{convert<T>(string{string_value})};
return dereference<T>(string(section), move(key), move(string_value), move(result));
} catch (const key_error& err) { } catch (const key_error& err) {
throw value_error("Unexisting reference defined [" + section + "." + key + "]"); throw value_error("Unexisting reference defined [" + section + "." + key + "]");
} }