libexpr: Replace Value::mkPrimOp with constructor calls

Change-Id: I19b05e260945e237f7856b5d644a43076a6a6964

lix/libexpr/primops.cc

@@ -1921,13 +1921,8 @@ static struct LazyPosAcessors {
          }}
     };
 
-    Value lineOfPos, columnOfPos;
-
-    LazyPosAcessors()
-    {
-        lineOfPos.mkPrimOp(&primop_lineOfPos);
-        columnOfPos.mkPrimOp(&primop_columnOfPos);
-    }
+    Value lineOfPos = {NewValueAs::primop, primop_lineOfPos},
+          columnOfPos = {NewValueAs::primop, primop_columnOfPos};
 
     void operator()(EvalState & state, const PosIdx pos, Value & line, Value & column)
     {

lix/libexpr/value.cc

@@ -60,11 +60,6 @@ bool Value::isTrivial() const
             || thunk().expr->try_cast<ExprLambda>() || thunk().expr->try_cast<ExprList>());
 }
 
-void Value::mkPrimOp(PrimOp * p)
-{
-    *this = {NewValueAs::primop, *p};
-}
-
 Value::Value(string_t, Str * s, const NixStringContext & context)
     : Value(NewValueAs::string, s, copyContext(context))
 {

lix/libexpr/value.hh

@@ -769,8 +769,6 @@ public:
         *this = {NewValueAs::null};
     }
 
-    void mkPrimOp(PrimOp * p);
-
     inline void mkExternal(ExternalValueBase * e)
     {
         *this = {NewValueAs::external, *e};

tests/unit/libexpr/value/print.cc

@@ -128,9 +128,8 @@ TEST_F(ValuePrintingTests, vLambda)
 
 TEST_F(ValuePrintingTests, vPrimOp)
 {
-    Value vPrimOp;
     PrimOp primOp{{.name = "puppy"}};
-    vPrimOp.mkPrimOp(&primOp);
+    Value vPrimOp = {NewValueAs::primop, primOp};
 
     test(vPrimOp, "«primop puppy»");
 }
@@ -139,8 +138,7 @@ TEST_F(ValuePrintingTests, vPrimOpApp)
 {
     EvalMemory mem;
     PrimOp primOp{{.name = "puppy"}};
-    Value vPrimOp;
-    vPrimOp.mkPrimOp(&primOp);
+    Value vPrimOp = {NewValueAs::primop, primOp};
 
     Value vPrimOpApp{NewValueAs::app, mem, vPrimOp, vPrimOp};
 
@@ -543,8 +541,7 @@ TEST_F(ValuePrintingTests, ansiColorsLambda)
 TEST_F(ValuePrintingTests, ansiColorsPrimOp)
 {
     PrimOp primOp{{.name = "puppy"}};
-    Value v;
-    v.mkPrimOp(&primOp);
+    Value v = {NewValueAs::primop, primOp};
 
     test(v,
          ANSI_BLUE "«primop puppy»" ANSI_NORMAL,
@@ -557,8 +554,7 @@ TEST_F(ValuePrintingTests, ansiColorsPrimOpApp)
 {
     EvalMemory mem;
     PrimOp primOp{{.name = "puppy"}};
-    Value vPrimOp;
-    vPrimOp.mkPrimOp(&primOp);
+    Value vPrimOp = {NewValueAs::primop, primOp};
 
     Value v{NewValueAs::app, mem, vPrimOp, vPrimOp};