wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-26 20:01:15 +02:00
Code Activity

Make primop registration pluggable

Browse source 
This way we don't have to put all primops in one giant file.
This commit is contained in:
Eelco Dolstra 2016-04-13 11:15:45 +02:00
parent 96515b0c0d
commit 12b257f045
4 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libexpr/primops.cc
View file

@ -10,6 +10,7 @@
#include "util.hh"
#include "value-to-json.hh"
#include "value-to-xml.hh"
#include "primops.hh"
#include <sys/types.h>
#include <sys/stat.h>
@ -1725,6 +1726,16 @@ static void prim_fetchTarball(EvalState & state, const Pos & pos, Value * * args
*************************************************************/
RegisterPrimOp::PrimOps * RegisterPrimOp::primOps;
RegisterPrimOp::RegisterPrimOp(std::string name, size_t arity, PrimOpFun fun)
{
if (!primOps) primOps = new PrimOps;
primOps->emplace_back(name, arity, fun);
}
void EvalState::createBaseEnv()
{
baseEnv.up = 0;
@ -1889,6 +1900,10 @@ void EvalState::createBaseEnv()
}
addConstant("__nixPath", v);
if (RegisterPrimOp::primOps)
for (auto & primOp : *RegisterPrimOp::primOps)
addPrimOp(std::get<0>(primOp), std::get<1>(primOp), std::get<2>(primOp));
/* Now that we've added all primops, sort the `builtins' set,
because attribute lookups expect it to be sorted. */
baseEnv.values[0]->attrs->sort();