maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

style(3p/nix): Remove 'using std::*' from types.hh

Browse source 
It is considered bad form to use things from includes in headers, as
these directives propagate to everywhere else and can make it
confusing.

types.hh (which is includes almost literally everywhere) had some of
these directives, which this commit removes.
This commit is contained in:
Vincent Ambo 2020-05-24 22:29:21 +01:00
parent f30b2e610d
commit 838f86b0fd
85 changed files with 859 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

39
third_party/nix/src/libexpr/nixexpr.hh vendored
View file

@ -8,15 +8,18 @@
namespace nix {
MakeError(EvalError, Error) MakeError(ParseError, Error)
MakeError(AssertionError, EvalError) MakeError(ThrownError, AssertionError)
MakeError(Abort, EvalError) MakeError(TypeError, EvalError)
MakeError(UndefinedVarError, Error)
MakeError(RestrictedPathError, Error)
MakeError(EvalError, Error);
MakeError(ParseError, Error);
MakeError(AssertionError, EvalError);
MakeError(ThrownError, AssertionError);
MakeError(Abort, EvalError);
MakeError(TypeError, EvalError);
MakeError(UndefinedVarError, Error);
MakeError(RestrictedPathError, Error);
/* Position objects. */
/* Position objects. */
struct Pos {
struct Pos {
Symbol file;
unsigned int line, column;
Pos() : line(0), column(0){};
@ -30,7 +33,7 @@ MakeError(EvalError, Error) MakeError(ParseError, Error)
if (!p2.line) {
return false;
}
int d = ((string)file).compare((string)p2.file);
int d = ((std::string)file).compare((std::string)p2.file);
if (d < 0) {
return true;
}
@ -66,7 +69,7 @@ struct AttrName {
typedef std::vector<AttrName> AttrPath;
string showAttrPath(const AttrPath& attrPath);
std::string showAttrPath(const AttrPath& attrPath);
/* Abstract syntax of Nix expressions. */
@ -297,16 +300,20 @@ struct ExprOpNot : Expr {
void eval(EvalState& state, Env& env, Value& v); \
};
MakeBinOp(ExprApp, "") MakeBinOp(ExprOpEq, "==") MakeBinOp(ExprOpNEq, "!=")
MakeBinOp(ExprOpAnd, "&&") MakeBinOp(ExprOpOr, "||")
MakeBinOp(ExprOpImpl, "->") MakeBinOp(ExprOpUpdate, "//")
MakeBinOp(ExprOpConcatLists, "++")
MakeBinOp(ExprApp, "");
MakeBinOp(ExprOpEq, "==");
MakeBinOp(ExprOpNEq, "!=");
MakeBinOp(ExprOpAnd, "&&");
MakeBinOp(ExprOpOr, "||");
MakeBinOp(ExprOpImpl, "->");
MakeBinOp(ExprOpUpdate, "//");
MakeBinOp(ExprOpConcatLists, "++");
struct ExprConcatStrings : Expr {
struct ExprConcatStrings : Expr {
Pos pos;
bool forceString;
vector<Expr*>* es;
ExprConcatStrings(const Pos& pos, bool forceString, vector<Expr*>* es)
std::vector<Expr*>* es;
ExprConcatStrings(const Pos& pos, bool forceString, std::vector<Expr*>* es)
: pos(pos), forceString(forceString), es(es){};
COMMON_METHODS
};