diff --git a/lix/libexpr/primops.cc b/lix/libexpr/primops.cc index 51ab47f6f..2526e7ca5 100644 --- a/lix/libexpr/primops.cc +++ b/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) { diff --git a/lix/libexpr/value.cc b/lix/libexpr/value.cc index a875e6c79..54c32ac08 100644 --- a/lix/libexpr/value.cc +++ b/lix/libexpr/value.cc @@ -60,11 +60,6 @@ bool Value::isTrivial() const || thunk().expr->try_cast() || thunk().expr->try_cast()); } -void Value::mkPrimOp(PrimOp * p) -{ - *this = {NewValueAs::primop, *p}; -} - Value::Value(string_t, Str * s, const NixStringContext & context) : Value(NewValueAs::string, s, copyContext(context)) { diff --git a/lix/libexpr/value.hh b/lix/libexpr/value.hh index 2c8349690..1fede6085 100644 --- a/lix/libexpr/value.hh +++ b/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}; diff --git a/tests/unit/libexpr/value/print.cc b/tests/unit/libexpr/value/print.cc index 98b9c71a2..cf51d8cac 100644 --- a/tests/unit/libexpr/value/print.cc +++ b/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};