2012-07-18 21:59:03 +03:00
|
|
|
#pragma once
|
2023-04-01 06:18:41 +03:00
|
|
|
///@file
|
2003-10-30 18:48:26 +02:00
|
|
|
|
2015-07-14 20:18:56 +03:00
|
|
|
#include "attr-set.hh"
|
libexpr: Support structured error classes
While preparing PRs like #9753, I've had to change error messages in
dozens of code paths. It would be nice if instead of
EvalError("expected 'boolean' but found '%1%'", showType(v))
we could write
TypeError(v, "boolean")
or similar. Then, changing the error message could be a mechanical
refactor with the compiler pointing out places the constructor needs to
be changed, rather than the error-prone process of grepping through the
codebase. Structured errors would also help prevent the "same" error
from having multiple slightly different messages, and could be a first
step towards error codes / an error index.
This PR reworks the exception infrastructure in `libexpr` to
support exception types with different constructor signatures than
`BaseError`. Actually refactoring the exceptions to use structured data
will come in a future PR (this one is big enough already, as it has to
touch every exception in `libexpr`).
The core design is in `eval-error.hh`. Generally, errors like this:
state.error("'%s' is not a string", getAttrPathStr())
.debugThrow<TypeError>()
are transformed like this:
state.error<TypeError>("'%s' is not a string", getAttrPathStr())
.debugThrow()
The type annotation has moved from `ErrorBuilder::debugThrow` to
`EvalState::error`.
2024-01-23 03:08:29 +02:00
|
|
|
#include "eval-error.hh"
|
2022-01-21 17:20:54 +02:00
|
|
|
#include "types.hh"
|
2012-01-07 19:26:33 +02:00
|
|
|
#include "value.hh"
|
2003-11-18 14:06:07 +02:00
|
|
|
#include "nixexpr.hh"
|
2010-04-13 15:25:42 +03:00
|
|
|
#include "symbol-table.hh"
|
2018-03-27 20:02:22 +03:00
|
|
|
#include "config.hh"
|
2021-10-25 16:53:01 +03:00
|
|
|
#include "experimental-features.hh"
|
2023-04-06 14:15:50 +03:00
|
|
|
#include "input-accessor.hh"
|
2023-06-23 20:51:25 +03:00
|
|
|
#include "search-path.hh"
|
2024-02-03 04:53:49 +02:00
|
|
|
#include "repl-exit-status.hh"
|
2003-10-30 18:48:26 +02:00
|
|
|
|
2010-10-04 20:55:38 +03:00
|
|
|
#include <map>
|
2019-10-27 11:15:51 +02:00
|
|
|
#include <optional>
|
2018-05-22 14:02:14 +03:00
|
|
|
#include <unordered_map>
|
2019-11-14 19:32:11 +02:00
|
|
|
#include <mutex>
|
2023-08-28 19:20:23 +03:00
|
|
|
#include <functional>
|
2010-10-04 20:55:38 +03:00
|
|
|
|
2006-09-05 00:06:23 +03:00
|
|
|
namespace nix {
|
|
|
|
|
2023-11-16 12:10:25 +02:00
|
|
|
/**
|
|
|
|
* We put a limit on primop arity because it lets us use a fixed size array on
|
2023-11-16 12:27:31 +02:00
|
|
|
* the stack. 8 is already an impractical number of arguments. Use an attrset
|
2023-11-16 12:10:25 +02:00
|
|
|
* argument for such overly complicated functions.
|
|
|
|
*/
|
2023-11-16 12:27:31 +02:00
|
|
|
constexpr size_t maxPrimOpArity = 8;
|
2006-09-05 00:06:23 +03:00
|
|
|
|
2016-02-04 15:48:42 +02:00
|
|
|
class Store;
|
2010-03-29 17:37:56 +03:00
|
|
|
class EvalState;
|
2020-06-17 20:26:37 +03:00
|
|
|
class StorePath;
|
Make the Derived Path family of types inductive for dynamic derivations
We want to be able to write down `foo.drv^bar.drv^baz`:
`foo.drv^bar.drv` is the dynamic derivation (since it is itself a
derivation output, `bar.drv` from `foo.drv`).
To that end, we create `Single{Derivation,BuiltPath}` types, that are
very similar except instead of having multiple outputs (in a set or
map), they have a single one. This is for everything to the left of the
rightmost `^`.
`NixStringContextElem` has an analogous change, and now can reuse
`SingleDerivedPath` at the top level. In fact, if we ever get rid of
`DrvDeep`, `NixStringContextElem` could be replaced with
`SingleDerivedPath` entirely!
Important note: some JSON formats have changed.
We already can *produce* dynamic derivations, but we can't refer to them
directly. Today, we can merely express building or example at the top
imperatively over time by building `foo.drv^bar.drv`, and then with a
second nix invocation doing `<result-from-first>^baz`, but this is not
declarative. The ethos of Nix of being able to write down the full plan
everything you want to do, and then execute than plan with a single
command, and for that we need the new inductive form of these types.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-01-16 00:39:04 +02:00
|
|
|
struct SingleDerivedPath;
|
2017-06-28 19:11:01 +03:00
|
|
|
enum RepairFlag : bool;
|
2023-10-18 18:34:58 +03:00
|
|
|
struct MemoryInputAccessor;
|
2019-05-29 16:31:07 +03:00
|
|
|
|
2010-10-24 03:41:29 +03:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Function that implements a primop.
|
|
|
|
*/
|
2022-03-04 20:31:59 +02:00
|
|
|
typedef void (* PrimOpFun) (EvalState & state, const PosIdx pos, Value * * args, Value & v);
|
2010-10-23 23:07:47 +03:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Info about a primitive operation, and its implementation
|
|
|
|
*/
|
2010-10-23 23:07:47 +03:00
|
|
|
struct PrimOp
|
|
|
|
{
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Name of the primop. `__` prefix is treated specially.
|
|
|
|
*/
|
2022-03-05 20:26:36 +02:00
|
|
|
std::string name;
|
2023-05-13 20:52:45 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Names of the parameters of a primop, for primops that take a
|
|
|
|
* fixed number of arguments to be substituted for these parameters.
|
|
|
|
*/
|
2020-08-24 14:11:56 +03:00
|
|
|
std::vector<std::string> args;
|
2023-05-13 20:52:45 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Aritiy of the primop.
|
|
|
|
*
|
|
|
|
* If `args` is not empty, this field will be computed from that
|
|
|
|
* field instead, so it doesn't need to be manually set.
|
|
|
|
*/
|
|
|
|
size_t arity = 0;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Optional free-form documentation about the primop.
|
|
|
|
*/
|
2020-08-24 14:11:56 +03:00
|
|
|
const char * doc = nullptr;
|
2023-05-13 20:52:45 +03:00
|
|
|
|
2024-03-24 01:04:30 +02:00
|
|
|
/**
|
|
|
|
* Add a trace item, `while calling the '<name>' builtin`
|
|
|
|
*
|
|
|
|
* This is used to remove the redundant item for `builtins.addErrorContext`.
|
|
|
|
*/
|
|
|
|
bool addTrace = true;
|
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Implementation of the primop.
|
|
|
|
*/
|
2023-08-28 19:20:23 +03:00
|
|
|
std::function<std::remove_pointer<PrimOpFun>::type> fun;
|
2023-05-13 20:52:45 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Optional experimental for this to be gated on.
|
|
|
|
*/
|
|
|
|
std::optional<ExperimentalFeature> experimentalFeature;
|
2023-11-16 12:10:25 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Validity check to be performed by functions that introduce primops,
|
|
|
|
* such as RegisterPrimOp() and Value::mkPrimOp().
|
|
|
|
*/
|
|
|
|
void check();
|
2023-05-13 20:52:45 +03:00
|
|
|
};
|
|
|
|
|
2024-03-25 19:20:18 +02:00
|
|
|
std::ostream & operator<<(std::ostream & output, const PrimOp & primOp);
|
2023-12-12 23:57:36 +02:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Info about a constant
|
|
|
|
*/
|
|
|
|
struct Constant
|
|
|
|
{
|
|
|
|
/**
|
|
|
|
* Optional type of the constant (known since it is a fixed value).
|
|
|
|
*
|
|
|
|
* @todo we should use an enum for this.
|
|
|
|
*/
|
|
|
|
ValueType type = nThunk;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Optional free-form documentation about the constant.
|
|
|
|
*/
|
|
|
|
const char * doc = nullptr;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Whether the constant is impure, and not available in pure mode.
|
|
|
|
*/
|
|
|
|
bool impureOnly = false;
|
2010-10-23 23:07:47 +03:00
|
|
|
};
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2022-05-06 05:26:10 +03:00
|
|
|
#if HAVE_BOEHMGC
|
|
|
|
typedef std::map<std::string, Value *, std::less<std::string>, traceable_allocator<std::pair<const std::string, Value *> > > ValMap;
|
|
|
|
#else
|
|
|
|
typedef std::map<std::string, Value *> ValMap;
|
|
|
|
#endif
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2010-04-14 17:42:32 +03:00
|
|
|
struct Env
|
|
|
|
{
|
|
|
|
Env * up;
|
2010-10-22 18:51:52 +03:00
|
|
|
Value * values[0];
|
2010-04-14 17:42:32 +03:00
|
|
|
};
|
|
|
|
|
2022-05-20 02:01:23 +03:00
|
|
|
void printEnvBindings(const EvalState &es, const Expr & expr, const Env & env);
|
|
|
|
void printEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env, int lvl = 0);
|
|
|
|
|
2022-05-06 00:43:23 +03:00
|
|
|
std::unique_ptr<ValMap> mapStaticEnvBindings(const SymbolTable & st, const StaticEnv & se, const Env & env);
|
2010-04-14 17:42:32 +03:00
|
|
|
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
void copyContext(const Value & v, NixStringContext & context);
|
2010-06-10 13:29:50 +03:00
|
|
|
|
2010-03-30 12:22:33 +03:00
|
|
|
|
2023-12-12 23:57:36 +02:00
|
|
|
std::string printValue(EvalState & state, Value & v);
|
2022-05-06 19:05:27 +03:00
|
|
|
std::ostream & operator << (std::ostream & os, const ValueType t);
|
2004-02-04 18:03:29 +02:00
|
|
|
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Initialise the Boehm GC, if applicable.
|
|
|
|
*/
|
2015-03-19 21:02:37 +02:00
|
|
|
void initGC();
|
|
|
|
|
|
|
|
|
2020-09-21 19:22:45 +03:00
|
|
|
struct RegexCache;
|
|
|
|
|
|
|
|
std::shared_ptr<RegexCache> makeRegexCache();
|
|
|
|
|
2021-12-23 22:36:39 +02:00
|
|
|
struct DebugTrace {
|
2023-12-18 23:14:42 +02:00
|
|
|
std::shared_ptr<Pos> pos;
|
2022-05-05 13:29:14 +03:00
|
|
|
const Expr & expr;
|
|
|
|
const Env & env;
|
2024-02-04 06:35:19 +02:00
|
|
|
HintFmt hint;
|
2022-05-05 13:29:14 +03:00
|
|
|
bool isError;
|
2021-12-23 22:36:39 +02:00
|
|
|
};
|
|
|
|
|
2024-02-03 06:07:42 +02:00
|
|
|
|
2022-05-25 19:21:20 +03:00
|
|
|
class EvalState : public std::enable_shared_from_this<EvalState>
|
2003-10-30 18:48:26 +02:00
|
|
|
{
|
2010-03-31 18:38:03 +03:00
|
|
|
public:
|
2010-04-13 15:25:42 +03:00
|
|
|
SymbolTable symbols;
|
2022-03-04 20:31:59 +02:00
|
|
|
PosTable positions;
|
2010-04-13 15:25:42 +03:00
|
|
|
|
2013-10-28 08:34:44 +02:00
|
|
|
const Symbol sWith, sOutPath, sDrvPath, sType, sMeta, sName, sValue,
|
2013-11-18 21:14:54 +02:00
|
|
|
sSystem, sOverrides, sOutputs, sOutputName, sIgnoreNulls,
|
2016-08-29 18:28:20 +03:00
|
|
|
sFile, sLine, sColumn, sFunctor, sToString,
|
2017-03-04 15:24:06 +02:00
|
|
|
sRight, sWrong, sStructuredAttrs, sBuilder, sArgs,
|
2022-03-30 17:31:01 +03:00
|
|
|
sContentAddressed, sImpure,
|
2018-11-29 20:18:36 +02:00
|
|
|
sOutputHash, sOutputHashAlgo, sOutputHashMode,
|
2020-06-26 09:46:46 +03:00
|
|
|
sRecurseForDerivations,
|
2022-01-12 19:08:48 +02:00
|
|
|
sDescription, sSelf, sEpsilon, sStartSet, sOperator, sKey, sPath,
|
2022-05-30 12:32:37 +03:00
|
|
|
sPrefix,
|
|
|
|
sOutputSpecified;
|
2010-04-13 15:25:42 +03:00
|
|
|
|
2024-01-15 17:52:18 +02:00
|
|
|
const Expr::AstSymbols exprSymbols;
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* If set, force copying files to the Nix store even if they
|
|
|
|
* already exist there.
|
|
|
|
*/
|
2017-06-28 19:11:01 +03:00
|
|
|
RepairFlag repair;
|
2012-10-03 22:09:18 +03:00
|
|
|
|
2022-01-04 20:23:11 +02:00
|
|
|
Bindings emptyBindings;
|
2015-07-24 00:11:08 +03:00
|
|
|
|
2024-01-03 11:23:27 +02:00
|
|
|
/**
|
|
|
|
* Empty list constant.
|
|
|
|
*/
|
|
|
|
Value vEmptyList;
|
|
|
|
|
2024-03-14 20:10:31 +02:00
|
|
|
/**
|
2024-03-21 00:06:23 +02:00
|
|
|
* `null` constant.
|
|
|
|
*
|
|
|
|
* This is _not_ a singleton. Pointer equality is _not_ sufficient.
|
2024-03-14 20:10:31 +02:00
|
|
|
*/
|
|
|
|
Value vNull;
|
|
|
|
|
2024-03-21 00:06:23 +02:00
|
|
|
/**
|
|
|
|
* `true` constant.
|
|
|
|
*
|
|
|
|
* This is _not_ a singleton. Pointer equality is _not_ sufficient.
|
|
|
|
*/
|
|
|
|
Value vTrue;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* `true` constant.
|
|
|
|
*
|
|
|
|
* This is _not_ a singleton. Pointer equality is _not_ sufficient.
|
|
|
|
*/
|
|
|
|
Value vFalse;
|
|
|
|
|
2024-03-20 23:56:42 +02:00
|
|
|
/** `"regular"` */
|
|
|
|
Value vStringRegular;
|
|
|
|
/** `"directory"` */
|
|
|
|
Value vStringDirectory;
|
|
|
|
/** `"symlink"` */
|
|
|
|
Value vStringSymlink;
|
|
|
|
/** `"unknown"` */
|
|
|
|
Value vStringUnknown;
|
|
|
|
|
2023-10-18 18:34:58 +03:00
|
|
|
/**
|
|
|
|
* The accessor for the root filesystem.
|
|
|
|
*/
|
2023-11-30 22:54:53 +02:00
|
|
|
const ref<InputAccessor> rootFS;
|
2023-10-18 16:32:31 +03:00
|
|
|
|
2023-10-18 18:34:58 +03:00
|
|
|
/**
|
|
|
|
* The in-memory filesystem for <nix/...> paths.
|
|
|
|
*/
|
|
|
|
const ref<MemoryInputAccessor> corepkgsFS;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* In-memory filesystem for internal, non-user-callable Nix
|
|
|
|
* expressions like call-flake.nix.
|
|
|
|
*/
|
|
|
|
const ref<MemoryInputAccessor> internalFS;
|
|
|
|
|
2023-04-06 16:25:06 +03:00
|
|
|
const SourcePath derivationInternal;
|
|
|
|
|
2023-10-18 18:34:58 +03:00
|
|
|
const SourcePath callFlakeInternal;
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Store used to materialise .drv files.
|
|
|
|
*/
|
2016-02-04 15:48:42 +02:00
|
|
|
const ref<Store> store;
|
Eliminate the "store" global variable
Also, move a few free-standing functions into StoreAPI and Derivation.
Also, introduce a non-nullable smart pointer, ref<T>, which is just a
wrapper around std::shared_ptr ensuring that the pointer is never
null. (For reference-counted values, this is better than passing a
"T&", because the latter doesn't maintain the refcount. Usually, the
caller will have a shared_ptr keeping the value alive, but that's not
always the case, e.g., when passing a reference to a std::thread via
std::bind.)
2016-02-04 15:28:26 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Store used to build stuff.
|
|
|
|
*/
|
2021-06-29 22:09:48 +03:00
|
|
|
const ref<Store> buildStore;
|
|
|
|
|
2021-08-29 20:31:52 +03:00
|
|
|
RootValue vImportedDrvToDerivation = nullptr;
|
2019-03-21 10:30:16 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Debugger
|
|
|
|
*/
|
2024-02-03 04:53:49 +02:00
|
|
|
ReplExitStatus (* debugRepl)(ref<EvalState> es, const ValMap & extraEnv);
|
2022-02-03 22:15:21 +02:00
|
|
|
bool debugStop;
|
2024-02-03 06:07:42 +02:00
|
|
|
bool inDebugger = false;
|
2022-06-02 21:17:28 +03:00
|
|
|
int trylevel;
|
2021-12-23 22:36:39 +02:00
|
|
|
std::list<DebugTrace> debugTraces;
|
2022-05-25 13:32:22 +03:00
|
|
|
std::map<const Expr*, const std::shared_ptr<const StaticEnv>> exprEnvs;
|
|
|
|
const std::shared_ptr<const StaticEnv> getStaticEnv(const Expr & expr) const
|
2022-05-19 19:48:10 +03:00
|
|
|
{
|
|
|
|
auto i = exprEnvs.find(&expr);
|
2022-05-25 13:32:22 +03:00
|
|
|
if (i != exprEnvs.end())
|
2022-05-19 19:48:10 +03:00
|
|
|
return i->second;
|
|
|
|
else
|
|
|
|
return std::shared_ptr<const StaticEnv>();;
|
|
|
|
}
|
|
|
|
|
2022-05-20 19:33:50 +03:00
|
|
|
void runDebugRepl(const Error * error, const Env & env, const Expr & expr);
|
2022-05-06 17:47:21 +03:00
|
|
|
|
libexpr: Support structured error classes
While preparing PRs like #9753, I've had to change error messages in
dozens of code paths. It would be nice if instead of
EvalError("expected 'boolean' but found '%1%'", showType(v))
we could write
TypeError(v, "boolean")
or similar. Then, changing the error message could be a mechanical
refactor with the compiler pointing out places the constructor needs to
be changed, rather than the error-prone process of grepping through the
codebase. Structured errors would also help prevent the "same" error
from having multiple slightly different messages, and could be a first
step towards error codes / an error index.
This PR reworks the exception infrastructure in `libexpr` to
support exception types with different constructor signatures than
`BaseError`. Actually refactoring the exceptions to use structured data
will come in a future PR (this one is big enough already, as it has to
touch every exception in `libexpr`).
The core design is in `eval-error.hh`. Generally, errors like this:
state.error("'%s' is not a string", getAttrPathStr())
.debugThrow<TypeError>()
are transformed like this:
state.error<TypeError>("'%s' is not a string", getAttrPathStr())
.debugThrow()
The type annotation has moved from `ErrorBuilder::debugThrow` to
`EvalState::error`.
2024-01-23 03:08:29 +02:00
|
|
|
template<class T, typename... Args>
|
2023-01-19 14:23:04 +02:00
|
|
|
[[nodiscard, gnu::noinline]]
|
libexpr: Support structured error classes
While preparing PRs like #9753, I've had to change error messages in
dozens of code paths. It would be nice if instead of
EvalError("expected 'boolean' but found '%1%'", showType(v))
we could write
TypeError(v, "boolean")
or similar. Then, changing the error message could be a mechanical
refactor with the compiler pointing out places the constructor needs to
be changed, rather than the error-prone process of grepping through the
codebase. Structured errors would also help prevent the "same" error
from having multiple slightly different messages, and could be a first
step towards error codes / an error index.
This PR reworks the exception infrastructure in `libexpr` to
support exception types with different constructor signatures than
`BaseError`. Actually refactoring the exceptions to use structured data
will come in a future PR (this one is big enough already, as it has to
touch every exception in `libexpr`).
The core design is in `eval-error.hh`. Generally, errors like this:
state.error("'%s' is not a string", getAttrPathStr())
.debugThrow<TypeError>()
are transformed like this:
state.error<TypeError>("'%s' is not a string", getAttrPathStr())
.debugThrow()
The type annotation has moved from `ErrorBuilder::debugThrow` to
`EvalState::error`.
2024-01-23 03:08:29 +02:00
|
|
|
EvalErrorBuilder<T> & error(const Args & ... args) {
|
2024-02-07 02:50:47 +02:00
|
|
|
// `EvalErrorBuilder::debugThrow` performs the corresponding `delete`.
|
libexpr: Support structured error classes
While preparing PRs like #9753, I've had to change error messages in
dozens of code paths. It would be nice if instead of
EvalError("expected 'boolean' but found '%1%'", showType(v))
we could write
TypeError(v, "boolean")
or similar. Then, changing the error message could be a mechanical
refactor with the compiler pointing out places the constructor needs to
be changed, rather than the error-prone process of grepping through the
codebase. Structured errors would also help prevent the "same" error
from having multiple slightly different messages, and could be a first
step towards error codes / an error index.
This PR reworks the exception infrastructure in `libexpr` to
support exception types with different constructor signatures than
`BaseError`. Actually refactoring the exceptions to use structured data
will come in a future PR (this one is big enough already, as it has to
touch every exception in `libexpr`).
The core design is in `eval-error.hh`. Generally, errors like this:
state.error("'%s' is not a string", getAttrPathStr())
.debugThrow<TypeError>()
are transformed like this:
state.error<TypeError>("'%s' is not a string", getAttrPathStr())
.debugThrow()
The type annotation has moved from `ErrorBuilder::debugThrow` to
`EvalState::error`.
2024-01-23 03:08:29 +02:00
|
|
|
return *new EvalErrorBuilder<T>(*this, args...);
|
2023-01-19 14:23:04 +02:00
|
|
|
}
|
2022-05-20 02:01:23 +03:00
|
|
|
|
2010-03-31 18:38:03 +03:00
|
|
|
private:
|
2023-04-06 14:15:50 +03:00
|
|
|
|
|
|
|
/* Cache for calls to addToStore(); maps source paths to the store
|
|
|
|
paths. */
|
|
|
|
std::map<SourcePath, StorePath> srcToStore;
|
2003-10-30 18:48:26 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* A cache from path names to parse trees.
|
|
|
|
*/
|
2018-06-11 17:06:01 +03:00
|
|
|
#if HAVE_BOEHMGC
|
2023-04-06 14:15:50 +03:00
|
|
|
typedef std::map<SourcePath, Expr *, std::less<SourcePath>, traceable_allocator<std::pair<const SourcePath, Expr *>>> FileParseCache;
|
2018-06-11 17:06:01 +03:00
|
|
|
#else
|
2023-04-06 14:15:50 +03:00
|
|
|
typedef std::map<SourcePath, Expr *> FileParseCache;
|
2018-06-11 17:06:01 +03:00
|
|
|
#endif
|
|
|
|
FileParseCache fileParseCache;
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* A cache from path names to values.
|
|
|
|
*/
|
2011-08-06 22:45:43 +03:00
|
|
|
#if HAVE_BOEHMGC
|
2023-04-06 14:15:50 +03:00
|
|
|
typedef std::map<SourcePath, Value, std::less<SourcePath>, traceable_allocator<std::pair<const SourcePath, Value>>> FileEvalCache;
|
2011-08-06 22:45:43 +03:00
|
|
|
#else
|
2023-04-06 14:15:50 +03:00
|
|
|
typedef std::map<SourcePath, Value> FileEvalCache;
|
2011-08-06 22:45:43 +03:00
|
|
|
#endif
|
|
|
|
FileEvalCache fileEvalCache;
|
|
|
|
|
2011-08-06 20:48:57 +03:00
|
|
|
SearchPath searchPath;
|
2011-08-06 19:05:24 +03:00
|
|
|
|
2023-06-23 19:31:09 +03:00
|
|
|
std::map<std::string, std::optional<std::string>> searchPathResolved;
|
2016-04-14 16:32:24 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Cache used by prim_match().
|
|
|
|
*/
|
2020-09-21 19:22:45 +03:00
|
|
|
std::shared_ptr<RegexCache> regexCache;
|
2020-02-21 20:25:49 +02:00
|
|
|
|
2022-01-05 02:48:26 +02:00
|
|
|
#if HAVE_BOEHMGC
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allocation cache for GC'd Value objects.
|
|
|
|
*/
|
2022-01-22 22:17:35 +02:00
|
|
|
std::shared_ptr<void *> valueAllocCache;
|
2021-12-20 14:28:54 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allocation cache for size-1 Env objects.
|
|
|
|
*/
|
2021-12-26 20:32:08 +02:00
|
|
|
std::shared_ptr<void *> env1AllocCache;
|
2022-01-05 02:48:26 +02:00
|
|
|
#endif
|
2021-12-26 20:32:08 +02:00
|
|
|
|
2010-03-30 18:18:20 +03:00
|
|
|
public:
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2021-06-29 22:09:48 +03:00
|
|
|
EvalState(
|
2023-06-23 20:51:25 +03:00
|
|
|
const SearchPath & _searchPath,
|
2021-06-29 22:09:48 +03:00
|
|
|
ref<Store> store,
|
|
|
|
std::shared_ptr<Store> buildStore = nullptr);
|
2010-04-09 15:00:49 +03:00
|
|
|
~EvalState();
|
2004-02-04 18:03:29 +02:00
|
|
|
|
2016-08-23 18:11:19 +03:00
|
|
|
SearchPath getSearchPath() { return searchPath; }
|
|
|
|
|
2023-04-06 14:15:50 +03:00
|
|
|
/**
|
|
|
|
* Return a `SourcePath` that refers to `path` in the root
|
|
|
|
* filesystem.
|
|
|
|
*/
|
|
|
|
SourcePath rootPath(CanonPath path);
|
|
|
|
|
2024-02-06 23:23:58 +02:00
|
|
|
/**
|
|
|
|
* Variant which accepts relative paths too.
|
|
|
|
*/
|
|
|
|
SourcePath rootPath(PathView path);
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allow access to a path.
|
|
|
|
*/
|
2021-10-07 13:11:00 +03:00
|
|
|
void allowPath(const Path & path);
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allow access to a store path. Note that this gets remapped to
|
|
|
|
* the real store path if `store` is a chroot store.
|
|
|
|
*/
|
2021-10-07 15:07:51 +03:00
|
|
|
void allowPath(const StorePath & storePath);
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allow access to a store path and return it as a string.
|
|
|
|
*/
|
2022-03-01 12:29:19 +02:00
|
|
|
void allowAndSetStorePathString(const StorePath & storePath, Value & v);
|
2022-02-27 16:59:34 +02:00
|
|
|
|
2017-10-30 13:39:59 +02:00
|
|
|
void checkURI(const std::string & uri);
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* When using a diverted store and 'path' is in the Nix store, map
|
|
|
|
* 'path' to the diverted location (e.g. /nix/store/foo is mapped
|
|
|
|
* to /home/alice/my-nix/nix/store/foo). However, this is only
|
|
|
|
* done if the context is not empty, since otherwise we're
|
|
|
|
* probably trying to read from the actual /nix/store. This is
|
|
|
|
* intended to distinguish between import-from-derivation and
|
|
|
|
* sources stored in the actual /nix/store.
|
|
|
|
*/
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
Path toRealPath(const Path & path, const NixStringContext & context);
|
2018-01-12 18:31:08 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Parse a Nix expression from the specified file.
|
|
|
|
*/
|
2023-04-06 14:15:50 +03:00
|
|
|
Expr * parseExprFromFile(const SourcePath & path);
|
|
|
|
Expr * parseExprFromFile(const SourcePath & path, std::shared_ptr<StaticEnv> & staticEnv);
|
2011-08-06 16:02:55 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Parse a Nix expression from the specified string.
|
|
|
|
*/
|
2023-04-06 14:15:50 +03:00
|
|
|
Expr * parseExprFromString(std::string s, const SourcePath & basePath, std::shared_ptr<StaticEnv> & staticEnv);
|
|
|
|
Expr * parseExprFromString(std::string s, const SourcePath & basePath);
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2017-07-25 16:09:06 +03:00
|
|
|
Expr * parseStdin();
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Evaluate an expression read from the given file to normal
|
|
|
|
* form. Optionally enforce that the top-level expression is
|
|
|
|
* trivial (i.e. doesn't require arbitrary computation).
|
|
|
|
*/
|
2023-04-06 14:15:50 +03:00
|
|
|
void evalFile(const SourcePath & path, Value & v, bool mustBeTrivial = false);
|
2010-03-30 12:22:33 +03:00
|
|
|
|
2013-09-02 19:34:04 +03:00
|
|
|
void resetFileCache();
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Look up a file in the search path.
|
|
|
|
*/
|
2023-04-06 14:15:50 +03:00
|
|
|
SourcePath findFile(const std::string_view path);
|
2023-06-23 20:51:25 +03:00
|
|
|
SourcePath findFile(const SearchPath & searchPath, const std::string_view path, const PosIdx pos = noPos);
|
2011-08-06 19:05:24 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
2023-11-30 17:16:17 +02:00
|
|
|
* Try to resolve a search path value (not the optional key part).
|
2023-06-23 19:31:09 +03:00
|
|
|
*
|
2023-04-07 16:55:28 +03:00
|
|
|
* If the specified search path element is a URI, download it.
|
2023-06-23 19:31:09 +03:00
|
|
|
*
|
|
|
|
* If it is not found, return `std::nullopt`
|
2023-04-07 16:55:28 +03:00
|
|
|
*/
|
2023-11-30 17:16:17 +02:00
|
|
|
std::optional<std::string> resolveSearchPathPath(
|
|
|
|
const SearchPath::Path & elem,
|
|
|
|
bool initAccessControl = false);
|
2016-04-14 16:32:24 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Evaluate an expression to normal form
|
|
|
|
*
|
|
|
|
* @param [out] v The resulting is stored here.
|
|
|
|
*/
|
2010-04-12 21:30:11 +03:00
|
|
|
void eval(Expr * e, Value & v);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Evaluation the expression, then verify that it has the expected
|
|
|
|
* type.
|
|
|
|
*/
|
2012-02-04 15:50:25 +02:00
|
|
|
inline bool evalBool(Env & env, Expr * e);
|
2023-01-19 14:23:04 +02:00
|
|
|
inline bool evalBool(Env & env, Expr * e, const PosIdx pos, std::string_view errorCtx);
|
|
|
|
inline void evalAttrs(Env & env, Expr * e, Value & v, const PosIdx pos, std::string_view errorCtx);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* If `v` is a thunk, enter it and overwrite `v` with the result
|
|
|
|
* of the evaluation of the thunk. If `v` is a delayed function
|
|
|
|
* application, call the function and overwrite `v` with the
|
|
|
|
* result. Otherwise, this is a no-op.
|
|
|
|
*/
|
2022-03-04 20:31:59 +02:00
|
|
|
inline void forceValue(Value & v, const PosIdx pos);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2023-12-11 17:23:08 +02:00
|
|
|
void tryFixupBlackHolePos(Value & v, PosIdx pos);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Force a value, then recursively force list elements and
|
|
|
|
* attributes.
|
|
|
|
*/
|
2014-09-22 16:03:59 +03:00
|
|
|
void forceValueDeep(Value & v);
|
2010-04-07 16:55:46 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Force `v`, and then verify that it has the expected type.
|
|
|
|
*/
|
2023-01-19 14:23:04 +02:00
|
|
|
NixInt forceInt(Value & v, const PosIdx pos, std::string_view errorCtx);
|
|
|
|
NixFloat forceFloat(Value & v, const PosIdx pos, std::string_view errorCtx);
|
|
|
|
bool forceBool(Value & v, const PosIdx pos, std::string_view errorCtx);
|
2022-02-04 01:31:33 +02:00
|
|
|
|
2023-01-19 14:23:04 +02:00
|
|
|
void forceAttrs(Value & v, const PosIdx pos, std::string_view errorCtx);
|
2022-02-04 01:31:33 +02:00
|
|
|
|
|
|
|
template <typename Callable>
|
2023-01-19 14:23:04 +02:00
|
|
|
inline void forceAttrs(Value & v, Callable getPos, std::string_view errorCtx);
|
2022-04-29 19:02:17 +03:00
|
|
|
|
2023-01-19 14:23:04 +02:00
|
|
|
inline void forceList(Value & v, const PosIdx pos, std::string_view errorCtx);
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* @param v either lambda or primop
|
|
|
|
*/
|
|
|
|
void forceFunction(Value & v, const PosIdx pos, std::string_view errorCtx);
|
2023-01-19 14:23:04 +02:00
|
|
|
std::string_view forceString(Value & v, const PosIdx pos, std::string_view errorCtx);
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
std::string_view forceString(Value & v, NixStringContext & context, const PosIdx pos, std::string_view errorCtx);
|
2023-01-19 14:23:04 +02:00
|
|
|
std::string_view forceStringNoCtx(Value & v, const PosIdx pos, std::string_view errorCtx);
|
2022-03-07 22:02:17 +02:00
|
|
|
|
2024-02-23 03:18:27 +02:00
|
|
|
template<typename... Args>
|
2022-03-07 22:02:17 +02:00
|
|
|
[[gnu::noinline]]
|
2024-02-23 03:18:27 +02:00
|
|
|
void addErrorTrace(Error & e, const Args & ... formatArgs) const;
|
|
|
|
template<typename... Args>
|
2022-03-07 22:02:17 +02:00
|
|
|
[[gnu::noinline]]
|
2024-02-23 03:18:27 +02:00
|
|
|
void addErrorTrace(Error & e, const PosIdx pos, const Args & ... formatArgs) const;
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2022-03-07 22:02:17 +02:00
|
|
|
public:
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* @return true iff the value `v` denotes a derivation (i.e. a
|
|
|
|
* set with attribute `type = "derivation"`).
|
|
|
|
*/
|
2010-04-07 16:55:46 +03:00
|
|
|
bool isDerivation(Value & v);
|
|
|
|
|
2022-03-04 20:31:59 +02:00
|
|
|
std::optional<std::string> tryAttrsToString(const PosIdx pos, Value & v,
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
NixStringContext & context, bool coerceMore = false, bool copyToStore = true);
|
2019-10-27 11:15:51 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* String coercion.
|
|
|
|
*
|
|
|
|
* Converts strings, paths and derivations to a
|
|
|
|
* string. If `coerceMore` is set, also converts nulls, integers,
|
|
|
|
* booleans and lists to a string. If `copyToStore` is set,
|
|
|
|
* referenced paths are copied to the Nix store as a side effect.
|
|
|
|
*/
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
BackedStringView coerceToString(const PosIdx pos, Value & v, NixStringContext & context,
|
2022-11-29 01:25:36 +02:00
|
|
|
std::string_view errorCtx,
|
2021-07-29 19:03:07 +03:00
|
|
|
bool coerceMore = false, bool copyToStore = true,
|
2022-11-29 01:25:36 +02:00
|
|
|
bool canonicalizePath = true);
|
2010-03-30 12:22:33 +03:00
|
|
|
|
2023-04-24 14:20:36 +03:00
|
|
|
StorePath copyPathToStore(NixStringContext & context, const SourcePath & path);
|
2013-11-19 01:03:11 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Path coercion.
|
|
|
|
*
|
|
|
|
* Converts strings, paths and derivations to a
|
|
|
|
* path. The result is guaranteed to be a canonicalised, absolute
|
|
|
|
* path. Nothing is copied to the store.
|
|
|
|
*/
|
2023-04-24 14:20:36 +03:00
|
|
|
SourcePath coerceToPath(const PosIdx pos, Value & v, NixStringContext & context, std::string_view errorCtx);
|
2010-03-30 12:22:33 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Like coerceToPath, but the result must be a store path.
|
|
|
|
*/
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
StorePath coerceToStorePath(const PosIdx pos, Value & v, NixStringContext & context, std::string_view errorCtx);
|
2022-03-02 11:57:19 +02:00
|
|
|
|
2023-05-11 02:25:52 +03:00
|
|
|
/**
|
Make the Derived Path family of types inductive for dynamic derivations
We want to be able to write down `foo.drv^bar.drv^baz`:
`foo.drv^bar.drv` is the dynamic derivation (since it is itself a
derivation output, `bar.drv` from `foo.drv`).
To that end, we create `Single{Derivation,BuiltPath}` types, that are
very similar except instead of having multiple outputs (in a set or
map), they have a single one. This is for everything to the left of the
rightmost `^`.
`NixStringContextElem` has an analogous change, and now can reuse
`SingleDerivedPath` at the top level. In fact, if we ever get rid of
`DrvDeep`, `NixStringContextElem` could be replaced with
`SingleDerivedPath` entirely!
Important note: some JSON formats have changed.
We already can *produce* dynamic derivations, but we can't refer to them
directly. Today, we can merely express building or example at the top
imperatively over time by building `foo.drv^bar.drv`, and then with a
second nix invocation doing `<result-from-first>^baz`, but this is not
declarative. The ethos of Nix of being able to write down the full plan
everything you want to do, and then execute than plan with a single
command, and for that we need the new inductive form of these types.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-01-16 00:39:04 +02:00
|
|
|
* Part of `coerceToSingleDerivedPath()` without any store IO which is exposed for unit testing only.
|
2023-05-11 02:25:52 +03:00
|
|
|
*/
|
Make the Derived Path family of types inductive for dynamic derivations
We want to be able to write down `foo.drv^bar.drv^baz`:
`foo.drv^bar.drv` is the dynamic derivation (since it is itself a
derivation output, `bar.drv` from `foo.drv`).
To that end, we create `Single{Derivation,BuiltPath}` types, that are
very similar except instead of having multiple outputs (in a set or
map), they have a single one. This is for everything to the left of the
rightmost `^`.
`NixStringContextElem` has an analogous change, and now can reuse
`SingleDerivedPath` at the top level. In fact, if we ever get rid of
`DrvDeep`, `NixStringContextElem` could be replaced with
`SingleDerivedPath` entirely!
Important note: some JSON formats have changed.
We already can *produce* dynamic derivations, but we can't refer to them
directly. Today, we can merely express building or example at the top
imperatively over time by building `foo.drv^bar.drv`, and then with a
second nix invocation doing `<result-from-first>^baz`, but this is not
declarative. The ethos of Nix of being able to write down the full plan
everything you want to do, and then execute than plan with a single
command, and for that we need the new inductive form of these types.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-01-16 00:39:04 +02:00
|
|
|
std::pair<SingleDerivedPath, std::string_view> coerceToSingleDerivedPathUnchecked(const PosIdx pos, Value & v, std::string_view errorCtx);
|
2023-05-11 02:25:52 +03:00
|
|
|
|
|
|
|
/**
|
Make the Derived Path family of types inductive for dynamic derivations
We want to be able to write down `foo.drv^bar.drv^baz`:
`foo.drv^bar.drv` is the dynamic derivation (since it is itself a
derivation output, `bar.drv` from `foo.drv`).
To that end, we create `Single{Derivation,BuiltPath}` types, that are
very similar except instead of having multiple outputs (in a set or
map), they have a single one. This is for everything to the left of the
rightmost `^`.
`NixStringContextElem` has an analogous change, and now can reuse
`SingleDerivedPath` at the top level. In fact, if we ever get rid of
`DrvDeep`, `NixStringContextElem` could be replaced with
`SingleDerivedPath` entirely!
Important note: some JSON formats have changed.
We already can *produce* dynamic derivations, but we can't refer to them
directly. Today, we can merely express building or example at the top
imperatively over time by building `foo.drv^bar.drv`, and then with a
second nix invocation doing `<result-from-first>^baz`, but this is not
declarative. The ethos of Nix of being able to write down the full plan
everything you want to do, and then execute than plan with a single
command, and for that we need the new inductive form of these types.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-01-16 00:39:04 +02:00
|
|
|
* Coerce to `SingleDerivedPath`.
|
2023-05-11 02:25:52 +03:00
|
|
|
*
|
|
|
|
* Must be a string which is either a literal store path or a
|
2023-05-12 01:01:41 +03:00
|
|
|
* "placeholder (see `DownstreamPlaceholder`).
|
2023-05-11 02:25:52 +03:00
|
|
|
*
|
|
|
|
* Even more importantly, the string context must be exactly one
|
|
|
|
* element, which is either a `NixStringContextElem::Opaque` or
|
|
|
|
* `NixStringContextElem::Built`. (`NixStringContextEleme::DrvDeep`
|
|
|
|
* is not permitted).
|
|
|
|
*
|
|
|
|
* The string is parsed based on the context --- the context is the
|
|
|
|
* source of truth, and ultimately tells us what we want, and then
|
|
|
|
* we ensure the string corresponds to it.
|
|
|
|
*/
|
Make the Derived Path family of types inductive for dynamic derivations
We want to be able to write down `foo.drv^bar.drv^baz`:
`foo.drv^bar.drv` is the dynamic derivation (since it is itself a
derivation output, `bar.drv` from `foo.drv`).
To that end, we create `Single{Derivation,BuiltPath}` types, that are
very similar except instead of having multiple outputs (in a set or
map), they have a single one. This is for everything to the left of the
rightmost `^`.
`NixStringContextElem` has an analogous change, and now can reuse
`SingleDerivedPath` at the top level. In fact, if we ever get rid of
`DrvDeep`, `NixStringContextElem` could be replaced with
`SingleDerivedPath` entirely!
Important note: some JSON formats have changed.
We already can *produce* dynamic derivations, but we can't refer to them
directly. Today, we can merely express building or example at the top
imperatively over time by building `foo.drv^bar.drv`, and then with a
second nix invocation doing `<result-from-first>^baz`, but this is not
declarative. The ethos of Nix of being able to write down the full plan
everything you want to do, and then execute than plan with a single
command, and for that we need the new inductive form of these types.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2023-01-16 00:39:04 +02:00
|
|
|
SingleDerivedPath coerceToSingleDerivedPath(const PosIdx pos, Value & v, std::string_view errorCtx);
|
2023-05-11 02:25:52 +03:00
|
|
|
|
2013-09-02 19:34:04 +03:00
|
|
|
public:
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* The base environment, containing the builtin functions and
|
|
|
|
* values.
|
|
|
|
*/
|
2010-03-29 17:37:56 +03:00
|
|
|
Env & baseEnv;
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* The same, but used during parsing to resolve variables.
|
|
|
|
*/
|
2021-09-14 19:49:22 +03:00
|
|
|
std::shared_ptr<StaticEnv> staticBaseEnv; // !!! should be private
|
2010-04-15 01:59:39 +03:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Name and documentation about every constant.
|
|
|
|
*
|
|
|
|
* Constants from primops are hard to crawl, and their docs will go
|
|
|
|
* here too.
|
|
|
|
*/
|
|
|
|
std::vector<std::pair<std::string, Constant>> constantInfos;
|
|
|
|
|
2010-04-15 01:59:39 +03:00
|
|
|
private:
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2015-07-24 00:14:07 +03:00
|
|
|
unsigned int baseEnvDispl = 0;
|
2013-09-02 19:34:04 +03:00
|
|
|
|
2010-03-29 17:37:56 +03:00
|
|
|
void createBaseEnv();
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
Value * addConstant(const std::string & name, Value & v, Constant info);
|
2020-03-02 19:15:06 +02:00
|
|
|
|
2023-05-13 20:52:45 +03:00
|
|
|
void addConstant(const std::string & name, Value * v, Constant info);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2020-08-24 14:11:56 +03:00
|
|
|
Value * addPrimOp(PrimOp && primOp);
|
|
|
|
|
2013-09-03 16:45:32 +03:00
|
|
|
public:
|
|
|
|
|
2022-02-25 17:00:00 +02:00
|
|
|
Value & getBuiltin(const std::string & name);
|
2013-09-03 16:45:32 +03:00
|
|
|
|
2020-08-25 14:31:11 +03:00
|
|
|
struct Doc
|
|
|
|
{
|
|
|
|
Pos pos;
|
2022-03-05 20:26:36 +02:00
|
|
|
std::optional<std::string> name;
|
2020-08-25 14:31:11 +03:00
|
|
|
size_t arity;
|
|
|
|
std::vector<std::string> args;
|
2023-05-13 20:52:45 +03:00
|
|
|
/**
|
|
|
|
* Unlike the other `doc` fields in this file, this one should never be
|
|
|
|
* `null`.
|
|
|
|
*/
|
2020-08-25 14:31:11 +03:00
|
|
|
const char * doc;
|
|
|
|
};
|
|
|
|
|
|
|
|
std::optional<Doc> getDoc(Value & v);
|
|
|
|
|
2013-09-03 16:45:32 +03:00
|
|
|
private:
|
|
|
|
|
2013-10-08 15:24:53 +03:00
|
|
|
inline Value * lookupVar(Env * env, const ExprVar & var, bool noEval);
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2014-01-21 19:29:55 +02:00
|
|
|
friend struct ExprVar;
|
|
|
|
friend struct ExprAttrs;
|
|
|
|
friend struct ExprLet;
|
2010-04-13 15:25:42 +03:00
|
|
|
|
2022-12-13 01:48:04 +02:00
|
|
|
Expr * parse(
|
|
|
|
char * text,
|
|
|
|
size_t length,
|
|
|
|
Pos::Origin origin,
|
2023-04-06 14:15:50 +03:00
|
|
|
const SourcePath & basePath,
|
2022-12-13 01:48:04 +02:00
|
|
|
std::shared_ptr<StaticEnv> & staticEnv);
|
2011-08-06 16:02:55 +03:00
|
|
|
|
2023-12-15 21:52:21 +02:00
|
|
|
/**
|
|
|
|
* Current Nix call stack depth, used with `max-call-depth` setting to throw stack overflow hopefully before we run out of system stack.
|
|
|
|
*/
|
|
|
|
size_t callDepth = 0;
|
|
|
|
|
2010-04-12 21:30:11 +03:00
|
|
|
public:
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Do a deep equality test between two values. That is, list
|
|
|
|
* elements and attributes are compared recursively.
|
|
|
|
*/
|
2023-01-19 14:23:04 +02:00
|
|
|
bool eqValues(Value & v1, Value & v2, const PosIdx pos, std::string_view errorCtx);
|
2010-03-29 17:37:56 +03:00
|
|
|
|
2015-09-07 02:03:23 +03:00
|
|
|
bool isFunctor(Value & fun);
|
|
|
|
|
2020-02-24 02:32:01 +02:00
|
|
|
// FIXME: use std::span
|
2022-03-04 20:31:59 +02:00
|
|
|
void callFunction(Value & fun, size_t nrArgs, Value * * args, Value & vRes, const PosIdx pos);
|
2020-02-24 02:32:01 +02:00
|
|
|
|
2022-03-04 20:31:59 +02:00
|
|
|
void callFunction(Value & fun, Value & arg, Value & vRes, const PosIdx pos)
|
2020-02-24 02:32:01 +02:00
|
|
|
{
|
|
|
|
Value * args[] = {&arg};
|
|
|
|
callFunction(fun, 1, args, vRes, pos);
|
|
|
|
}
|
2010-04-07 16:55:46 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Automatically call a function for which each argument has a
|
|
|
|
* default value or has a binding in the `args` map.
|
|
|
|
*/
|
2010-10-22 17:47:42 +03:00
|
|
|
void autoCallFunction(Bindings & args, Value & fun, Value & res);
|
2013-09-02 17:29:15 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* Allocation primitives.
|
|
|
|
*/
|
2021-12-28 20:18:17 +02:00
|
|
|
inline Value * allocValue();
|
|
|
|
inline Env & allocEnv(size_t size);
|
2010-03-30 17:39:27 +03:00
|
|
|
|
2018-05-02 14:56:34 +03:00
|
|
|
Bindings * allocBindings(size_t capacity);
|
2014-09-19 17:49:41 +03:00
|
|
|
|
2022-01-04 18:39:16 +02:00
|
|
|
BindingsBuilder buildBindings(size_t capacity)
|
|
|
|
{
|
|
|
|
return BindingsBuilder(*this, allocBindings(capacity));
|
|
|
|
}
|
|
|
|
|
2024-03-14 20:10:31 +02:00
|
|
|
ListBuilder buildList(size_t size)
|
|
|
|
{
|
|
|
|
return ListBuilder(*this, size);
|
|
|
|
}
|
|
|
|
|
2024-03-21 00:11:54 +02:00
|
|
|
/**
|
|
|
|
* Return a boolean `Value *` without allocating.
|
|
|
|
*/
|
|
|
|
Value *getBool(bool b);
|
|
|
|
|
2010-04-12 21:30:11 +03:00
|
|
|
void mkThunk_(Value & v, Expr * expr);
|
2022-03-04 20:31:59 +02:00
|
|
|
void mkPos(Value & v, PosIdx pos);
|
2010-10-24 17:20:02 +03:00
|
|
|
|
2023-05-11 03:47:25 +03:00
|
|
|
/**
|
|
|
|
* Create a string representing a store path.
|
|
|
|
*
|
2021-03-10 06:22:56 +02:00
|
|
|
* The string is the printed store path with a context containing a
|
|
|
|
* single `NixStringContextElem::Opaque` element of that store path.
|
2023-05-11 03:47:25 +03:00
|
|
|
*/
|
Use `std::set<StringContextElem>` not `PathSet` for string contexts
Motivation
`PathSet` is not correct because string contexts have other forms
(`Built` and `DrvDeep`) that are not rendered as plain store paths.
Instead of wrongly using `PathSet`, or "stringly typed" using
`StringSet`, use `std::std<StringContextElem>`.
-----
In support of this change, `NixStringContext` is now defined as
`std::std<StringContextElem>` not `std:vector<StringContextElem>`. The
old definition was just used by a `getContext` method which was only
used by the eval cache. It can be deleted altogether since the types are
now unified and the preexisting `copyContext` function already suffices.
Summarizing the previous paragraph:
Old:
- `value/context.hh`: `NixStringContext = std::vector<StringContextElem>`
- `value.hh`: `NixStringContext Value::getContext(...)`
- `value.hh`: `copyContext(...)`
New:
- `value/context.hh`: `NixStringContext = std::set<StringContextElem>`
- `value.hh`: `copyContext(...)`
----
The string representation of string context elements no longer contains
the store dir. The diff of `src/libexpr/tests/value/context.cc` should
make clear what the new representation is, so we recommend reviewing
that file first. This was done for two reasons:
Less API churn:
`Value::mkString` and friends did not take a `Store` before. But if
`NixStringContextElem::{parse, to_string}` *do* take a store (as they
did before), then we cannot have the `Value` functions use them (in
order to work with the fully-structured `NixStringContext`) without
adding that argument.
That would have been a lot of churn of threading the store, and this
diff is already large enough, so the easier and less invasive thing to
do was simply make the element `parse` and `to_string` functions not
take the `Store` reference, and the easiest way to do that was to simply
drop the store dir.
Space usage:
Dropping the `/nix/store/` (or similar) from the internal representation
will safe space in the heap of the Nix programming being interpreted. If
the heap contains many strings with non-trivial contexts, the saving
could add up to something significant.
----
The eval cache version is bumped.
The eval cache serialization uses `NixStringContextElem::{parse,
to_string}`, and since those functions are changed per the above, that
means the on-disk representation is also changed.
This is simply done by changing the name of the used for the eval cache
from `eval-cache-v4` to eval-cache-v5`.
----
To avoid some duplication `EvalCache::mkPathString` is added to abstract
over the simple case of turning a store path to a string with just that
string in the context.
Context
This PR picks up where #7543 left off. That one introduced the fully
structured `NixStringContextElem` data type, but kept `PathSet context`
as an awkward middle ground between internal `char[][]` interpreter heap
string contexts and `NixStringContext` fully parsed string contexts.
The infelicity of `PathSet context` was specifically called out during
Nix team group review, but it was agreeing that fixing it could be left
as future work. This is that future work.
A possible follow-up step would be to get rid of the `char[][]`
evaluator heap representation, too, but it is not yet clear how to do
that. To use `NixStringContextElem` there we would need to get the STL
containers to GC pointers in the GC build, and I am not sure how to do
that.
----
PR #7543 effectively is writing the inverse of a `mkPathString`,
`mkOutputString`, and one more such function for the `DrvDeep` case. I
would like that PR to have property tests ensuring it is actually the
inverse as expected.
This PR sets things up nicely so that reworking that PR to be in that
more elegant and better tested way is possible.
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2023-01-29 03:31:10 +02:00
|
|
|
void mkStorePathString(const StorePath & storePath, Value & v);
|
|
|
|
|
2023-05-11 03:47:25 +03:00
|
|
|
/**
|
2021-03-10 06:22:56 +02:00
|
|
|
* Create a string representing a `SingleDerivedPath::Built`.
|
2023-05-11 03:47:25 +03:00
|
|
|
*
|
2021-03-10 06:22:56 +02:00
|
|
|
* The string is the printed store path with a context containing a
|
|
|
|
* single `NixStringContextElem::Built` element of the drv path and
|
|
|
|
* output name.
|
2023-05-11 03:47:25 +03:00
|
|
|
*
|
|
|
|
* @param value Value we are settings
|
|
|
|
*
|
2021-03-10 06:22:56 +02:00
|
|
|
* @param b the drv whose output we are making a string for, and the
|
|
|
|
* output
|
2023-05-11 03:47:25 +03:00
|
|
|
*
|
2021-03-10 06:22:56 +02:00
|
|
|
* @param optStaticOutputPath Optional output path for that string.
|
|
|
|
* Must be passed if and only if output store object is
|
|
|
|
* input-addressed or fixed output. Will be printed to form string
|
|
|
|
* if passed, otherwise a placeholder will be used (see
|
|
|
|
* `DownstreamPlaceholder`).
|
2023-07-13 06:33:43 +03:00
|
|
|
*
|
|
|
|
* @param xpSettings Stop-gap to avoid globals during unit tests.
|
2023-05-11 03:47:25 +03:00
|
|
|
*/
|
|
|
|
void mkOutputString(
|
|
|
|
Value & value,
|
2021-03-10 06:22:56 +02:00
|
|
|
const SingleDerivedPath::Built & b,
|
2023-08-14 15:10:39 +03:00
|
|
|
std::optional<StorePath> optStaticOutputPath,
|
2023-07-13 06:33:43 +03:00
|
|
|
const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings);
|
2023-05-11 03:47:25 +03:00
|
|
|
|
2021-03-10 06:22:56 +02:00
|
|
|
/**
|
|
|
|
* Create a string representing a `SingleDerivedPath`.
|
|
|
|
*
|
|
|
|
* A combination of `mkStorePathString` and `mkOutputString`.
|
|
|
|
*/
|
|
|
|
void mkSingleDerivedPathString(
|
|
|
|
const SingleDerivedPath & p,
|
|
|
|
Value & v);
|
|
|
|
|
2024-03-15 19:22:39 +02:00
|
|
|
void concatLists(Value & v, size_t nrLists, Value * const * lists, const PosIdx pos, std::string_view errorCtx);
|
2012-08-13 08:53:10 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
2023-09-01 13:20:54 +03:00
|
|
|
* Print statistics, if enabled.
|
|
|
|
*
|
|
|
|
* Performs a full memory GC before printing the statistics, so that the
|
|
|
|
* GC statistics are more accurate.
|
2023-04-07 16:55:28 +03:00
|
|
|
*/
|
2023-10-09 17:25:53 +03:00
|
|
|
void maybePrintStats();
|
2010-04-09 15:00:49 +03:00
|
|
|
|
2023-09-01 13:20:54 +03:00
|
|
|
/**
|
|
|
|
* Print statistics, unconditionally, cheaply, without performing a GC first.
|
|
|
|
*/
|
|
|
|
void printStatistics();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Perform a full memory garbage collection - not incremental.
|
|
|
|
*
|
|
|
|
* @return true if Nix was built with GC and a GC was performed, false if not.
|
|
|
|
* The return value is currently not thread safe - just the return value.
|
|
|
|
*/
|
|
|
|
bool fullGC();
|
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
2024-04-05 17:08:18 +03:00
|
|
|
* Realise the given context
|
|
|
|
* @param[in] context the context to realise
|
|
|
|
* @param[out] maybePaths if not nullptr, all built or referenced store paths will be added to this set
|
|
|
|
* @return a mapping from the placeholders used to construct the associated value to their final store path.
|
2021-12-20 20:46:55 +02:00
|
|
|
*/
|
2024-04-05 17:08:18 +03:00
|
|
|
[[nodiscard]] StringMap realiseContext(const NixStringContext & context, StorePathSet * maybePaths = nullptr, bool isIFD = true);
|
Eliminate the "store" global variable
Also, move a few free-standing functions into StoreAPI and Derivation.
Also, introduce a non-nullable smart pointer, ref<T>, which is just a
wrapper around std::shared_ptr ensuring that the pointer is never
null. (For reference-counted values, this is better than passing a
"T&", because the latter doesn't maintain the refcount. Usually, the
caller will have a shared_ptr keeping the value alive, but that's not
always the case, e.g., when passing a reference to a std::thread via
std::bind.)
2016-02-04 15:28:26 +02:00
|
|
|
|
2023-11-30 17:16:17 +02:00
|
|
|
/* Call the binary path filter predicate used builtins.path etc. */
|
|
|
|
bool callPathFilter(
|
|
|
|
Value * filterFun,
|
|
|
|
const SourcePath & path,
|
|
|
|
std::string_view pathArg,
|
|
|
|
PosIdx pos);
|
|
|
|
|
2010-04-09 15:00:49 +03:00
|
|
|
private:
|
2012-08-13 06:41:48 +03:00
|
|
|
|
2021-03-10 06:22:56 +02:00
|
|
|
/**
|
|
|
|
* Like `mkOutputString` but just creates a raw string, not an
|
|
|
|
* string Value, which would also have a string context.
|
|
|
|
*/
|
|
|
|
std::string mkOutputStringRaw(
|
|
|
|
const SingleDerivedPath::Built & b,
|
|
|
|
std::optional<StorePath> optStaticOutputPath,
|
|
|
|
const ExperimentalFeatureSettings & xpSettings = experimentalFeatureSettings);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Like `mkSingleDerivedPathStringRaw` but just creates a raw string
|
|
|
|
* Value, which would also have a string context.
|
|
|
|
*/
|
|
|
|
std::string mkSingleDerivedPathStringRaw(
|
|
|
|
const SingleDerivedPath & p);
|
|
|
|
|
2015-07-24 00:14:07 +03:00
|
|
|
unsigned long nrEnvs = 0;
|
|
|
|
unsigned long nrValuesInEnvs = 0;
|
|
|
|
unsigned long nrValues = 0;
|
|
|
|
unsigned long nrListElems = 0;
|
2021-07-22 01:31:08 +03:00
|
|
|
unsigned long nrLookups = 0;
|
2015-07-24 00:14:07 +03:00
|
|
|
unsigned long nrAttrsets = 0;
|
|
|
|
unsigned long nrAttrsInAttrsets = 0;
|
2021-07-22 01:31:08 +03:00
|
|
|
unsigned long nrAvoided = 0;
|
2015-07-24 00:14:07 +03:00
|
|
|
unsigned long nrOpUpdates = 0;
|
|
|
|
unsigned long nrOpUpdateValuesCopied = 0;
|
|
|
|
unsigned long nrListConcats = 0;
|
|
|
|
unsigned long nrPrimOpCalls = 0;
|
|
|
|
unsigned long nrFunctionCalls = 0;
|
2012-08-13 06:29:28 +03:00
|
|
|
|
|
|
|
bool countCalls;
|
|
|
|
|
2022-03-05 20:26:36 +02:00
|
|
|
typedef std::map<std::string, size_t> PrimOpCalls;
|
2012-08-13 06:29:28 +03:00
|
|
|
PrimOpCalls primOpCalls;
|
|
|
|
|
2018-05-02 14:56:34 +03:00
|
|
|
typedef std::map<ExprLambda *, size_t> FunctionCalls;
|
2012-08-13 06:29:28 +03:00
|
|
|
FunctionCalls functionCalls;
|
|
|
|
|
2013-11-07 19:04:36 +02:00
|
|
|
void incrFunctionCall(ExprLambda * fun);
|
|
|
|
|
2022-03-04 20:31:59 +02:00
|
|
|
typedef std::map<PosIdx, size_t> AttrSelects;
|
2012-08-13 06:29:28 +03:00
|
|
|
AttrSelects attrSelects;
|
|
|
|
|
2014-01-21 19:29:55 +02:00
|
|
|
friend struct ExprOpUpdate;
|
|
|
|
friend struct ExprOpConcatLists;
|
2021-07-22 01:31:08 +03:00
|
|
|
friend struct ExprVar;
|
|
|
|
friend struct ExprString;
|
|
|
|
friend struct ExprInt;
|
|
|
|
friend struct ExprFloat;
|
|
|
|
friend struct ExprPath;
|
2014-01-21 19:29:55 +02:00
|
|
|
friend struct ExprSelect;
|
2022-03-04 20:31:59 +02:00
|
|
|
friend void prim_getAttr(EvalState & state, const PosIdx pos, Value * * args, Value & v);
|
|
|
|
friend void prim_match(EvalState & state, const PosIdx pos, Value * * args, Value & v);
|
|
|
|
friend void prim_split(EvalState & state, const PosIdx pos, Value * * args, Value & v);
|
2022-01-04 21:29:17 +02:00
|
|
|
|
|
|
|
friend struct Value;
|
2024-03-14 20:10:31 +02:00
|
|
|
friend class ListBuilder;
|
2003-10-30 18:48:26 +02:00
|
|
|
};
|
2010-04-07 16:55:46 +03:00
|
|
|
|
2022-05-05 13:29:14 +03:00
|
|
|
struct DebugTraceStacker {
|
|
|
|
DebugTraceStacker(EvalState & evalState, DebugTrace t);
|
|
|
|
~DebugTraceStacker()
|
|
|
|
{
|
|
|
|
evalState.debugTraces.pop_front();
|
|
|
|
}
|
|
|
|
EvalState & evalState;
|
|
|
|
DebugTrace trace;
|
2021-12-28 02:35:27 +02:00
|
|
|
};
|
2010-04-07 16:55:46 +03:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* @return A string representing the type of the value `v`.
|
2023-06-21 23:06:16 +03:00
|
|
|
*
|
|
|
|
* @param withArticle Whether to begin with an english article, e.g. "an
|
|
|
|
* integer" vs "integer".
|
2023-04-07 16:55:28 +03:00
|
|
|
*/
|
2023-06-21 23:06:16 +03:00
|
|
|
std::string_view showType(ValueType type, bool withArticle = true);
|
2022-02-25 17:00:00 +02:00
|
|
|
std::string showType(const Value & v);
|
2003-10-30 18:48:26 +02:00
|
|
|
|
2023-04-07 16:55:28 +03:00
|
|
|
/**
|
|
|
|
* If `path` refers to a directory, then append "/default.nix".
|
|
|
|
*/
|
2023-11-16 17:45:14 +02:00
|
|
|
SourcePath resolveExprPath(SourcePath path);
|
2013-09-03 13:56:33 +03:00
|
|
|
|
2023-12-06 13:41:47 +02:00
|
|
|
/**
|
|
|
|
* Whether a URI is allowed, assuming restrictEval is enabled
|
|
|
|
*/
|
|
|
|
bool isAllowedURI(std::string_view uri, const Strings & allowedPaths);
|
|
|
|
|
2006-09-05 00:06:23 +03:00
|
|
|
}
|
2021-12-28 20:18:17 +02:00
|
|
|
|
|
|
|
#include "eval-inline.hh"
|