mirror of
https://github.com/NixOS/nix
synced 2025-06-25 06:31:14 +02:00
Add isInitialized to nix::Value
Add a method to check if a value has been initialized. This helps avoid segfaults when calling `type()`. Useful in the context of the new C API. Closes #10524
This commit is contained in:
parent
6fd2f42c2d
commit
5cc4af5231
2 changed files with 33 additions and 1 deletions
|
@ -23,6 +23,7 @@ class BindingsBuilder;
|
|||
|
||||
|
||||
typedef enum {
|
||||
tUnset,
|
||||
tInt = 1,
|
||||
tBool,
|
||||
tString,
|
||||
|
@ -166,7 +167,7 @@ public:
|
|||
struct Value
|
||||
{
|
||||
private:
|
||||
InternalType internalType;
|
||||
InternalType internalType = tUnset;
|
||||
|
||||
friend std::string showType(const Value & v);
|
||||
|
||||
|
@ -270,6 +271,7 @@ public:
|
|||
inline ValueType type(bool invalidIsThunk = false) const
|
||||
{
|
||||
switch (internalType) {
|
||||
case tUnset: break;
|
||||
case tInt: return nInt;
|
||||
case tBool: return nBool;
|
||||
case tString: return nString;
|
||||
|
@ -294,6 +296,11 @@ public:
|
|||
internalType = newType;
|
||||
}
|
||||
|
||||
inline bool isInitialized()
|
||||
{
|
||||
return internalType != tUnset;
|
||||
}
|
||||
|
||||
inline void mkInt(NixInt n)
|
||||
{
|
||||
finishValue(tInt, { .integer = n });
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue