avoid to setup default for env values

Author: artpaul

include/cxxopts.hpp

@@ -783,7 +783,7 @@ class parse_result {
   name_hash_map keys_{};
   parsed_hash_map values_{};
   std::vector<key_value> sequential_{};
-  /// List of arguments that did not match any defined option.
+  /// List of arguments that did not match to any defined option.
   std::vector<std::string> unmatched_{};
   /// Number of consument command line arguments.
   size_t consumed_arguments_{0};

src/cxxopts.cpp

@@ -695,8 +695,8 @@ parse_result::count(const std::string& o) const {
 }
 
 bool
-parse_result::has(const std::string& o) const {
-  return count(o) != 0;
+parse_result::has(const std::string& opt) const {
+  return count(opt) != 0;
 }
 
 const option_value&
@@ -859,25 +859,29 @@ class options::option_parser {
       ++current;
     }
 
+    // Setup default or env values.
     for (auto& opt : options_) {
       auto& detail = opt.second;
-      const auto& value = detail->value();
-
       auto& store = parsed_[detail->hash()];
+      const auto& value = detail->value();
 
-      if (value->has_default()) {
-        if (!store.count() && !store.has_default()) {
-          parse_default(detail);
-        }
-      } else {
-        parse_no_value(detail);
+      // Skip options with parsed values.
+      if (store.count() || store.has_default()) {
+        continue;
       }
-
-      if (value->has_env() && !store.count()){
+      // Try to setup env value.
+      if (value->has_env()) {
         if (const char* env = std::getenv(value->get_env_var().c_str())) {
           store.parse(detail, std::string(env));
+          continue;
         }
       }
+      // Try to setup default value.
+      if (value->has_default()) {
+        store.parse_default(detail);
+      } else {
+        store.parse_no_value(detail);
+      }
     }
 
     parse_result::name_hash_map keys;