Jade LovelaceandRebecca Turner
0cc285f87b
Fixes:
- Identifiers starting with _ are prohibited
- Some driveby header dependency cleaning which wound up with doing some
extra fixups.
- Fucking C style casts, man. C++ made these 1000% worse by letting you
also do memory corruption with them with references.
- Remove casts to Expr * where ExprBlackHole is an incomplete type by
introducing an explicitly-cast eBlackHoleAddr as Expr *.
- An incredibly illegal cast of the text bytes of the StorePath hash
into a size_t directly. You can't DO THAT.
Replaced with actually parsing the hash so we get 100% of the bits
being entropy, then memcpying the start of the hash. If this shows
up in a profile we should just make the hash parser faster with a
lookup table or something sensible like that.
- This horrendous bit of UB which I thankfully slapped a deprecation
warning on, built, and it didn't trigger anywhere so it was dead
code and I just deleted it. But holy crap you *cannot* do that.
inline void mkString(const Symbol & s)
{
mkString(((const std::string &) s).c_str());
}
- Some wrong lints. Lots of wrong macro lints, one wrong
suspicious-sizeof lint triggered by the template being instantiated
with only pointers, but the calculation being correct for both
pointers and not-pointers.
- Exceptions in destructors strike again. I tried to catch the
exceptions that might actually happen rather than all the exceptions
imaginable. We can let the runtime hard-kill it on other exceptions
imo.
Change-Id: I71761620846cba64d66ee7ca231b20c061e69710
101 lines
2.5 KiB
C++
101 lines
2.5 KiB
C++
#pragma once
|
|
///@file
|
|
#include "derived-path.hh"
|
|
#include "realisation.hh"
|
|
|
|
namespace nix {
|
|
|
|
struct SingleBuiltPath;
|
|
|
|
struct SingleBuiltPathBuilt {
|
|
ref<SingleBuiltPath> drvPath;
|
|
std::pair<std::string, StorePath> output;
|
|
|
|
SingleDerivedPathBuilt discardOutputPath() const;
|
|
|
|
std::string to_string(const Store & store) const;
|
|
static SingleBuiltPathBuilt parse(const Store & store, std::string_view, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
|
|
DECLARE_CMP(SingleBuiltPathBuilt);
|
|
};
|
|
|
|
namespace built_path::detail {
|
|
using SingleBuiltPathRaw = std::variant<
|
|
DerivedPathOpaque,
|
|
SingleBuiltPathBuilt
|
|
>;
|
|
}
|
|
|
|
struct SingleBuiltPath : built_path::detail::SingleBuiltPathRaw {
|
|
using Raw = built_path::detail::SingleBuiltPathRaw;
|
|
using Raw::Raw;
|
|
|
|
using Opaque = DerivedPathOpaque;
|
|
using Built = SingleBuiltPathBuilt;
|
|
|
|
inline const Raw & raw() const {
|
|
return static_cast<const Raw &>(*this);
|
|
}
|
|
|
|
StorePath outPath() const;
|
|
|
|
SingleDerivedPath discardOutputPath() const;
|
|
|
|
static SingleBuiltPath parse(const Store & store, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
};
|
|
|
|
static inline ref<SingleBuiltPath> staticDrv(StorePath drvPath)
|
|
{
|
|
return make_ref<SingleBuiltPath>(SingleBuiltPath::Opaque { drvPath });
|
|
}
|
|
|
|
/**
|
|
* A built derived path with hints in the form of optional concrete output paths.
|
|
*
|
|
* See 'BuiltPath' for more an explanation.
|
|
*/
|
|
struct BuiltPathBuilt {
|
|
ref<SingleBuiltPath> drvPath;
|
|
std::map<std::string, StorePath> outputs;
|
|
|
|
std::string to_string(const Store & store) const;
|
|
static BuiltPathBuilt parse(const Store & store, std::string_view, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
|
|
DECLARE_CMP(BuiltPathBuilt);
|
|
};
|
|
|
|
namespace built_path::detail {
|
|
using BuiltPathRaw = std::variant<
|
|
DerivedPath::Opaque,
|
|
BuiltPathBuilt
|
|
>;
|
|
}
|
|
|
|
/**
|
|
* A built path. Similar to a DerivedPath, but enriched with the corresponding
|
|
* output path(s).
|
|
*/
|
|
struct BuiltPath : built_path::detail::BuiltPathRaw {
|
|
using Raw = built_path::detail::BuiltPathRaw;
|
|
using Raw::Raw;
|
|
|
|
using Opaque = DerivedPathOpaque;
|
|
using Built = BuiltPathBuilt;
|
|
|
|
inline const Raw & raw() const {
|
|
return static_cast<const Raw &>(*this);
|
|
}
|
|
|
|
StorePathSet outPaths() const;
|
|
RealisedPath::Set toRealisedPaths(Store & store) const;
|
|
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
};
|
|
|
|
typedef std::vector<BuiltPath> BuiltPaths;
|
|
|
|
}
|