Skip to content

Remove shadowing variable names. #20

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
susilehtola wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove shadowing variable names. #20

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
40 changes: 20 additions & 20 deletions cmdline.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ inline std::string readable_typename<std::string>()

class cmdline_error : public std::exception {
public:
cmdline_error(const std::string &msg): msg(msg){}
cmdline_error(const std::string &message): msg(message){}
~cmdline_error() throw() {}
const char *what() const throw() { return msg.c_str(); }
private:
Expand All @@ -151,7 +151,7 @@ struct default_reader{

template <class T>
struct range_reader{
range_reader(const T &low, const T &high): low(low), high(high) {}
range_reader(const T &lower_bound, const T &upper_bound): low(lower_bound), high(upper_bound) {}
T operator()(const std::string &s) const {
T ret=default_reader<T>()(s);
if (!(ret>=low && ret<=high)) throw cmdline::cmdline_error("range_error");
Expand Down Expand Up @@ -639,10 +639,10 @@ class parser{

class option_without_value : public option_base {
public:
option_without_value(const std::string &name,
option_without_value(const std::string &full_name,
char short_name,
const std::string &desc)
:nam(name), snam(short_name), desc(desc), has(false){
const std::string &description)
:nam(full_name), snam(short_name), desc(description), has(false){
}
~option_without_value(){}

Expand Down Expand Up @@ -695,14 +695,14 @@ class parser{
template <class T>
class option_with_value : public option_base {
public:
option_with_value(const std::string &name,
option_with_value(const std::string &full_name,
char short_name,
bool need,
const T &def,
const std::string &desc)
: nam(name), snam(short_name), need(need), has(false)
, def(def), actual(def) {
this->desc=full_description(desc);
bool is_needed,
const T &definition,
const std::string &description)
: nam(full_name), snam(short_name), need(is_needed), has(false)
, def(definition), actual(definition) {
this->desc=full_description(description);
}
~option_with_value(){}

Expand Down Expand Up @@ -757,9 +757,9 @@ class parser{
}

protected:
std::string full_description(const std::string &desc){
std::string full_description(const std::string &description){
return
desc+" ("+detail::readable_typename<T>()+
description+" ("+detail::readable_typename<T>()+
(need?"":" [="+detail::default_value<T>(def)+"]")
+")";
}
Expand All @@ -779,13 +779,13 @@ class parser{
template <class T, class F>
class option_with_value_with_reader : public option_with_value<T> {
public:
option_with_value_with_reader(const std::string &name,
option_with_value_with_reader(const std::string &full_name,
char short_name,
bool need,
const T def,
const std::string &desc,
F reader)
: option_with_value<T>(name, short_name, need, def, desc), reader(reader){
bool is_needed,
const T definition,
const std::string &description,
F value_reader)
: option_with_value<T>(full_name, short_name, is_needed, definition, description), reader(value_reader){
}

private:
Expand Down