diff options
| author | Kane York <kanepyork@gmail.com> | 2020-08-10T05·42-0700 |
|---|---|---|
| committer | kanepyork <rikingcoding@gmail.com> | 2020-08-10T22·16+0000 |
| commit | 906f5c1d2d442b1d34621b97950c38c659b729a6 (patch) | |
| tree | 48b663ee52e56f8471539afece70de67a0144622 /third_party/nix/src/libexpr/parser.hh | |
| parent | 42bdaacca62ad5760e5d46315f1e6dc2bcc3fd96 (diff) | |
fix(3p/nix): inherit Expr from gc, make parser state traceable r/1633
The parser contained vectors, and the primary parser state, that were not participating in GC tracing. Change-Id: Ie198592cd7acffd390e3e2ae9595138b56416838 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1706 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/nix/src/libexpr/parser.hh')
| -rw-r--r-- | third_party/nix/src/libexpr/parser.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/nix/src/libexpr/parser.hh b/third_party/nix/src/libexpr/parser.hh index 7b8f95573176..ca7a88b3b9c1 100644 --- a/third_party/nix/src/libexpr/parser.hh +++ b/third_party/nix/src/libexpr/parser.hh @@ -5,6 +5,7 @@ #include <optional> #include <variant> +#include <gc/gc.h> #include <glog/logging.h> #include "libexpr/eval.hh" @@ -59,8 +60,7 @@ void addAttr(ExprAttrs* attrs, AttrPath& attrPath, Expr* e, const Pos& pos); void addFormal(const Pos& pos, Formals* formals, const Formal& formal); -Expr* stripIndentation(const Pos& pos, SymbolTable& symbols, - std::vector<Expr*>& es); +Expr* stripIndentation(const Pos& pos, SymbolTable& symbols, VectorExprs& es); Path resolveExprPath(Path path); |