bbjubjub2494/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove unneeded semicolons

Browse source
This commit is contained in:
John Ericson 2019-11-10 11:23:35 -05:00
parent 96e6e680c1
commit 4c34054673
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/eval.cc
View file

@ -432,7 +432,7 @@ Path EvalState::toRealPath(const Path & path, const PathSet & context)
!context.empty() && store->isInStore(path) !context.empty() && store->isInStore(path)
? store->toRealPath(path) ? store->toRealPath(path)
: path; : path;
}; }
Value * EvalState::addConstant(const string & name, Value & v) Value * EvalState::addConstant(const string & name, Value & v)

26
src/libutil/args.hh
View file

@ -70,23 +70,23 @@ public:
Args & args; Args & args;
Flag::ptr flag; Flag::ptr flag;
friend class Args; friend class Args;
FlagMaker(Args & args) : args(args), flag(std::make_shared<Flag>()) { }; FlagMaker(Args & args) : args(args), flag(std::make_shared<Flag>()) { }
public: public:
~FlagMaker(); ~FlagMaker();
FlagMaker & longName(const std::string & s) { flag->longName = s; return *this; }; FlagMaker & longName(const std::string & s) { flag->longName = s; return *this; }
FlagMaker & shortName(char s) { flag->shortName = s; return *this; }; FlagMaker & shortName(char s) { flag->shortName = s; return *this; }
FlagMaker & description(const std::string & s) { flag->description = s; return *this; }; FlagMaker & description(const std::string & s) { flag->description = s; return *this; }
FlagMaker & label(const std::string & l) { flag->arity = 1; flag->labels = {l}; return *this; }; FlagMaker & label(const std::string & l) { flag->arity = 1; flag->labels = {l}; return *this; }
FlagMaker & labels(const Strings & ls) { flag->arity = ls.size(); flag->labels = ls; return *this; }; FlagMaker & labels(const Strings & ls) { flag->arity = ls.size(); flag->labels = ls; return *this; }
FlagMaker & arity(size_t arity) { flag->arity = arity; return *this; }; FlagMaker & arity(size_t arity) { flag->arity = arity; return *this; }
FlagMaker & handler(std::function<void(std::vector<std::string>)> handler) { flag->handler = handler; return *this; }; FlagMaker & handler(std::function<void(std::vector<std::string>)> handler) { flag->handler = handler; return *this; }
FlagMaker & handler(std::function<void()> handler) { flag->handler = [handler](std::vector<std::string>) { handler(); }; return *this; }; FlagMaker & handler(std::function<void()> handler) { flag->handler = [handler](std::vector<std::string>) { handler(); }; return *this; }
FlagMaker & handler(std::function<void(std::string)> handler) { FlagMaker & handler(std::function<void(std::string)> handler) {
flag->arity = 1; flag->arity = 1;
flag->handler = [handler](std::vector<std::string> ss) { handler(std::move(ss[0])); }; flag->handler = [handler](std::vector<std::string> ss) { handler(std::move(ss[0])); };
return *this; return *this;
}; }
FlagMaker & category(const std::string & s) { flag->category = s; return *this; }; FlagMaker & category(const std::string & s) { flag->category = s; return *this; }
template<class T> template<class T>
FlagMaker & dest(T * dest) FlagMaker & dest(T * dest)
@ -94,7 +94,7 @@ public:
flag->arity = 1; flag->arity = 1;
flag->handler = [=](std::vector<std::string> ss) { *dest = ss[0]; }; flag->handler = [=](std::vector<std::string> ss) { *dest = ss[0]; };
return *this; return *this;
}; }
template<class T> template<class T>
FlagMaker & set(T * dest, const T & val) FlagMaker & set(T * dest, const T & val)
@ -102,7 +102,7 @@ public:
flag->arity = 0; flag->arity = 0;
flag->handler = [=](std::vector<std::string> ss) { *dest = val; }; flag->handler = [=](std::vector<std::string> ss) { *dest = val; };
return *this; return *this;
}; }
FlagMaker & mkHashTypeFlag(HashType * ht); FlagMaker & mkHashTypeFlag(HashType * ht);
}; };