Skip to content

Fixed exists() and catching of optional arguments #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BilawalAhmed0900 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed exists() and catching of optional arguments #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions argparse.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ typedef std::map<std::string, size_t> IndexMap;
class ArgumentParser {
private:
class Any;
class Argument;
struct Argument;
class PlaceHolder;
class Holder;
typedef std::string String;
Expand Down Expand Up @@ -301,6 +301,12 @@ class ArgumentParser {
.append(active_name),
true);
active = arguments_[index_[el]];

// if the argument is optional and more arguments are not required
if (active.optional && nrequired == 0)
{
variables_[index_[el]].castTo<String>() = "true";
}
// check if we've satisfied the required arguments
if (active.optional && nrequired > 0)
argumentError(String("encountered optional argument ")
Expand Down Expand Up @@ -416,7 +422,17 @@ class ArgumentParser {
arguments_.clear();
variables_.clear();
}
bool exists(const String& name) const { return index_.count(delimit(name)) > 0; }
bool exists(const String& name) {
for (size_t i = 0; i < arguments_.size(); ++i)
{
// if the argument name is given and we have setted it to true in parse
if (arguments_[i].name == delimit(name) && variables_[i].castTo<String>() == "true")
return true;
}

return false;
/*return index_.count(delimit(name)) > 0;*/
}
size_t count(const String& name) {
// check if the name is an argument
if (index_.count(delimit(name)) == 0) return 0;
Expand Down