maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nix/libexpr): Use std::string as qualified type

Browse source 
Replaces most uses of `string` with `std::string`.

This came up because I removed the "types.hh" import from
"symbol-table.hh", which percolated through a bunch of files where
`string` was suddenly no longer defined ... *sigh*
This commit is contained in:
Vincent Ambo 2020-05-21 05:43:22 +01:00
parent b97307056d
commit a162f4e825
26 changed files with 196 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

11
third_party/nix/src/libexpr/nixexpr.hh vendored
View file

@ -3,6 +3,7 @@
#include <map>
#include "symbol-table.hh"
#include "types.hh" // TODO(tazjin): audit this include
#include "value.hh"
namespace nix {
@ -111,14 +112,14 @@ struct ExprString : Expr {
/* Temporary class used during parsing of indented strings. */
struct ExprIndStr : Expr {
string s;
ExprIndStr(const string& s) : s(s){};
std::string s;
ExprIndStr(const std::string& s) : s(s){};
};
struct ExprPath : Expr {
string s;
std::string s;
Value v;
ExprPath(const string& s) : s(s) { mkPathNoCopy(v, this->s.c_str()); };
ExprPath(const std::string& s) : s(s) { mkPathNoCopy(v, this->s.c_str()); };
COMMON_METHODS
Value* maybeThunk(EvalState& state, Env& env);
};
@ -231,7 +232,7 @@ struct ExprLambda : Expr {
pos);
};
void setName(Symbol& name);
string showNamePos() const;
std::string showNamePos() const;
COMMON_METHODS
};