Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-tmp

src/libexpr/include/nix/expr/meson.build

@@ -20,7 +20,6 @@ headers = [config_pub_h] + files(
   'gc-small-vector.hh',
   'get-drvs.hh',
   'json-to-value.hh',
-  # internal: 'lexer-helpers.hh',
   'nixexpr.hh',
   'parser-state.hh',
   'primops.hh',

src/libexpr/include/nix/expr/nixexpr.hh

@@ -65,7 +65,7 @@ struct DocComment {
 struct AttrName
 {
     Symbol symbol;
-    Expr * expr;
+    Expr * expr = nullptr;
     AttrName(Symbol s) : symbol(s) {};
     AttrName(Expr * e) : expr(e) {};
 };
@@ -159,7 +159,7 @@ struct ExprVar : Expr
 
        `nullptr`: Not from a `with`.
        Valid pointer: the nearest, innermost `with` expression to query first. */
-    ExprWith * fromWith;
+    ExprWith * fromWith = nullptr;
 
     /* In the former case, the value is obtained by going `level`
        levels up from the current environment and getting the
@@ -167,7 +167,7 @@ struct ExprVar : Expr
        value is obtained by getting the attribute named `name` from
        the set stored in the environment that is `level` levels up
        from the current one.*/
-    Level level;
+    Level level = 0;
     Displacement displ = 0;
 
     ExprVar(Symbol name) : name(name) { };

src/libexpr/lexer-helpers.cc

@@ -1,7 +1,4 @@
-#include "lexer-tab.hh"
-#include "parser-tab.hh"
-
-#include "nix/expr/lexer-helpers.hh"
+#include "lexer-helpers.hh"
 
 void nix::lexer::internal::initLoc(YYLTYPE * loc)
 {

src/libexpr/lexer.l

@@ -25,8 +25,7 @@
 #endif
 
 #include "nix/expr/nixexpr.hh"
-#include "parser-tab.hh"
-#include "nix/expr/lexer-helpers.hh"
+#include "lexer-helpers.hh"
 
 namespace nix {
   struct LexerState;