feat(tvix): Add a pos field to more expr classes r/1906

To aid in both debugging and (eventually) printing stacktraces, add a
Pos member to a few more Expr variants.

Change-Id: Ic1d2a056fc7e6c07bc3e79fa38845cb4a5da5ca5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2133
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>

1 files changed, 9 insertions, 1 deletions

diff --git a/third_party/nix/src/libexpr/nixexpr.hh b/third_party/nix/src/libexpr/nixexpr.hh
index 22b5f871f0ad..16b58dec2e84 100644
--- a/third_party/nix/src/libexpr/nixexpr.hh
+++ b/third_party/nix/src/libexpr/nixexpr.hh
@@ -179,9 +179,12 @@ struct ExprSelect : Expr {
 };
 
 struct ExprOpHasAttr : Expr {
+  Pos pos;
   Expr* e;
   AttrPath attrPath;
   ExprOpHasAttr(Expr* e, const AttrPath& attrPath) : e(e), attrPath(attrPath){};
+  ExprOpHasAttr(const Pos& pos, Expr* e, const AttrPath& attrPath)
+      : pos(pos), e(e), attrPath(attrPath){};
   COMMON_METHODS
 };
 
@@ -279,9 +282,12 @@ struct ExprWith : Expr {
 };
 
 struct ExprIf : Expr {
+  Pos pos;
   Expr *cond, *then, *else_;
   ExprIf(Expr* cond, Expr* then, Expr* else_)
       : cond(cond), then(then), else_(else_){};
+  ExprIf(const Pos& pos, Expr* cond, Expr* then, Expr* else_)
+      : pos(pos), cond(cond), then(then), else_(else_){};
   COMMON_METHODS
 };
 
@@ -294,8 +300,10 @@ struct ExprAssert : Expr {
 };
 
 struct ExprOpNot : Expr {
+  Pos pos;
   Expr* e;
-  ExprOpNot(Expr* e) : e(e){};
+  explicit ExprOpNot(Expr* e) : e(e){};
+  ExprOpNot(const Pos& pos, Expr* e) : pos(pos), e(e){};
   COMMON_METHODS
 };