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

* Don't create thunks for simple constants (integers, strings, paths)

Browse source 
and allocate them only once.
* Move Value and related functions into value.hh.
This commit is contained in:
Eelco Dolstra 2012-01-07 17:26:33 +00:00
parent d4e6b9f2d6
commit 9fe24c5a0d
5 changed files with 193 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/nixexpr.hh
View file

@ -1,6 +1,7 @@
#ifndef __NIXEXPR_H
#define __NIXEXPR_H
#include "value.hh"
#include "symbol-table.hh"
#include <map>
@ -66,15 +67,19 @@ std::ostream & operator << (std::ostream & str, Expr & e);
struct ExprInt : Expr
{
int n;
ExprInt(int n) : n(n) { };
Value v;
ExprInt(int n) : n(n) { mkInt(v, n); };
COMMON_METHODS
Value * maybeThunk(EvalState & state, Env & env);
};
struct ExprString : Expr
{
Symbol s;
ExprString(const Symbol & s) : s(s) { };
Value v;
ExprString(const Symbol & s) : s(s) { mkString(v, s); };
COMMON_METHODS
Value * maybeThunk(EvalState & state, Env & env);
};
/* Temporary class used during parsing of indented strings. */
@ -87,8 +92,10 @@ struct ExprIndStr : Expr
struct ExprPath : Expr
{
string s;
ExprPath(const string & s) : s(s) { };
Value v;
ExprPath(const string & s) : s(s) { mkPathNoCopy(v, this->s.c_str()); };
COMMON_METHODS
Value * maybeThunk(EvalState & state, Env & env);
};
struct VarRef