cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #1959 from redfish64/master

Browse source 
Modified MakeBinOp to no longer produce its name using concatenation …
This commit is contained in:
Eelco Dolstra 2018-03-09 14:06:44 +01:00 committed by GitHub
commit dc83c8eea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libexpr/nixexpr.hh
View file

@ -283,12 +283,12 @@ struct ExprOpNot : Expr
}; };
#define MakeBinOp(name, s) \ #define MakeBinOp(name, s) \
struct Expr##name : Expr \ struct name : Expr \
{ \ { \
Pos pos; \ Pos pos; \
Expr * e1, * e2; \ Expr * e1, * e2; \
Expr##name(Expr * e1, Expr * e2) : e1(e1), e2(e2) { }; \ name(Expr * e1, Expr * e2) : e1(e1), e2(e2) { }; \
Expr##name(const Pos & pos, Expr * e1, Expr * e2) : pos(pos), e1(e1), e2(e2) { }; \ name(const Pos & pos, Expr * e1, Expr * e2) : pos(pos), e1(e1), e2(e2) { }; \
void show(std::ostream & str) \ void show(std::ostream & str) \
{ \ { \
str << "(" << *e1 << " " s " " << *e2 << ")"; \ str << "(" << *e1 << " " s " " << *e2 << ")"; \
@ -300,14 +300,14 @@ struct ExprOpNot : Expr
void eval(EvalState & state, Env & env, Value & v); \ void eval(EvalState & state, Env & env, Value & v); \
}; };
MakeBinOp(App, "") MakeBinOp(ExprApp, "")
MakeBinOp(OpEq, "==") MakeBinOp(ExprOpEq, "==")
MakeBinOp(OpNEq, "!=") MakeBinOp(ExprOpNEq, "!=")
MakeBinOp(OpAnd, "&&") MakeBinOp(ExprOpAnd, "&&")
MakeBinOp(OpOr, "||") MakeBinOp(ExprOpOr, "||")
MakeBinOp(OpImpl, "->") MakeBinOp(ExprOpImpl, "->")
MakeBinOp(OpUpdate, "//") MakeBinOp(ExprOpUpdate, "//")
MakeBinOp(OpConcatLists, "++") MakeBinOp(ExprOpConcatLists, "++")
struct ExprConcatStrings : Expr struct ExprConcatStrings : Expr
{ {