mirror of
https://github.com/NixOS/nix
synced 2025-06-26 11:41:15 +02:00
* Use a proper namespace.
* Optimise header file usage a bit. * Compile the parser as C++.
This commit is contained in:
parent
aab8812732
commit
75068e7d75
61 changed files with 650 additions and 268 deletions
|
@ -1,8 +1,13 @@
|
|||
#include "eval.hh"
|
||||
#include "parser.hh"
|
||||
#include "hash.hh"
|
||||
#include "util.hh"
|
||||
#include "nixexpr-ast.hh"
|
||||
|
||||
|
||||
namespace nix {
|
||||
|
||||
|
||||
EvalState::EvalState()
|
||||
: normalForms(32768), primOps(128)
|
||||
{
|
||||
|
@ -271,7 +276,7 @@ Expr wrapInContext(ATermList context, Expr e)
|
|||
static ATerm concatStrings(EvalState & state, const ATermVector & args)
|
||||
{
|
||||
ATermList context = ATempty;
|
||||
ostringstream s;
|
||||
std::ostringstream s;
|
||||
bool isPath = false;
|
||||
|
||||
for (ATermVector::const_iterator i = args.begin(); i != args.end(); ++i) {
|
||||
|
@ -666,3 +671,6 @@ void printEvalStats(EvalState & state)
|
|||
if (showStats)
|
||||
printATermMapStats();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue