Replace Value type setters with mk* functions

Move clearValue inside Value

mkInt instead of setInt

mkBool instead of setBool

mkString instead of setString

mkPath instead of setPath

mkNull instead of setNull

mkAttrs instead of setAttrs

mkList instead of setList*

mkThunk instead of setThunk

mkApp instead of setApp

mkLambda instead of setLambda

mkBlackhole instead of setBlackhole

mkPrimOp instead of setPrimOp

mkPrimOpApp instead of setPrimOpApp

mkExternal instead of setExternal

mkFloat instead of setFloat

Add note that the static mk* function should be removed eventually

src/libexpr/attr-set.cc

@@ -24,9 +24,7 @@ void EvalState::mkAttrs(Value & v, size_t capacity)
  v = vEmptySet;
  return;
  }
- clearValue(v);
- v.setAttrs();
- v.attrs = allocBindings(capacity);
+ v.mkAttrs(allocBindings(capacity));
  nrAttrsets++;
  nrAttrsInAttrsets += capacity;
 }

src/libexpr/eval-inline.hh

@@ -36,13 +36,11 @@ void EvalState::forceValue(Value & v, const Pos & pos)
  Env * env = v.thunk.env;
  Expr * expr = v.thunk.expr;
  try {
- v.setBlackhole();
+ v.mkBlackhole();
  //checkInterrupt();
  expr->eval(*this, *env, v);
  } catch (...) {
- v.setThunk();
- v.thunk.env = env;
- v.thunk.expr = expr;
+ v.mkThunk(env, expr);
  throw;
  }
  }

src/libexpr/eval.cc

@@ -430,9 +430,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
  }
  }
 
- clearValue(vEmptySet);
- vEmptySet.setAttrs();
- vEmptySet.attrs = allocBindings(0);
+ vEmptySet.mkAttrs(allocBindings(0));
 
  createBaseEnv();
 }
@@ -548,16 +546,14 @@ Value * EvalState::addPrimOp(const string & name,
  the primop to a dummy value. */
  if (arity == 0) {
  auto vPrimOp = allocValue();
- vPrimOp->setPrimOp();
- vPrimOp->primOp = new PrimOp { .fun = primOp, .arity = 1, .name = sym };
+ vPrimOp->mkPrimOp(new PrimOp { .fun = primOp, .arity = 1, .name = sym });
  Value v;
  mkApp(v, *vPrimOp, *vPrimOp);
  return addConstant(name, v);
  }
 
  Value * v = allocValue();
- v->setPrimOp();
- v->primOp = new PrimOp { .fun = primOp, .arity = arity, .name = sym };
+ v->mkPrimOp(new PrimOp { .fun = primOp, .arity = arity, .name = sym });
  staticBaseEnv.vars[symbols.create(name)] = baseEnvDispl;
  baseEnv.values[baseEnvDispl++] = v;
  baseEnv.values[0]->attrs->push_back(Attr(sym, v));
@@ -572,8 +568,7 @@ Value * EvalState::addPrimOp(PrimOp && primOp)
  if (primOp.arity == 0) {
  primOp.arity = 1;
  auto vPrimOp = allocValue();
- vPrimOp->setPrimOp();
- vPrimOp->primOp = new PrimOp(std::move(primOp));
+ vPrimOp->mkPrimOp(new PrimOp(std::move(primOp)));
  Value v;
  mkApp(v, *vPrimOp, *vPrimOp);
  return addConstant(primOp.name, v);
@@ -584,8 +579,7 @@ Value * EvalState::addPrimOp(PrimOp && primOp)
  primOp.name = symbols.create(std::string(primOp.name, 2));
 
  Value * v = allocValue();
- v->setPrimOp();
- v->primOp = new PrimOp(std::move(primOp));
+ v->mkPrimOp(new PrimOp(std::move(primOp)));
  staticBaseEnv.vars[envName] = baseEnvDispl;
  baseEnv.values[baseEnvDispl++] = v;
  baseEnv.values[0]->attrs->push_back(Attr(primOp.name, v));
@@ -708,15 +702,13 @@ LocalNoInline(void addErrorTrace(Error & e, const Pos & pos, const char * s, con
 
 void mkString(Value & v, const char * s)
 {
- mkStringNoCopy(v, dupString(s));
+ v.mkString(dupString(s));
 }
 
 
 Value & mkString(Value & v, std::string_view s, const PathSet & context)
 {
- v.setString();
- v.string.s = dupStringWithLen(s.data(), s.size());
- v.string.context = 0;
+ v.mkString(dupStringWithLen(s.data(), s.size()));
  if (!context.empty()) {
  size_t n = 0;
  v.string.context = (const char * *)
@@ -731,7 +723,7 @@ Value & mkString(Value & v, std::string_view s, const PathSet & context)
 
 void mkPath(Value & v, const char * s)
 {
- mkPathNoCopy(v, dupString(s));
+ v.mkPath(dupString(s));
 }
 
 
@@ -792,16 +784,9 @@ Env & EvalState::allocEnv(size_t size)
 
 void EvalState::mkList(Value & v, size_t size)
 {
- clearValue(v);
- if (size == 1)
- v.setList1();
- else if (size == 2)
- v.setList2();
- else {
- v.setListN();
- v.bigList.size = size;
- v.bigList.elems = size ? (Value * *) allocBytes(size * sizeof(Value *)) : 0;
- }
+ v.mkList(size);
+ if (size > 2)
+ v.bigList.elems = (Value * *) allocBytes(size * sizeof(Value *));
  nrListElems += size;
 }
 
@@ -810,9 +795,7 @@ unsigned long nrThunks = 0;
 
 static inline void mkThunk(Value & v, Env & env, Expr * expr)
 {
- v.setThunk();
- v.thunk.env = &env;
- v.thunk.expr = expr;
+ v.mkThunk(&env, expr);
  nrThunks++;
 }
 
@@ -1207,9 +1190,7 @@ void ExprOpHasAttr::eval(EvalState & state, Env & env, Value & v)
 
 void ExprLambda::eval(EvalState & state, Env & env, Value & v)
 {
- v.setLambda();
- v.lambda.env = &env;
- v.lambda.fun = this;
+ v.mkLambda(&env, this);
 }
 
 
@@ -1252,9 +1233,7 @@ void EvalState::callPrimOp(Value & fun, Value & arg, Value & v, const Pos & pos)
  } else {
  Value * fun2 = allocValue();
  *fun2 = fun;
- v.setPrimOpApp();
- v.primOpApp.left = fun2;
- v.primOpApp.right = &arg;
+ v.mkPrimOpApp(fun2, &arg);
  }
 }
 

src/libexpr/nixexpr.hh

@@ -129,7 +129,7 @@ struct ExprPath : Expr
 {
  string s;
  Value v;
- ExprPath(const string & s) : s(s) { mkPathNoCopy(v, this->s.c_str()); };
+ ExprPath(const string & s) : s(s) { v.mkPath(this->s.c_str()); };
  COMMON_METHODS
  Value * maybeThunk(EvalState & state, Env & env);
 };

src/libexpr/primops.cc

@@ -1434,7 +1434,7 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
  Value * ent_val = state.allocAttr(v, state.symbols.create(ent.name));
  if (ent.type == DT_UNKNOWN)
  ent.type = getFileType(path + "/" + ent.name);
- mkStringNoCopy(*ent_val,
+ ent_val->mkString(
  ent.type == DT_REG ? "regular" :
  ent.type == DT_DIR ? "directory" :
  ent.type == DT_LNK ? "symlink" :